Issue 166 continued (2nd 3-pos switch)

Issue 177 fixed (Vario range)
Halcyon again selectable
This commit is contained in:
bsongis
2013-01-22 20:15:59 +00:00
parent a626ea2ceb
commit a599e6da11
25 changed files with 209 additions and 172 deletions
-2
View File
@@ -103,8 +103,6 @@ void dacInit()
void audioInit()
{
dacInit() ;
// TODO - for volume, shared with EEPROM?
}
void audioEnd()
+12 -15
View File
@@ -55,14 +55,6 @@
#define TIMER_MULT_APB1 2
#define TIMER_MULT_APB2 1
// TODO elsewhere
#if !defined(SIMU)
#define SD_IS_HC() (1)
#endif
void sdInit();
void sdPoll10ms();
void usbMassStorage();
#define JACK_PPM_OUT()
@@ -75,12 +67,6 @@ extern uint8_t temperature ; // Raw temp reading
extern uint8_t maxTemperature ; // Raw temp reading
uint8_t getTemperature();
#define SD_GET_SIZE_MB() (0)
#define SD_GET_BLOCKNR() (0)
#define SD_GET_SPEED() (0)
void pwrOff();
#define strcpy_P strcpy
#define strcat_P strcat
@@ -96,7 +82,6 @@ void debugInit();
void init_trainer_ppm();
void init_trainer_capture();
#define DEBUG_UART_BAUDRATE 115200
void uartInit(void);
@@ -105,6 +90,17 @@ void uartSendChar(uint8_t c);
void delaysInit(void);
void delay_01us(uint16_t nb);
// SD driver
#if !defined(SIMU)
#define SD_IS_HC() (1)
#define SD_GET_SIZE_MB() (0)
#define SD_GET_BLOCKNR() (0)
#define SD_GET_SPEED() (0)
void sdInit();
void sdPoll10ms();
#define sdMountPoll()
#endif
// Keys driver
void keysInit();
uint32_t readKeys();
@@ -129,6 +125,7 @@ extern volatile uint16_t Analog_values[];
// Power driver
void pwrInit();
uint32_t pwrCheck();
void pwrOff();
// Backlight driver
#define setBacklight(xx)
-11
View File
@@ -906,15 +906,4 @@ uint32_t sdMounted()
return g_FATFS_Obj.fs_type != 0;
}
void sdMountPoll()
{
/* TODO a define
static uint8_t mountTimer;
if (mountTimer-- == 0) {
mountTimer = 100;
if (!sdMounted()) {
sdInit();
}
}*/
}