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

Fix: Arduino 1.6.7 compilation issues

Browse Source
This commit is contained in:
pascallanger 2016-01-28 10:50:52 +01:00
parent 365169a9fb
commit 304fc2536b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Multiprotocol/Multiprotocol.ino
View File

@ -99,7 +99,6 @@ uint8_t v_lipo;
int16_t RSSI_dBm; int16_t RSSI_dBm;
//const uint8_t RSSI_offset=72;//69 71.72 values db //const uint8_t RSSI_offset=72;//69 71.72 values db
uint8_t telemetry_link=0; uint8_t telemetry_link=0;
#include "telemetry.h"
#endif #endif
// Callback // Callback
@ -583,6 +582,7 @@ static void Mprotocol_serial_init()
UCSR0B |= (1<<TXEN0);//tx enable UCSR0B |= (1<<TXEN0);//tx enable
} }
#if defined(TELEMETRY)
static void PPM_Telemetry_serial_init() static void PPM_Telemetry_serial_init()
{ {
//9600 bauds //9600 bauds
@ -592,6 +592,7 @@ static void PPM_Telemetry_serial_init()
UCSR0C |= (1<<UCSZ01)|(1<<UCSZ00); UCSR0C |= (1<<UCSZ01)|(1<<UCSZ00);
UCSR0B |= (1<<TXEN0);//tx enable UCSR0B |= (1<<TXEN0);//tx enable
} }
#endif
// Convert 32b id to rx_tx_addr // Convert 32b id to rx_tx_addr
static void set_rx_tx_addr(uint32_t id) static void set_rx_tx_addr(uint32_t id)

0
Multiprotocol/telemetry.h → Multiprotocol/Telemetry.ino
View File