[Taranis] Asterisk BMP (thanks Martin!)

[Taranis] WDT timeout adjustable when dealing with long delays without pulses (thanks Mike for the trick!)
[Taranis] After USB is disconnected, the SD and the EEPROM are read inside the main, not inside the interrupt
[Taranis] Removed dead code about CPU temperature
[stock] Flash saving (thanks Mike for your emails!)
This commit is contained in:
bsongis@gmail.com
2013-05-17 16:30:30 +00:00
parent 80b0f0ee52
commit a41dc24a2e
17 changed files with 187 additions and 148 deletions
+11 -19
View File
@@ -2323,9 +2323,9 @@ void menuModelCurveOne(uint8_t event)
}
break;
case EVT_KEY_LONG(KEY_MENU):
pushMenu(menuChannelsView);
killEvents(event);
return;
pushMenu(menuChannelsView);
killEvents(event);
return;
}
DrawCurve(FW);
@@ -3023,6 +3023,14 @@ void onExpoMixMenu(const char *result)
void menuModelExpoMix(uint8_t expo, uint8_t event)
{
#if defined(PCBTARANIS)
if (event == EVT_KEY_LONG(KEY_MENU)) {
pushMenu(menuChannelsView);
killEvents(event);
return;
}
#endif
uint8_t sub = m_posVert;
if (s_editMode > 0)
@@ -3321,27 +3329,11 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
void menuModelExposAll(uint8_t event)
{
#if defined(PCBTARANIS)
if (event == EVT_KEY_LONG(KEY_MENU)) {
pushMenu(menuChannelsView);
killEvents(event);
return;
}
#endif
return menuModelExpoMix(1, event);
}
void menuModelMixAll(uint8_t event)
{
#if defined(PCBTARANIS)
if (event == EVT_KEY_LONG(KEY_MENU)) {
pushMenu(menuChannelsView);
killEvents(event);
return;
}
#endif
return menuModelExpoMix(0, event);
}
+4 -2
View File
@@ -106,7 +106,9 @@ void menuAboutView(uint8_t event)
case ABOUT_MIKE:
lcd_putsAtt(62, 24, PSTR("Mike Blandford"), att);
lcd_putsAtt(68, 36, PSTR("Drivers guru"), att|SMLSIZE);
lcd_putsAtt(68, 36, PSTR("Code and drivers guru"), att|SMLSIZE);
lcd_putsAtt(68, 44, PSTR("Arguably, one of the best"), att|SMLSIZE);
lcd_putsAtt(68, 52, PSTR("Inspirational"), att|SMLSIZE);
break;
case ABOUT_ROMOLO:
@@ -139,7 +141,7 @@ void menuAboutView(uint8_t event)
lcd_putsAtt(62, 24, PSTR("Parent projects"), att);
lcd_putsAtt(68, 36, PSTR("Ersky9x (Mike Blandford)"), att|SMLSIZE);
lcd_putsAtt(68, 44, PSTR("Er9x (Erez Raviv)"), att|SMLSIZE);
lcd_putsAtt(68, 52, PSTR("Th9x (Thomas Husterer)"), att|SMLSIZE);
lcd_putsAtt(67, 52, PSTR("Th9x (Thomas Husterer)"), att|SMLSIZE);
screenDuration = 300;
break;
}
+1 -3
View File
@@ -377,17 +377,15 @@ void displayBattVoltage()
#endif
}
#if defined(CPUARM)
#if defined(PCBSKY9X)
void displayVoltageOrAlarm()
{
if (g_vbat100mV > g_eeGeneral.vBatWarn && g_eeGeneral.temperatureWarn && getTemperature() >= g_eeGeneral.temperatureWarn) {
putsTelemetryValue(6*FW-1, 3*FH, getTemperature(), UNIT_DEGREES, BLINK|INVERS|DBLSIZE);
}
#if defined(PCBSKY9X)
else if (g_vbat100mV > g_eeGeneral.vBatWarn && g_eeGeneral.mAhWarn && (g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.currentCalib)/8192/36) / 500 >= g_eeGeneral.mAhWarn) {
putsTelemetryValue(7*FW-1, 3*FH, (g_eeGeneral.mAhUsed + Current_used*(488 + g_eeGeneral.currentCalib)/8192/36)/10, UNIT_MAH, BLINK|INVERS|DBLSIZE);
}
#endif
else {
displayBattVoltage();
}
+1 -1
View File
@@ -145,7 +145,7 @@ void menuStatisticsDebug(uint8_t event)
putsTime(17*FW+5*FWNUM+1, 2*FH, g_eeGeneral.globalTimer + sessionTimer, 0, 0);
#endif
#if defined(CPUARM)
#if defined(PCBSKY9X)
lcd_putsLeft(3*FH, STR_CPU_TEMP);
putsTelemetryValue(MENU_DEBUG_COL_OFS, 3*FH, getTemperature(), UNIT_DEGREES, 0);
putsTelemetryValue(20*FW+2, 3*FH, maxTemperature+g_eeGeneral.temperatureCalib, UNIT_DEGREES, 0);