Merge pull request #3405 from opentx/kilrah/extratrims

[Horus] Extra trims support
This commit is contained in:
Bertrand Songis
2016-04-09 22:59:43 +02:00
30 changed files with 272 additions and 65 deletions
+1 -1
View File
@@ -91,7 +91,7 @@ void copytrim_t(A * dest, B * src)
template <class A, class B>
void copyFlightModeData(A * dest, B * src)
{
for (int i=0; i<4; i++) {
for (int i=0; i<NUM_STICKS; i++) {
copytrim_t(&dest->trim[i], &src->trim[i]);
}
dest->swtch = src->swtch;
+1 -1
View File
@@ -346,7 +346,7 @@ PACK(typedef struct {
}) TimerData_v217;
PACK(typedef struct {
int16_t trim[4];
int16_t trim[NUM_STICKS];
int8_t swtch; // swtch of phase[0] is not used
char name[LEN_FLIGHT_MODE_NAME];
uint8_t fadeIn;