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

Fixed OrangeTX compilation

Browse Source
This commit is contained in:
pascallanger 2016-09-21 14:45:17 +02:00
parent 449ad6cd0d
commit fbb7a684bf
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Multiprotocol/MultiOrange.cpp.xmega
View File

@ -39,6 +39,8 @@ extern uint16_t initDsm2(void) ;
extern uint16_t ReadDsm2(void) ; extern uint16_t ReadDsm2(void) ;
extern uint16_t DevoInit(void) ; extern uint16_t DevoInit(void) ;
extern uint16_t devo_callback(void) ; extern uint16_t devo_callback(void) ;
extern uint16_t initJ6Pro(void) ;
extern uint16_t ReadJ6Pro(void) ;
extern void randomSeed(unsigned int seed) ; extern void randomSeed(unsigned int seed) ;
extern long random(long howbig) ; extern long random(long howbig) ;
@ -462,25 +464,15 @@ int analogRead(uint8_t pin)
return (high << 8) | low; return (high << 8) | low;
} }
void A7105_Reset()
{
}
void CC2500_Reset()
{
}
void NRF24L01_Reset()
{
}
#include "Multiprotocol.ino" #include "Multiprotocol.ino"
#include "SPI.ino"
#include "Convert.ino"
#include "Arduino.ino"
#include "cyrf6936_SPI.ino" #include "cyrf6936_SPI.ino"
#include "DSM_cyrf6936.ino" #include "DSM_cyrf6936.ino"
#include "Devo_cyrf6936.ino" #include "Devo_cyrf6936.ino"
#include "J6Pro_cyrf6936.ino"
#include "Telemetry.ino" #include "Telemetry.ino"

2
Multiprotocol/SPI.ino
View File

@ -66,6 +66,7 @@ uint8_t SPI_Read(void)
return result; return result;
} }
#ifdef A7105_INSTALLED
uint8_t SPI_SDIO_Read(void) uint8_t SPI_SDIO_Read(void)
{ {
uint8_t result=0; uint8_t result=0;
@ -82,3 +83,4 @@ uint8_t SPI_SDIO_Read(void)
SDI_output; SDI_output;
return result; return result;
} }
#endif

2
Multiprotocol/Telemetry.ino
View File

@ -96,7 +96,7 @@ void frsky_check_telemetry(uint8_t *pkt,uint8_t len)
if(pktt[6]) if(pktt[6])
telemetry_counter=(telemetry_counter+1)%32; telemetry_counter=(telemetry_counter+1)%32;
// //
#if defined FRSKYX_CC2500_INO #if defined SPORT_TELEMETRY && defined FRSKYX_CC2500_INO
if (protocol==MODE_FRSKYX) if (protocol==MODE_FRSKYX)
{ {
if ((pktt[5] >> 4 & 0x0f) == 0x08) if ((pktt[5] >> 4 & 0x0f) == 0x08)