diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino index 1dc7b82..87f40a6 100644 --- a/Multiprotocol/Multi_Protos.ino +++ b/Multiprotocol/Multi_Protos.ino @@ -113,7 +113,7 @@ const char STR_SGF22[] ="SGF22"; const char STR_EAZYRC[] ="EazyRC"; const char STR_KYOSHO3[] ="Kyosho3"; const char STR_YUXIANG[] ="YuXiang"; -const char STR_PINECONE[] ="PineCone"; +const char STR_UDIRC[] ="UDIRC"; const char STR_JIABAILE[] ="JIABAILE"; const char STR_SUBTYPE_FLYSKY[] = "\x04""Std\0""V9x9""V6x6""V912""CX20"; @@ -436,9 +436,6 @@ const mm_protocol_definition multi_protocols[] = { #if defined(PELIKAN_A7105_INO) {PROTO_PELIKAN, STR_PELIKAN, STR_SUBTYPE_PELIKAN, 3, OPTION_NONE, 0, 1, SW_A7105, PELIKAN_init, PELIKAN_callback }, #endif - #if defined(PINECONE_CCNRF_INO) - {PROTO_PINECONE, STR_PINECONE, NO_SUBTYPE, 0, OPTION_NONE, 0, 0, SW_NRF, PINECONE_init, PINECONE_callback }, - #endif #if defined(POTENSIC_NRF24L01_INO) {PROTO_POTENSIC, STR_POTENSIC, STR_SUBTYPE_POTENSIC, 1, OPTION_NONE, 0, 0, SW_NRF, POTENSIC_init, POTENSIC_callback }, #endif @@ -487,6 +484,9 @@ const mm_protocol_definition multi_protocols[] = { #if defined(TRAXXAS_CYRF6936_INO) {PROTO_TRAXXAS, STR_TRAXXAS, STR_SUBTYPE_TRAXXAS, 2, OPTION_NONE, 0, 0, SW_CYRF, TRAXXAS_init, TRAXXAS_callback }, #endif + #if defined(UDIRC_CCNRF_INO) + {PROTO_UDIRC, STR_UDIRC, NO_SUBTYPE, 0, OPTION_NONE, 0, 0, SW_NRF, UDIRC_init, UDIRC_callback }, + #endif #if defined(V2X2_NRF24L01_INO) {PROTO_V2X2, STR_V2X2, STR_SUBTYPE_V2X2, 3, OPTION_NONE, 0, 0, SW_NRF, V2X2_init, V2X2_callback }, #endif diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 53a159b..91d8ca4 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 4 -#define VERSION_PATCH_LEVEL 31 +#define VERSION_PATCH_LEVEL 33 #define MODE_SERIAL 0 @@ -128,7 +128,7 @@ enum PROTOCOLS PROTO_KYOSHO3 = 98, // =>CYRF6936 PROTO_XK2 = 99, // =>CC2500 & NRF24L01 PROTO_YUXIANG = 100, // =>NRF24L01 - PROTO_PINECONE = 101, // =>CC2500 & NRF24L01 + PROTO_UDIRC = 101, // =>CC2500 & NRF24L01 PROTO_JIABAILE = 102, // =>NRF24L01 PROTO_H36 = 103, // =>NRF24L01 diff --git a/Multiprotocol/Pinecone_ccnrf.ino b/Multiprotocol/UDIRC_ccnrf.ino similarity index 63% rename from Multiprotocol/Pinecone_ccnrf.ino rename to Multiprotocol/UDIRC_ccnrf.ino index 693428e..0ac92d2 100644 --- a/Multiprotocol/Pinecone_ccnrf.ino +++ b/Multiprotocol/UDIRC_ccnrf.ino @@ -12,24 +12,24 @@ Multiprotocol is distributed in the hope that it will be useful, You should have received a copy of the GNU General Public License along with Multiprotocol. If not, see . */ -#if defined(PINECONE_CCNRF_INO) +#if defined(UDIRC_CCNRF_INO) #include "iface_xn297.h" -#define FORCE_PINECONE_ORIGINAL_ID +#define FORCE_UDIRC_ORIGINAL_ID -#define PINECONE_PAYLOAD_SIZE 15 -#define PINECONE_RF_NUM_CHANNELS 4 -#define PINECONE_PACKET_PERIOD 9000 -#define PINECONE_BIND_COUNT 2000 -#define PINECONE_WRITE_TIME 1500 +#define UDIRC_PAYLOAD_SIZE 15 +#define UDIRC_RF_NUM_CHANNELS 4 +#define UDIRC_PACKET_PERIOD 8000 +#define UDIRC_BIND_COUNT 2000 +#define UDIRC_WRITE_TIME 1500 enum { - PINECONE_DATA=0, - PINECONE_RX, + UDIRC_DATA=0, + UDIRC_RX, }; -static void __attribute__((unused)) PINECONE_send_packet() +static void __attribute__((unused)) UDIRC_send_packet() { if(rf_ch_num==0) { @@ -39,7 +39,6 @@ static void __attribute__((unused)) PINECONE_send_packet() hopping_frequency_no &= 3; } - if(bind_counter==0) bind_counter=2; memset(&packet[3], 0x00, 12); if(bind_counter) {//Bind in progress @@ -51,8 +50,9 @@ static void __attribute__((unused)) PINECONE_send_packet() } else {//Switch to normal + BIND_DONE; XN297_SetTXAddr(rx_tx_addr, 5); - XN297_SetRXAddr(rx_tx_addr, PINECONE_PAYLOAD_SIZE); + XN297_SetRXAddr(rx_tx_addr, UDIRC_PAYLOAD_SIZE); } } if(!bind_counter) @@ -70,22 +70,22 @@ static void __attribute__((unused)) PINECONE_send_packet() packet[12] = GET_FLAG(CH8_SW, 0x40) //TH.REV |GET_FLAG(CH9_SW, 0x80); //ST.REV //packet[13] = 00 unknown - for(uint8_t i=0;i