Skip to content

Commit 863b52f

Browse files
author
Peter Wegmann
committed
changed eeprom undefined message on startup
1 parent cf60674 commit 863b52f

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

Controller/filling_mode.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,6 @@ void filling_pressedNONE(Controller_Model *Model){
321321
// enter pressure
322322
if (HoneywellSSC_status.connected && (count_t_elapsed%3 == 0) && (count_t_elapsed != filling_model.t_last_presss_meas ) )
323323
{
324-
325-
326324
filling_model.t_last_presss_meas = count_t_elapsed;
327325
LVM.vars->pressure_level = 0;
328326
HoneywellSSC_read_pressure();

StringPixelCoordTable.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,9 @@
469469

470470
//paint_offline()
471471
#define STR_OFF "OFF"
472-
473-
#define STR_EEPROM_UNDEFINED "EEPROM undef."
474-
#define STR_VALUES_MIGHT_BE_UNDEFINED "Values stored in EEPROM\nmight be undefined,\nplease recalibrate!\nPress YES to not show\nthis message again."
472+
473+
#define STR_EEPROM_UNDEFINED "Calibration faulty"
474+
#define STR_VALUES_MIGHT_BE_UNDEFINED "Values stored in EEPROM\nmight be undefined,\nplease recalibrate!"
475475

476476
//===============================================================================
477477
//-----Main loop-------------------------------------------------------------

StringPixelCoordTable_ili9341.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,8 @@
620620
//paint_offline()
621621
#define STR_OFF "OFF"
622622

623-
#define STR_EEPROM_UNDEFINED "EEPROM undefined"
624-
#define STR_VALUES_MIGHT_BE_UNDEFINED "Values stored in EEPROM\nmight be undefined, please\nrecalibrate!\nPress YES to not show this\nmessage again."
623+
#define STR_EEPROM_UNDEFINED "Calibration Missing"
624+
#define STR_VALUES_MIGHT_BE_UNDEFINED "Values stored in EEPROM\nmight be undefined, please\nrecalibrate!"
625625

626626
//===============================================================================
627627
//-----Main loop-------------------------------------------------------------

config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define FIRMWARE_VERSION 222
1616

1717
#define BRANCH_ID 1
18-
#define LAST_FIRMWARE_EEPROM_CHANGED 220
18+
#define LAST_FIRMWARE_EEPROM_CHANGED 222
1919

2020

2121

main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,9 +821,10 @@ int main(void)
821821

822822
if (((LVM.vars->eeprom_changed != LVM.version->Fw_version) && LVM.version->FW_eeprom_changed > LVM.vars->eeprom_changed) || LVM.vars->eeprom_changed > LVM.version->Fw_version ){
823823
// DIALOG --> eeprom values might be undefined pls recalibrate
824-
if(LCD_Dialog(STR_EEPROM_UNDEFINED,STR_VALUES_MIGHT_BE_UNDEFINED,D_BGC,D_FGC,30)){
824+
timed_dialog(STR_EEPROM_UNDEFINED,STR_VALUES_MIGHT_BE_UNDEFINED,15,D_FGC,D_BGC);
825+
//if(LCD_Dialog(STR_EEPROM_UNDEFINED,STR_VALUES_MIGHT_BE_UNDEFINED,D_BGC,D_FGC,30)){
825826

826-
}
827+
//}
827828

828829
ready_for_new_key();
829830
}

timer_utilities.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,17 +373,17 @@ void timed_dialog(char *title, char *text, uint8_t timeout, unsigned int ForeCol
373373
{
374374
case Landscape:
375375
LCD_Box(X_LD_10,Y_LD_25,X_LD_160,Y_LD_120,ForeColor);
376-
LCD_Print(title,LD_MID_LANDSCAPE-(strlen(title)*LD_HALF_CHAR_WIDTH),Y_LD_1,2,1,1,ForeColor,BackColor);
376+
LCD_Print(title,LD_MID_LANDSCAPE-((strlen(title)*FONT2_W)/2),Y_LD_1,2,1,1,ForeColor,BackColor);
377377
x0 = X_LD_13;
378378
break;
379379
case Landscape180:
380380
LCD_Box(X_LD_17,Y_LD_25,X_LD_166,Y_LD_120,ForeColor);
381-
LCD_Print(title,LD_MID_LANDSCAPE180-(strlen(title)*LD_HALF_CHAR_WIDTH),Y_LD_1,2,1,1,ForeColor,BackColor);
381+
LCD_Print(title,LD_MID_LANDSCAPE-((strlen(title)*FONT2_W)/2),Y_LD_1,2,1,1,ForeColor,BackColor);
382382
x0 = X_LD_20;
383383
break;
384384
default:
385385
LCD_Box(X_LD_10,Y_LD_25,X_LD_120,Y_LD_165,ForeColor);
386-
LCD_Print(title,65-(strlen(title)*LD_HALF_CHAR_WIDTH),Y_LD_1,2,1,1,ForeColor,BackColor);
386+
LCD_Print(title,LD_MID_LANDSCAPE-((strlen(title)*FONT2_W)/2),Y_LD_1,2,1,1,ForeColor,BackColor);
387387
x0 = X_LD_13;
388388
break;
389389
}

0 commit comments

Comments
 (0)