Merge pull request #6016 from opentx/schwabe/removeAVR

Remove a lot more AVR specific code
This commit is contained in:
Bertrand Songis
2018-07-11 13:19:23 +02:00
committed by GitHub
85 changed files with 158 additions and 8555 deletions
+9 -42
View File
@@ -27,11 +27,6 @@
#include "dataconstants.h"
#include "definitions.h"
#define ARM_FIELD(x) x;
#define AVR_FIELD(x)
#define N_PCBSTD_FIELD(x) x;
#if defined(PCBTARANIS)
#define N_TARANIS_FIELD(x)
#define TARANIS_FIELD(x) x;
@@ -354,19 +349,6 @@ PACK(struct FrSkyTelemetryData {
});
#endif
/*
* MAVLINK Telemetry structure
*/
#if defined(TELEMETRY_MAVLINK)
PACK(struct MavlinkTelemetryData {
uint8_t rc_rssi_scale:4;
uint8_t pc_rssi_en:1;
uint8_t spare1:3;
uint8_t spare2[3];
});
#endif
/*
* Telemetry Sensor structure
*/
@@ -569,21 +551,17 @@ PACK(struct CustomScreenData {
PACK(struct ModelData {
ModelHeader header;
TimerData timers[MAX_TIMERS];
AVR_FIELD(uint8_t protocol:3)
ARM_FIELD(uint8_t telemetryProtocol:3)
uint8_t telemetryProtocol:3;
uint8_t thrTrim:1; // Enable Throttle Trim
AVR_FIELD(int8_t ppmNCH:4)
ARM_FIELD(uint8_t noGlobalFunctions:1)
ARM_FIELD(uint8_t displayTrims:2)
ARM_FIELD(uint8_t ignoreSensorIds:1)
uint8_t noGlobalFunctions:1;
uint8_t displayTrims:2;
uint8_t ignoreSensorIds:1;
int8_t trimInc:3; // Trim Increments
uint8_t disableThrottleWarning:1;
ARM_FIELD(uint8_t displayChecklist:1)
AVR_FIELD(uint8_t pulsePol:1)
uint8_t displayChecklist:1;
uint8_t extendedLimits:1;
uint8_t extendedTrims:1;
uint8_t throttleReversed:1;
AVR_FIELD(int8_t ppmDelay)
BeepANACenter beepANACenter;
MixData mixData[MAX_MIXERS];
LimitData limitData[MAX_OUTPUT_CHANNELS];
@@ -597,8 +575,6 @@ PACK(struct ModelData {
SwashRingData swashR;
FlightModeData flightModeData[MAX_FLIGHT_MODES];
AVR_FIELD(int8_t ppmFrameLength) // 0=22.5ms (10ms-30ms) 0.5ms increments
NOBACKUP(uint8_t thrTraceSrc);
SWITCHES_WARNING_DATA
@@ -609,7 +585,7 @@ PACK(struct ModelData {
MODELDATA_EXTRA
ARM_FIELD(NOBACKUP(TelemetrySensor telemetrySensors[MAX_TELEMETRY_SENSORS]))
NOBACKUP(TelemetrySensor telemetrySensors[MAX_TELEMETRY_SENSORS];)
TARANIS_PCBX9E_FIELD(uint8_t toplcdTimer)
@@ -760,18 +736,15 @@ PACK(struct RadioData {
NOBACKUP(int8_t timezone:5);
NOBACKUP(uint8_t adjustRTC:1);
NOBACKUP(uint8_t inactivityTimer);
AVR_FIELD(uint8_t mavbaud:3)
ARM_FIELD(uint8_t telemetryBaudrate:3)
uint8_t telemetryBaudrate:3;
SPLASH_MODE; /* 3bits */
NOBACKUP(int8_t hapticMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all
AVR_FIELD(uint8_t blOffBright:4)
AVR_FIELD(uint8_t blOnBright:4)
ARM_FIELD(int8_t switchesDelay)
int8_t switchesDelay;
NOBACKUP(uint8_t lightAutoOff);
NOBACKUP(uint8_t templateSetup); // RETA order for receiver channels
NOBACKUP(int8_t PPM_Multiplier);
NOBACKUP(int8_t hapticLength);
N_HORUS_FIELD(N_TARANIS_FIELD(N_PCBSTD_FIELD(uint8_t reNavigation)));
N_HORUS_FIELD(N_TARANIS_FIELD(uint8_t reNavigation));
N_HORUS_FIELD(N_TARANIS_FIELD(uint8_t stickReverse));
NOBACKUP(int8_t beepLength:3);
NOBACKUP(int8_t hapticStrength:3);
@@ -888,14 +861,8 @@ static inline void check_struct()
CHKSIZE(ModelHeader, 11);
CHKTYPE(CurveData, 1);
// AVR
#if defined(CPUM2560) || defined(CPUM2561)
CHKSIZE(ExpoData, 5);
CHKSIZE(MixData, 10);
#else
CHKSIZE(MixData, 9);
CHKSIZE(ExpoData, 4);
#endif
CHKSIZE(CustomFunctionData, 3);
CHKSIZE(TimerData, 3);