gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-03 20:17:52 +00:00
Code Issues Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
midelic 2016-08-31 21:40:56 +01:00 committed by GitHub
parent 2b4e591b37
commit 8723b0cb85
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Multiprotocol/Multiprotocol.ino
View File

@ -59,6 +59,7 @@ uint8_t packet[40];
// Servo data // Servo data
uint16_t Servo_data[NUM_CHN]; uint16_t Servo_data[NUM_CHN];
uint8_t Servo_AUX; uint8_t Servo_AUX;
uint16_t servo_max_100,servo_min_100,servo_max_125,servo_min_125;
#ifndef STM32_board #ifndef STM32_board
uint16_t servo_max_100,servo_min_100,servo_max_125,servo_min_125; uint16_t servo_max_100,servo_min_100,servo_max_125,servo_min_125;
@ -348,7 +349,7 @@ void setup()
// Main // Main
void loop() void loop()
{ {
#ifndef STM32 #ifndef STM32_board
TX_ON; TX_ON;
NOP(); NOP();
TX_OFF; TX_OFF;
@ -361,7 +362,7 @@ TX_OFF;
if(IS_CHANGE_PROTOCOL_FLAG_on) if(IS_CHANGE_PROTOCOL_FLAG_on)
{ // Protocol needs to be changed { // Protocol needs to be changed
LED_OFF; //led off during protocol init LED_OFF; //led off during protocol init
module_reset(); //reset previous module modules_reset(); //reset previous module
protocol_init(); protocol_init();
//init new protocol //init new protocol
CHANGE_PROTOCOL_FLAG_off; //done CHANGE_PROTOCOL_FLAG_off; //done
@ -628,13 +629,21 @@ static void protocol_init()
{ {
if(IS_BIND_BUTTON_FLAG_on) if(IS_BIND_BUTTON_FLAG_on)
{ {
#ifdef STM32_board
EEPROM.write((200+mode_select),0x00); // reset to autobind mode for the current model
#else
eeprom_write_byte((uint8_t*)(30+mode_select),0x00); // reset to autobind mode for the current model eeprom_write_byte((uint8_t*)(30+mode_select),0x00); // reset to autobind mode for the current model
#endif
option=0; option=0;
} }
else else
{ {
#ifdef STM32_board
option=EEPROM.read((200+mode_select)); // load previous mode: autobind or fixed id
#else
option=eeprom_read_byte((uint8_t*)(30+mode_select)); // load previous mode: autobind or fixed id option=eeprom_read_byte((uint8_t*)(30+mode_select)); // load previous mode: autobind or fixed id
if(option!=1) option=0; // if not fixed id mode then it should be autobind #endif
if(option!=1) option=0; // if not fixed id mode then it should be autobind // if not fixed id mode then it should be autobind
} }
} }
#endif //ENABLE_PPM #endif //ENABLE_PPM