diff --git a/Multiprotocol/MultiOrange.cpp.xmega b/Multiprotocol/MultiOrange.cpp.xmega index 37daadd..1cc7dfa 100644 --- a/Multiprotocol/MultiOrange.cpp.xmega +++ b/Multiprotocol/MultiOrange.cpp.xmega @@ -39,6 +39,8 @@ extern uint16_t initDsm2(void) ; extern uint16_t ReadDsm2(void) ; extern uint16_t DevoInit(void) ; extern uint16_t devo_callback(void) ; +extern uint16_t initJ6Pro(void) ; +extern uint16_t ReadJ6Pro(void) ; extern void randomSeed(unsigned int seed) ; extern long random(long howbig) ; @@ -462,25 +464,15 @@ int analogRead(uint8_t pin) return (high << 8) | low; } - - - -void A7105_Reset() -{ -} -void CC2500_Reset() -{ -} -void NRF24L01_Reset() -{ -} - - #include "Multiprotocol.ino" +#include "SPI.ino" +#include "Convert.ino" +#include "Arduino.ino" #include "cyrf6936_SPI.ino" #include "DSM_cyrf6936.ino" #include "Devo_cyrf6936.ino" +#include "J6Pro_cyrf6936.ino" #include "Telemetry.ino" diff --git a/Multiprotocol/SPI.ino b/Multiprotocol/SPI.ino index feedcc1..fcf2936 100644 --- a/Multiprotocol/SPI.ino +++ b/Multiprotocol/SPI.ino @@ -66,6 +66,7 @@ uint8_t SPI_Read(void) return result; } +#ifdef A7105_INSTALLED uint8_t SPI_SDIO_Read(void) { uint8_t result=0; @@ -81,4 +82,5 @@ uint8_t SPI_SDIO_Read(void) } SDI_output; return result; -} +} +#endif diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino index 432b1c1..e9590b7 100644 --- a/Multiprotocol/Telemetry.ino +++ b/Multiprotocol/Telemetry.ino @@ -96,7 +96,7 @@ void frsky_check_telemetry(uint8_t *pkt,uint8_t len) if(pktt[6]) telemetry_counter=(telemetry_counter+1)%32; // -#if defined FRSKYX_CC2500_INO +#if defined SPORT_TELEMETRY && defined FRSKYX_CC2500_INO if (protocol==MODE_FRSKYX) { if ((pktt[5] >> 4 & 0x0f) == 0x08)