diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index ba423f5..224d7c1 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 2 -#define VERSION_PATCH_LEVEL 75 +#define VERSION_PATCH_LEVEL 76 #define MODE_SERIAL 0 diff --git a/Multiprotocol/Pelikan_a7105.ino b/Multiprotocol/Pelikan_a7105.ino index 20187cd..9c9a182 100644 --- a/Multiprotocol/Pelikan_a7105.ino +++ b/Multiprotocol/Pelikan_a7105.ino @@ -50,20 +50,20 @@ static void __attribute__((unused)) pelikan_build_packet() if(sub_protocol == PELIKAN_SCX24) { - packet[1] = 0x65; - packet[6] = 0x55; - packet[7] = 0xAA; + packet[1] = 0x65; //?? + packet[6] = 0x55; //?? + packet[7] = 0xAA; //?? } else {//PELIKAN_PRO & PELIKAN_LITE - packet[1] = 0x04; //version?? + packet[1] = 0x04; //version?? if(sub_protocol==PELIKAN_PRO) - packet[6] = 0x05; //sub version?? + packet[6] = 0x05; //sub version?? else //PELIKAN_LITE - packet[6] = 0x03; //sub version?? - packet[7] = 0x00; //?? + packet[6] = 0x03; //sub version?? + packet[7] = 0x00; //?? } - packet[8] = 0x55; //?? + packet[8] = 0x55; //?? packet_length = 10; } else @@ -171,7 +171,7 @@ uint16_t PELIKAN_callback() BIND_DONE; A7105_Strobe(A7105_STANDBY); if(sub_protocol==PELIKAN_PRO) - A7105_WriteReg(A7105_03_FIFOI,0x28); + A7105_WriteReg(A7105_03_FIFOI,0x28); //???? else if(sub_protocol==PELIKAN_SCX24) A7105_WriteReg(A7105_03_FIFOI,0x0D); else//PELIKAN_LITE @@ -301,12 +301,11 @@ void PELIKAN_init() if(IS_BIND_IN_PROGRESS || sub_protocol==PELIKAN_LITE) A7105_WriteReg(A7105_03_FIFOI,0x10); - pelikan_init_hop(); - - //ID from dump - #if defined(PELIKAN_FORCE_ID) - if(sub_protocol==PELIKAN_PRO) - { + if(sub_protocol==PELIKAN_PRO) + { + pelikan_init_hop(); + //ID from dump + #if defined(PELIKAN_FORCE_ID) rx_tx_addr[0]=0x0D; // hopping freq rx_tx_addr[1]=0xF4; // hopping freq rx_tx_addr[2]=0x50; // ID @@ -314,60 +313,48 @@ void PELIKAN_init() // Fill frequency table for(uint8_t i=0;i