Switch to CMake

This commit is contained in:
Bertrand Songis
2015-12-21 23:43:18 +01:00
parent c8358d7e37
commit 88841f63ca
94 changed files with 1553 additions and 956 deletions
+3 -1
View File
@@ -491,7 +491,7 @@ enum FrSkyDataState {
#endif
};
#if defined(CPUARM) || defined(PCBFLAMENCO)
#if defined(CPUARM)
#define frskySendAlarms()
#else
#define SEND_RSSI_ALARMS 6
@@ -550,6 +550,8 @@ void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts);
void frskyUpdateCells(void);
#endif
void processSerialData(uint8_t data);
#if defined(PCBTARANIS)
inline uint8_t modelTelemetryProtocol()
{
+4
View File
@@ -37,6 +37,8 @@
#ifndef TELEMETRY_H
#define TELEMETRY_H
extern Fifo<512> telemetryFifo;
enum TelemetryProtocol
{
TELEM_PROTO_FRSKY_D,
@@ -167,6 +169,8 @@ class TelemetryItem
extern TelemetryItem telemetryItems[MAX_SENSORS];
extern uint8_t allowNewSensors;
bool isGPSSensor(int sensor);
inline bool isTelemetryFieldAvailable(int index)
{
TelemetrySensor & sensor = g_model.telemetrySensors[index];