Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 17:25:18 +03:00
Code Issues Wiki Activity

Merge pull request #1847 from iNavFlight/dzikuvx-sd-card-detection-configurable

Browse source 
Adds sdcard_detect_inverted setting to make detection configurable
This commit is contained in:
Paweł Spychalski 2017-06-30 13:03:27 +02:00 • committed by GitHub
commit 76f077fa28
5 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/Cli.md
View file

@ -253,6 +253,7 @@ Re-apply any new defaults as desired.
| blackbox_rate_num | 1 | Blackbox logging rate numerator. Use num/denom settings to decide if a frame should be logged, allowing control of the portion of logged loop iterations |
| blackbox_rate_denom | 1 | Blackbox logging rate denominator. See blackbox_rate_num. |
| blackbox_device | SPIFLASH | Selection of where to write blackbox data |
| sdcard_detect_inverted | `TARGET dependent` | This setting drives the way SD card is detected in card slot. On some targets (AnyFC F7 clone) different card slot was used and depending of hardware revision ON or OFF setting might be required. If card is not detected, change this value. |
| ledstrip_visual_beeper | OFF | |
| osd_video_system | 0 | |
| osd_row_shiftdown | 0 | |

5
src/main/blackbox/blackbox.c
View file

@ -89,6 +89,11 @@ PG_RESET_TEMPLATE(blackboxConfig_t, blackboxConfig,
.device = DEFAULT_BLACKBOX_DEVICE,
.rate_num = 1,
.rate_denom = 1,
#ifdef SDCARD_DETECT_INVERTED
.invertedCardDetection = 1,
#else
.invertedCardDetection = 0,
#endif
);
#define BLACKBOX_SHUTDOWN_TIMEOUT_MILLIS 200

1
src/main/blackbox/blackbox.h
View file

@ -25,6 +25,7 @@ typedef struct blackboxConfig_s {
uint8_t rate_num;
uint8_t rate_denom;
uint8_t device;
uint8_t invertedCardDetection;
} blackboxConfig_t;
PG_DECLARE(blackboxConfig_t, blackboxConfig);

7
src/main/drivers/sdcard.c
View file

@ -31,6 +31,7 @@
#include "sdcard.h"
#include "sdcard_standard.h"
#include "blackbox/blackbox.h"
#include "build/debug.h"
@ -156,9 +157,9 @@ bool sdcard_isInserted(void)
result = IORead(sdCardDetectPin) != 0;
#ifdef SDCARD_DETECT_INVERTED
result = !result;
#endif
if (blackboxConfig()->invertedCardDetection) {
result = !result;
}
#endif

4
src/main/fc/cli.c
View file

@ -610,6 +610,10 @@ static const clivalue_t valueTable[] = {
{ "blackbox_device", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_BLACKBOX_DEVICE }, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, device) },
#endif
#ifdef USE_SDCARD
{ "sdcard_detect_inverted", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, invertedCardDetection) },
#endif
// PG_MOTOR_CONFIG
{ "min_throttle", VAR_UINT16 | MASTER_VALUE, .config.minmax = { PWM_RANGE_ZERO, PWM_RANGE_MAX }, PG_MOTOR_CONFIG, offsetof(motorConfig_t, minthrottle) },
{ "max_throttle", VAR_UINT16 | MASTER_VALUE, .config.minmax = { PWM_RANGE_ZERO, PWM_RANGE_MAX }, PG_MOTOR_CONFIG, offsetof(motorConfig_t, maxthrottle) },