diff --git a/Multiprotocol/CYRF6936_SPI.ino b/Multiprotocol/CYRF6936_SPI.ino index bbfe7ff..276e8bb 100644 --- a/Multiprotocol/CYRF6936_SPI.ino +++ b/Multiprotocol/CYRF6936_SPI.ino @@ -106,7 +106,7 @@ void CYRF_SetTxRxMode(uint8_t mode) //Set the post tx/rx state CYRF_WriteRegister(CYRF_0F_XACT_CFG, mode == TX_EN ? 0x28 : 0x2C); // 4=IDLE, 8=TX, C=RX if(mode == TX_EN) -#ifdef DSM_BLUE +#ifdef ORANGE_TX_BLUE CYRF_WriteRegister(CYRF_0E_GPIO_CTRL,0x20); // XOUT=1, PACTL=0 else CYRF_WriteRegister(CYRF_0E_GPIO_CTRL,0x80); // XOUT=0, PACTL=1 diff --git a/Multiprotocol/MultiOrange.h b/Multiprotocol/MultiOrange.h index 6bda063..19015bf 100644 --- a/Multiprotocol/MultiOrange.h +++ b/Multiprotocol/MultiOrange.h @@ -1,16 +1,12 @@ -#define ARDUINO_AVR_PRO 1 -//#define __AVR_ATmega328P__ 1 +//#define ARDUINO_AVR_PRO 1 #define ORANGE_TX 1 -// For BLUE module use: -//#define DSM_BLUE - #include #include #include -static void protocol_init(void) ; +/*static void protocol_init(void) ; static void update_channels_aux(void) ; static uint32_t random_id(uint16_t adress, uint8_t create_new) ; static void update_serial_data(void) ; @@ -57,7 +53,7 @@ extern uint16_t ReadDsm() ; extern void setup() ; extern void loop() ; - +*/ #define yield() #define clockCyclesPerMicrosecond() ( F_CPU / 1000000L ) @@ -141,30 +137,3 @@ void init() PORTA.PIN6CTRL = 0x18 ; PORTA.PIN7CTRL = 0x18 ; } - -//#ifndef ARDUINO_AVR_XMEGA32D4 -//#include "Multiprotocol.ino" -//#include "SPI.ino" -//#include "Common.ino" -//#include "Arduino.ino" - -//#include "cyrf6936_SPI.ino" -//#include "DSM_cyrf6936.ino" -//#include "Devo_cyrf6936.ino" -//#include "J6Pro_cyrf6936.ino" -//#include "WK2x01_cyrf6936.ino" - -//#include "Telemetry.ino" -//#endif - - -//int main(void) -//{ -// init() ; -// setup() ; -// for(;;) -// { -// loop() ; -// } -//} - diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 7bd7b46..c652f9b 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 1 #define VERSION_REVISION 6 -#define VERSION_PATCH_LEVEL 41 +#define VERSION_PATCH_LEVEL 42 //****************** // Protocols //****************** diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index caf5c4e..8b4d9ef 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -90,6 +90,10 @@ // The offset is in +/-kHz. Default value is 0. #define A7105_FREQ_OFFSET 0 +//If you compile for the OrangeRX TX module you need to select the correct board type. +//By default the compilation is done for the GREEN board, to switch to a BLUE board uncomment the line below by removing the "//" +//#define ORANGE_TX_BLUE + /*****************/ /*** GLOBAL ID ***/ /*****************/