From f82680b53c59630c6a4a7086d7d93052fc8ab385 Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Sun, 5 May 2013 09:34:09 +0000 Subject: [PATCH] [sky9x] 2nd module EEPROM --- src/eeprom_conversions.cpp | 2 +- src/menu_model.cpp | 8 ++++---- src/myeeprom.h | 2 +- src/opentx.cpp | 2 +- src/pulses_arm.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/eeprom_conversions.cpp b/src/eeprom_conversions.cpp index 9567882e6..658955988 100644 --- a/src/eeprom_conversions.cpp +++ b/src/eeprom_conversions.cpp @@ -166,7 +166,7 @@ bool eeConvert() } g_model.protocol = oldModel.protocol; g_model.thrTrim = oldModel.thrTrim; - g_model.ppmNCH = oldModel.ppmNCH; + g_model.moduleData[0].channelsCount = oldModel.ppmNCH*2; g_model.trimInc = oldModel.trimInc; g_model.disableThrottleWarning = oldModel.disableThrottleWarning; g_model.moduleData[0].ppmPulsePol = oldModel.pulsePol; diff --git a/src/menu_model.cpp b/src/menu_model.cpp index 1b95a39fa..f1ae3d90b 100644 --- a/src/menu_model.cpp +++ b/src/menu_model.cpp @@ -1386,17 +1386,17 @@ void menuModelSetup(uint8_t event) lcd_putsLeft(y, PSTR("Port2")); lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_VPROTOS, 0, 0); lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+4*FW+3, y, STR_CH, m_posHorz<=0 ? attr : 0); - lcd_outdezAtt(lcdLastPos, y, g_model.ppm2SCH+1, LEFT | (m_posHorz<=0 ? attr : 0)); + lcd_outdezAtt(lcdLastPos, y, g_model.moduleData[1].channelsStart+1, LEFT | (m_posHorz<=0 ? attr : 0)); lcd_putc(lcdLastPos, y, '-'); - lcd_outdezAtt(lcdLastPos + FW+1, y, g_model.ppm2SCH+8+(g_model.ppm2NCH*2), LEFT | (m_posHorz!=0 ? attr : 0)); + lcd_outdezAtt(lcdLastPos + FW+1, y, g_model.moduleData[1].channelsStart+8+g_model.moduleData[1].channelsCount, LEFT | (m_posHorz!=0 ? attr : 0)); if (attr && (editMode>0 || p1valdiff)) { switch (m_posHorz) { case 0: - CHECK_INCDEC_MODELVAR_ZERO(event, g_model.ppm2SCH, 32-8-(g_model.ppm2NCH*2)); + CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[1].channelsStart, 32-8-g_model.moduleData[1].channelsCount); g_model.moduleData[1].ppmFrameLength = NUM_PORT1_CHANNELS()>NUM_PORT2_CHANNELS() ? 4*(NUM_PORT1_CHANNELS()-8) : 4*(NUM_PORT2_CHANNELS()-8); break; case 1: - CHECK_INCDEC_MODELVAR(event, g_model.ppm2NCH, -2, min(4, (32-g_model.ppm2SCH)/2-4)); + CHECK_INCDEC_MODELVAR(event, g_model.moduleData[1].channelsCount, -4, min(8, 32-g_model.moduleData[1].channelsStart)-8); g_model.moduleData[1].ppmFrameLength = NUM_PORT1_CHANNELS()>NUM_PORT2_CHANNELS() ? 4*(NUM_PORT1_CHANNELS()-8) : 4*(NUM_PORT2_CHANNELS()-8); break; } diff --git a/src/myeeprom.h b/src/myeeprom.h index 0845c4124..28d4afa84 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -239,7 +239,7 @@ enum ModuleIndex { #define swstate_t uint16_t #elif defined(PCBSKY9X) #define MODELDATA_BITMAP -#define MODELDATA_EXTRA uint8_t ppmSCH; int8_t ppm2SCH; int8_t ppm2NCH; ModuleData moduleData[NUM_MODULES]; +#define MODELDATA_EXTRA ModuleData moduleData[NUM_MODULES]; #define LIMITDATA_EXTRA #define swstate_t uint8_t #else diff --git a/src/opentx.cpp b/src/opentx.cpp index c7f0a5c45..5b4ce6e3e 100644 --- a/src/opentx.cpp +++ b/src/opentx.cpp @@ -4177,8 +4177,8 @@ void mixerTask(void * pdata) CoLeaveMutexSection(mixerMutex); if (tick10ms) checkTrims(); - uint8_t heartbeatCheck = HEART_TIMER_10MS; #if defined(PCBTARANIS) + uint8_t heartbeatCheck = HEART_TIMER_10MS; if (g_model.moduleData[0].rfProtocol != RF_PROTO_OFF) heartbeatCheck |= HEART_TIMER_PULSES << 0; if (g_model.externalModule != MODULE_TYPE_NONE) diff --git a/src/pulses_arm.cpp b/src/pulses_arm.cpp index 2f254db7e..e421bb2d6 100644 --- a/src/pulses_arm.cpp +++ b/src/pulses_arm.cpp @@ -440,7 +440,7 @@ extern "C" void PWM_IRQHandler(void) } pwmptr->PWM_CH_NUM[3].PWM_CPDRUPD = period; // Period in half uS if (period != 5000) { // 2.5 mS - setupPulses(INTERNAL_MODULE); + setupPulses(0); } else { // Kick off serial output here