Massive revert of the trunk to return to the last known stable version. I would like a new release soon.

This commit is contained in:
bsongis
2012-04-18 08:24:33 +00:00
parent 090b111b7a
commit 1d2de3d3e0
21 changed files with 191 additions and 674 deletions
+1 -10
View File
@@ -98,7 +98,6 @@ enum menuProcSetupItems {
#ifdef HAPTIC
ITEM_SETUP_HAPTIC_MODE,
ITEM_SETUP_HAPTIC_STRENGTH,
ITEM_SETUP_HAPTIC_LENGTH,
#endif
#ifdef SPLASH
ITEM_SETUP_SPLASH,
@@ -119,7 +118,7 @@ void menuProcSetup(uint8_t event)
#define AUDIO_ZEROS
#endif
#ifdef HAPTIC
#define HAPTIC_ZEROS 0, 0, 0,
#define HAPTIC_ZEROS 0, 0,
#else
#define HAPTIC_ZEROS
#endif
@@ -198,14 +197,6 @@ void menuProcSetup(uint8_t event)
}
if((y+=FH)>7*FH) return;
}subN++;
if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_HAPTICLENGTH);
lcd_putsiAtt(GENERAL_PARAM_OFS, y, STR_VBEEPLEN, 2+g_eeGeneral.hapticLength, (sub==subN ? INVERS:0));
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.hapticLength, -2, 2);
if((y+=FH)>7*FH) return;
}subN++;
#endif
#if defined(PCBARM)