gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-04 19:58:13 +00:00
Code Issues Projects Releases Wiki Activity

AVR Boards: auto bootloader setting

Browse Source
This commit is contained in:
Pascal Langer 2017-11-20 17:04:38 +01:00
parent da2d57c8e9
commit 113caf4970
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Multiprotocol/FrSkyX_cc2500.ino
View File

@ -154,17 +154,7 @@ static void __attribute__((unused)) frskyX_data_frame()
packet[9+i+2]=chan_1>>4; packet[9+i+2]=chan_1>>4;
} }
<<<<<<< HEAD
packet[21] = (FrX_receive_seq << 4) | FrX_send_seq ;//8 at start packet[21] = (FrX_receive_seq << 4) | FrX_send_seq ;//8 at start
=======
packet[21] = seq_last_sent << 4 | seq_last_rcvd;//8 at start
if (seq_last_sent < 0x08 && seq_last_rcvd < 8)
seq_last_sent = (seq_last_sent + 1) % 4;
else if (seq_last_rcvd == 0x00)
seq_last_sent = 1;
else
seq_last_rcvd = 8;
>>>>>>> dd3f8b4717c03dc2f86701191dc8b265d4706751
if(sub_protocol & 1 )// in X8 mode send only 8ch every 9ms if(sub_protocol & 1 )// in X8 mode send only 8ch every 9ms
lpass = 0 ; lpass = 0 ;

10
Multiprotocol/Validate.h
View File

@ -4,7 +4,7 @@
#endif #endif
#if not defined (ORANGE_TX) && not defined (STM32_BOARD) #if not defined (ORANGE_TX) && not defined (STM32_BOARD)
//Atmega328p //Atmega328p
#if not defined(ARDUINO_AVR_PRO) && not defined(ARDUINO_AVR_MINI) && not defined(ARDUINO_AVR_NANO) #if not defined(ARDUINO_AVR_PRO) && not defined(ARDUINO_MULTI_NO_BOOT) && not defined(ARDUINO_MULTI_FLASH_FROM_TX) && not defined(ARDUINO_AVR_MINI) && not defined(ARDUINO_AVR_NANO)
#error You must select one of these boards: "Multi 4-in-1", "Arduino Pro or Pro Mini" or "Arduino Mini" #error You must select one of these boards: "Multi 4-in-1", "Arduino Pro or Pro Mini" or "Arduino Mini"
#endif #endif
#if F_CPU != 16000000L || not defined(__AVR_ATmega328P__) #if F_CPU != 16000000L || not defined(__AVR_ATmega328P__)
@ -18,6 +18,14 @@
#endif #endif
#endif #endif
//Change/Force configuration for the bootloader option
#if defined ARDUINO_MULTI_FLASH_FROM_TX
#define CHECK_FOR_BOOTLOADER
#endif
#if defined ARDUINO_MULTI_NO_BOOT
#undef CHECK_FOR_BOOTLOADER
#endif
//Change/Force configuration if OrangeTX //Change/Force configuration if OrangeTX
#ifdef ORANGE_TX #ifdef ORANGE_TX
#undef ENABLE_PPM // Disable PPM for OrangeTX module #undef ENABLE_PPM // Disable PPM for OrangeTX module

2
Multiprotocol/_Config.h
View File

@ -54,7 +54,7 @@
/*************************/ /*************************/
//Allow flashing multimodule directly with TX(erky9x or opentx modified firmwares) //Allow flashing multimodule directly with TX(erky9x or opentx modified firmwares)
//Check https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/tree/master/BootLoaders //Check https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/tree/master/BootLoaders
//To enable this feature remove the "//" on the next line. //To enable this feature remove the "//" on the next line. It is automatically enabled/disabled when you use the AVR Multi boards.
//#define CHECK_FOR_BOOTLOADER //#define CHECK_FOR_BOOTLOADER
/****************/ /****************/