Issue 156 fixed

This commit is contained in:
bernet.andre@gmail.com
2012-11-10 23:36:52 +00:00
parent 327b8f78dd
commit 087f4e3276
11 changed files with 26 additions and 8 deletions
+1 -1
View File
@@ -153,7 +153,7 @@ void menuGeneralSetup(uint8_t event)
switch(k) {
#if defined(RTCLOCK)
case ITEM_SETUP_DATE:
lcd_putsLeft(y, PSTR("Date"));
lcd_putsLeft(y, STR_DATE);
lcd_putc(FW*15+5, y, '-'); lcd_putc(FW*18+3, y, '-');
for (uint8_t j=0; j<3; j++) {
uint8_t rowattr = (m_posHorz==j) ? attr : 0;
+1 -1
View File
@@ -1000,7 +1000,7 @@ void menuModelPhaseOne(uint8_t event)
#if defined(ROTARY_ENCODERS)
case ITEM_MODEL_PHASE_ROTARY_ENCODERS:
lcd_putsLeft(y, PSTR("R.Encs"));
lcd_putsLeft(y, STR_ROTARY_ENCODER);
for (uint8_t t=0; t<NUM_ROTARY_ENCODERS; t++) {
putsRotaryEncoderMode(MIXES_2ND_COLUMN+(t*FW), y, s_currIdx, t, (attr && m_posHorz==t) ? ((editMode>0) ? BLINK|INVERS : INVERS) : 0);
if (attr && m_posHorz==t && ((editMode>0) || p1valdiff)) {
+2
View File
@@ -371,6 +371,8 @@ const pm_char STR_SD_SIZE[] PROGMEM = TR_SD_SIZE;
const pm_char STR_CURVE_TYPE[] PROGMEM = TR_CURVE_TYPE;
const pm_char STR_GLOBAL_VARS[] PROGMEM = TR_GLOBAL_VARS;
const pm_char STR_OWN[] PROGMEM = TR_OWN;
const pm_char STR_ROTARY_ENCODER[] PROGMEM = TR_ROTARY_ENCODER;
const pm_char STR_DATE[] PROGMEM = TR_DATE;
const pm_uchar font[] PROGMEM = {
#include "font.lbm"
+2
View File
@@ -464,6 +464,8 @@ extern const pm_char STR_SD_SIZE[];
extern const pm_char STR_CURVE_TYPE[];
extern const pm_char STR_GLOBAL_VARS[];
extern const pm_char STR_OWN[];
extern const pm_char STR_ROTARY_ENCODER[];
extern const pm_char STR_DATE[];
#if defined(VOICE)
PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att);
+2
View File
@@ -454,3 +454,5 @@
#define TR_CURVE_TYPE TR_SD_TYPE
#define TR_GLOBAL_VARS "Glob\200ln\204 prom\203nn\202"
#define TR_OWN "Sv\200"
#define TR_DATE "Date"
#define TR_ROTARY_ENCODER "R.Encs"
+8 -6
View File
@@ -15,7 +15,7 @@
#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0"
#define LEN_VRENAVIG "\003"
#define TR_VRENAVIG "AUSDKaDKb"
#define TR_VRENAVIG "AUSDGaDGb"
#define LEN_VFILTERADC "\004"
#define TR_VFILTERADC "SING""OSMP""FILT"
@@ -196,7 +196,7 @@
#define TR_VKEYS " Menu"" Exit""Unten"" Oben"" Re."" Li."
#define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "DKa""DKb"
#define TR_VRENCODERS "DGa""DGb"
#define LEN_VSWITCHES "\003"
#if defined(PCBSKY9X)
@@ -207,11 +207,11 @@
#define LEN_VSRCRAW "\004"
#if defined(PCBSKY9X)
#define TR_ROTARY_ENCODERS_VSRCRAW "DKa\0"
#define TR_ROTARY_ENCODERS_VSRCRAW "DGa\0"
#elif defined(PCBGRUVIN9X) && defined(EXTRA_ROTARY_ENCODERS)
#define TR_ROTARY_ENCODERS_VSRCRAW "DKa ""DKb ""DKc ""DKd "
#define TR_ROTARY_ENCODERS_VSRCRAW "DGa ""DGb ""DGc ""DGd "
#elif defined(PCBGRUVIN9X) && !defined(EXTRA_ROTARY_ENCODERS)
#define TR_ROTARY_ENCODERS_VSRCRAW "DKa ""DKb "
#define TR_ROTARY_ENCODERS_VSRCRAW "DGa ""DGb "
#else
#define TR_ROTARY_ENCODERS_VSRCRAW
#endif
@@ -308,7 +308,7 @@
#define TR_INACTIVITYALARM INDENT"Inaktivit\201t"
#define TR_MEMORYWARNING INDENT"Speicher voll"
#define TR_ALARMWARNING INDENT"Ton aus"
#define TR_RENAVIG "Drehkn\205p. Navig."
#define TR_RENAVIG "Drehgeb. Navig."
#define TR_FILTERADC "ADC Filter"
#define TR_THROTTLEREVERSE "Gasumkehrung"
#define TR_BEEP_LABEL "Stoppuhrpieper"
@@ -455,3 +455,5 @@
#define TR_CURVE_TYPE "Typ"
#define TR_GLOBAL_VARS "Globale Variablen"
#define TR_OWN "Eigen"
#define TR_DATE "Datum"
#define TR_ROTARY_ENCODER "Drehgeber"
+2
View File
@@ -460,3 +460,5 @@
#define TR_CURVE_TYPE "Type"
#define TR_GLOBAL_VARS "Global Variables"
#define TR_OWN "Own"
#define TR_DATE "Date"
#define TR_ROTARY_ENCODER "R.Encs"
+2
View File
@@ -454,3 +454,5 @@
#define TR_CURVE_TYPE "Type"
#define TR_GLOBAL_VARS "Global Variables"
#define TR_OWN "Own"
#define TR_DATE "Date"
#define TR_ROTARY_ENCODER "R.Encs"
+2
View File
@@ -455,3 +455,5 @@
#define TR_CURVE_TYPE "Type"
#define TR_GLOBAL_VARS "Variables Globales"
#define TR_OWN "Pers"
#define TR_DATE "Date"
#define TR_ROTARY_ENCODER "Enc.Rot."
+2
View File
@@ -458,3 +458,5 @@
#define TR_CURVE_TYPE "Tipo"
#define TR_GLOBAL_VARS "Variabili Globali"
#define TR_OWN "Own"
#define TR_DATE "Date"
#define TR_ROTARY_ENCODER "R.Encs"
+2
View File
@@ -463,3 +463,5 @@
#define TR_CURVE_TYPE "Typ "
#define TR_GLOBAL_VARS "Global Variables"
#define TR_OWN "Own"
#define TR_DATE "Date"
#define TR_ROTARY_ENCODER "R.Encs"