Some TODOs removed

This commit is contained in:
bsongis@gmail.com
2013-06-25 06:02:03 +00:00
parent d0156700f5
commit a9208deb91
4 changed files with 16 additions and 18 deletions
+2 -1
View File
@@ -37,6 +37,8 @@
#include "opentx.h"
#include <math.h>
extern OS_MutexID audioMutex;
const unsigned int toneVolumes[] = {
4000,
8000,
@@ -833,7 +835,6 @@ void audioEvent(uint8_t e, uint16_t f)
audioQueue.play(BEEP_DEFAULT_FREQ+1800, 800, 20, PLAY_REPEAT(1)|PLAY_NOW);
break;
case AU_SWR_RED:
// TODO
audioQueue.play(450, 160, 40, PLAY_REPEAT(2), 1);
break;
#endif
-3
View File
@@ -309,7 +309,4 @@ extern void refreshSystemAudioFiles();
extern void refreshModelAudioFiles();
extern bool isAudioFileAvailable(uint32_t i, char * filename);
// TODO not public, everything could be inside a function in audio_arm.cpp
extern OS_MutexID audioMutex;
#endif
+13 -13
View File
@@ -697,19 +697,7 @@ void lcd_invert_line(int8_t y)
}
}
#if !defined(PCBTARANIS) // TODO test inversion
void lcdDrawTelemetryTopBar()
{
putsModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0);
uint8_t att = (g_vbat100mV < g_eeGeneral.vBatWarn ? BLINK : 0);
putsVBat(14*FW,0,att);
if (g_model.timers[0].mode) {
att = (timersStates[0].state==TMR_BEEPING ? BLINK : 0);
putsTime(17*FW+5*FWNUM+1, 0, timersStates[0].val, att, att);
}
lcd_invert_line(0);
}
#else
#if defined(PCBTARANIS)
void lcdDrawTelemetryTopBar()
{
putsModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0);
@@ -727,6 +715,18 @@ void lcdDrawTelemetryTopBar()
}
lcd_invert_line(0);
}
#else
void lcdDrawTelemetryTopBar()
{
putsModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0);
uint8_t att = (g_vbat100mV < g_eeGeneral.vBatWarn ? BLINK : 0);
putsVBat(14*FW,0,att);
if (g_model.timers[0].mode) {
att = (timersStates[0].state==TMR_BEEPING ? BLINK : 0);
putsTime(17*FW+5*FWNUM+1, 0, timersStates[0].val, att, att);
}
lcd_invert_line(0);
}
#endif
void putsTime(xcoord_t x, uint8_t y, putstime_t tme, LcdFlags att, LcdFlags att2)
+1 -1
View File
@@ -1145,7 +1145,7 @@ enum MixSources {
MIXSRC_SWA,
MIXSRC_SWB,
MIXSRC_SWC,
MIXSRC_LAST_CSW = MIXSRC_SW1+NUM_CSW-1, // TODO same naming convention
MIXSRC_LAST_CSW = MIXSRC_SW1+NUM_CSW-1,
MIXSRC_PPM1,
MIXSRC_LAST_PPM = MIXSRC_PPM1 + 7,