bug fixes

-options are saved when shutdown via options menu
- "eeprom might be invalid" message on startup now only goes away after user enters calibration mode once

Author: Peter Wegmann

Controller/diagnostic_mode.c

@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
+#include <avr/eeprom.h>
 
 #include "base_controller.h"
 #include "diagnostic_mode.h"
@@ -173,6 +174,10 @@ void diag_pressedNONE(Controller_Model *Model){
 
 void calibration(Controller_Model *Model){
 	LCD_Cls(BGC);
+	
+	// User entered calibration --> this disables warning on startup
+	eeprom_write_word(&LVM.eeprom->eeprom_changed,LVM.version->Fw_version);
+	
 	if(LCD_Dialog(STR_CALIBRATION, STR_SET_RESISTANCE_OR_NZERO_TO_DEFAULT , D_FGC, D_BGC,CALIBRATE_TIMEOUT_TIME))
 	{
 		// User answered "Yes"

Controller/option_mode.c

@@ -265,10 +265,10 @@ void option_pre_Switch_case_Tasks(Controller_Model *Model){
 		set_timeout(OPT_TIMEOUT_TIME, TIMER_3, USE_TIMER);
 	}
 
-	if(!set_timeout(0,TIMER_3, USE_TIMER))  //shutdown after shutdown_timout if no key was pressed
+	if(!set_timeout(0,TIMER_3, USE_TIMER))  //exit options  if no key was pressed
 	{
 		option_model.options_changed = false;
-		option_exit(Model);
+		option_exit(Model, 0);
 	}
 }
 
@@ -280,7 +280,7 @@ void option_post_Switch_case_Tasks(Controller_Model *Model){
 		if ((option_model.page == 0)||(option_model.page ==  7))
 		{
 			set_OptionModel(1,1,0);
-			option_exit(Model);
+			option_exit(Model, 0);
 			ready_for_new_key();
 			return;
 		}
@@ -387,9 +387,11 @@ void Bool_valueChange (ValueOptions *optEntry, int key)
 void Bool_valueChange_Shutdown(ValueOptions *optEntry, int key){
 	if(LCD_Dialog(STR_SHUTDOWN_OPT,STR_DO_YOU_REALLY_WANT_SHUTDOWN, D_FGC, D_BGC,SHUTDOWN_TIMEOUT_TIME))
 	{
+		Controller_Model * Model = (Controller_Model *) &option_model;
+		option_exit(Model,1);
 		LCD_Cls(BGC);
 
-		Controller_Model * Model = (Controller_Model *) &option_model;
+
 		shutdown_LVM(Model);
 	}
 	else {
@@ -1115,7 +1117,7 @@ void opt_ValueChange(){
 
 
 
-void option_exit(Controller_Model * Model){
+void option_exit(Controller_Model * Model, uint8_t headless){
 	// Set buffered variables
 	LVM.options->display_reversed = option_model.display_reversed_buff;
 	LVM.options->batt_min = option_model.batt_min_buff;
@@ -1166,7 +1168,11 @@ void option_exit(Controller_Model * Model){
 		}
 
 	}
-	paint_main(Time, Model->mode->netstat, PAINT_ALL);
+	if (!headless)
+	{
+		paint_main(Time, Model->mode->netstat, PAINT_ALL);
+	}
+
 	Model->mode->next = ex_main;
 	option_model.options_changed = false;
 

Controller/option_mode.h

@@ -213,7 +213,7 @@ void opt_drawPage(void);
 
 void opt_ValueChange(void);
 
-void option_exit(Controller_Model * Model);
+void option_exit(Controller_Model * Model, uint8_t headless);
 
 
 

LHe-Level-Meter.cproj

@@ -54,7 +54,7 @@
       <ToolName>STK500</ToolName>
     </com_atmel_avrdbg_tool_stk500>
     <avrtoolinterface>ISP</avrtoolinterface>
-    <avrtoolinterfaceclock>999946</avrtoolinterfaceclock>
+    <avrtoolinterfaceclock>944399</avrtoolinterfaceclock>
     <com_atmel_avrdbg_tool_simulator>
       <ToolOptions>
         <InterfaceProperties>
@@ -69,7 +69,7 @@
     <com_atmel_avrdbg_tool_powerdebugger>
       <ToolOptions>
         <InterfaceProperties>
-          <IspClock>999946</IspClock>
+          <IspClock>944399</IspClock>
           <JtagDbgClock>220000</JtagDbgClock>
           <JtagEnableExtResetOnStartSession>true</JtagEnableExtResetOnStartSession>
           <JtagInChain>false</JtagInChain>

config.h

@@ -12,7 +12,7 @@
 
 
 
-#define FIRMWARE_VERSION 221
+#define FIRMWARE_VERSION 222
 
 #define BRANCH_ID  1
 #define  LAST_FIRMWARE_EEPROM_CHANGED 220

display_utilities.c

@@ -380,8 +380,6 @@ void paint_time_pressure(struct tm ltime, double lpress, _Bool update)
 		LCD_Print(xbee_get_coordID(),X_PTP_COORDINATOR +xoff-strlen(xbee_get_coordID())*FONT1_W,Y_PTP_COORDINATOR,1,1,1,color,BGC);
 
 
-		if (!update)
-		{
 
 		//autofill indicator
 		uint8_t boxheight = AUTOFILL_BOX_WIDTH;
@@ -396,7 +394,7 @@ void paint_time_pressure(struct tm ltime, double lpress, _Bool update)
 			LCD_Box(x0,y0,x0+boxheight,y0+boxheight,green);
 			LCD_Box(x0+1,y0+1,x0+boxheight-1,y0+boxheight-1,BGC);
 		}
-		}
+		
 
 
 

main.c

@@ -822,7 +822,7 @@ int main(void)
 	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 ){
 		// DIALOG --> eeprom values might be undefined pls recalibrate
 		if(LCD_Dialog(STR_EEPROM_UNDEFINED,STR_VALUES_MIGHT_BE_UNDEFINED,D_BGC,D_FGC,30)){
-			eeprom_write_word(&LVM.eeprom->eeprom_changed,LVM.version->Fw_version);
+			
 		}
 
 		ready_for_new_key();