Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 13:55:18 +03:00
Code Issues Wiki Activity

Renamed 'DSHOT_CMD_BEEPx' to 'DSHOT_CMD_BEACONx', made beacon tone

Browse source 
configurable.
This commit is contained in:
mikeller 2017-09-18 20:01:28 +12:00
parent f2f34b4693
commit 8ff2c9ba95
5 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/drivers/pwm_output.h
View file

@ -39,11 +39,11 @@
typedef enum { typedef enum {
DSHOT_CMD_MOTOR_STOP = 0, DSHOT_CMD_MOTOR_STOP = 0,
DSHOT_CMD_BEEP1, DSHOT_CMD_BEACON1,
DSHOT_CMD_BEEP2, DSHOT_CMD_BEACON2,
DSHOT_CMD_BEEP3, DSHOT_CMD_BEACON3,
DSHOT_CMD_BEEP4, DSHOT_CMD_BEACON4,
DSHOT_CMD_BEEP5, DSHOT_CMD_BEACON5,
DSHOT_CMD_ESC_INFO, // V2 includes settings DSHOT_CMD_ESC_INFO, // V2 includes settings
DSHOT_CMD_SPIN_DIRECTION_1, DSHOT_CMD_SPIN_DIRECTION_1,
DSHOT_CMD_SPIN_DIRECTION_2, DSHOT_CMD_SPIN_DIRECTION_2,

6
src/main/fc/config.c
View file

@ -156,12 +156,6 @@ PG_RESET_TEMPLATE(systemConfig_t, systemConfig,
); );
#endif #endif
#ifdef BEEPER
PG_REGISTER_WITH_RESET_TEMPLATE(beeperConfig_t, beeperConfig, PG_BEEPER_CONFIG, 0);
PG_RESET_TEMPLATE(beeperConfig_t, beeperConfig,
.dshotForward = true
);
#endif
#ifdef USE_ADC #ifdef USE_ADC
PG_REGISTER_WITH_RESET_FN(adcConfig_t, adcConfig, PG_ADC_CONFIG, 0); PG_REGISTER_WITH_RESET_FN(adcConfig_t, adcConfig, PG_ADC_CONFIG, 0);
#endif #endif

2
src/main/fc/settings.c
View file

@ -467,7 +467,7 @@ const clivalue_t valueTable[] = {
// PG_BEEPER_CONFIG // PG_BEEPER_CONFIG
#ifdef USE_DSHOT #ifdef USE_DSHOT
{ "beeper_dshot", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_BEEPER_CONFIG, offsetof(beeperConfig_t, dshotForward) }, { "beeper_dshot_beacon_tone", VAR_UINT8 | MASTER_VALUE, .config.minmax = {0, DSHOT_CMD_BEACON5 }, PG_BEEPER_CONFIG, offsetof(beeperConfig_t, dshotBeaconTone) },
#endif #endif
#endif #endif

9
src/main/io/beeper.c
View file

@ -84,6 +84,11 @@ PG_RESET_TEMPLATE(beeperDevConfig_t, beeperDevConfig,
#define BEEPER_COMMAND_STOP 0xFF #define BEEPER_COMMAND_STOP 0xFF
#ifdef BEEPER #ifdef BEEPER
PG_REGISTER_WITH_RESET_TEMPLATE(beeperConfig_t, beeperConfig, PG_BEEPER_CONFIG, 1);
PG_RESET_TEMPLATE(beeperConfig_t, beeperConfig,
.dshotBeaconTone = 0
);
/* Beeper Sound Sequences: (Square wave generation) /* Beeper Sound Sequences: (Square wave generation)
* Sequence must end with 0xFF or 0xFE. 0xFE repeats the sequence from * Sequence must end with 0xFF or 0xFE. 0xFE repeats the sequence from
* start when 0xFF stops the sound when it's completed. * start when 0xFF stops the sound when it's completed.
@ -363,11 +368,11 @@ void beeperUpdate(timeUs_t currentTimeUs)
} }
#ifdef USE_DSHOT #ifdef USE_DSHOT
if (!areMotorsRunning() && beeperConfig()->dshotForward && currentBeeperEntry->mode == BEEPER_RX_SET) { if (!areMotorsRunning() && beeperConfig()->dshotBeaconTone && (beeperConfig()->dshotBeaconTone <= DSHOT_CMD_BEACON5) && currentBeeperEntry->mode == BEEPER_RX_SET) {
pwmDisableMotors(); pwmDisableMotors();
delay(1); delay(1);
pwmWriteDshotCommand(ALL_MOTORS, getMotorCount(), DSHOT_CMD_BEEP3); pwmWriteDshotCommand(ALL_MOTORS, getMotorCount(), beeperConfig()->dshotBeaconTone);
pwmEnableMotors(); pwmEnableMotors();
} }

2
src/main/io/beeper.h
View file

@ -51,7 +51,7 @@ typedef enum {
typedef struct beeperConfig_s { typedef struct beeperConfig_s {
uint32_t beeper_off_flags; uint32_t beeper_off_flags;
uint32_t preferred_beeper_off_flags; uint32_t preferred_beeper_off_flags;
bool dshotForward; uint8_t dshotBeaconTone;
} beeperConfig_t; } beeperConfig_t;
#ifdef BEEPER #ifdef BEEPER