Bug fixes

 Bug fixes

LAN GCM:
- Node identifier respnse fix
- offline on startup errormessage ajusted
- wait time to connect coordinator increased to 5min

general:
- temp is now omitted when when no bmp sensor is connected
- measurement is sent when volume is greater or equal delta vol

Author: Peter Wegmann

DispAdapter.c

@@ -223,7 +223,7 @@ void paint_Main(void){
 
 
 
-void paint_Value(uint64_t val,ROW_NAME row,uint8_t precision, uint8_t min_width,char* unit){
+void paint_Value(double val,ROW_NAME row,uint8_t precision, uint8_t min_width,char* unit){
 	#ifdef ili9341
 	char numberbuffer[30];
 	dtostrf(((double)val)/pow(10,precision),min_width,precision,numberbuffer);
@@ -390,8 +390,14 @@ void displayTemPreVol(void){
 				paint_string_row("",TEMP,1,"",white);
 				sensor_err = 0;
 			}
-			
-			paint_Value( options.Temperature_value - 2732,TEMP, 1, 4, "°C");
+			if (!options.T_Compensation_enable && !connected.BMP)
+			{
+				paint_string_row("/",TEMP,0,"",white);
+			}
+			else
+			{
+				paint_Value( ((double)options.Temperature_value) - 2732,TEMP, 1, 4, "°C");
+			}
 		}
 		else{
 
@@ -402,7 +408,13 @@ void displayTemPreVol(void){
 		//PRESSURE
 		if(!(options.p_Compensation_enable && (CHECK_ERROR(TEMPPRESS_ERROR))))
 		{
-			paint_Value(options.Pressure_value,PRESS, 1, 6, "mbar");
+			if (!options.p_Compensation_enable && !connected.BMP)
+			{
+				paint_string_row("/",PRESS,0,"",white);
+				}else{
+				paint_Value(options.Pressure_value,PRESS, 1, 6, "mbar");
+			}
+			
 		}
 		else{
 

DispAdapter.h

@@ -83,7 +83,7 @@ void setInitScreen(uint16_t fore, uint16_t back, uint8_t nextLine, uint8_t FontN
 void paint_info_line(char * line, _Bool update);
 void paint_string_row_col(char *text,ROW_NAME row,uint8_t col, uint16_t color);
 void paint_string_row(char *text,ROW_NAME row,uint8_t update,char* unit,uint16_t color);
-void paint_Value(uint64_t val,ROW_NAME row,uint8_t precision, uint8_t min_width,char* unit);
+void paint_Value(double val,ROW_NAME row,uint8_t precision, uint8_t min_width,char* unit);
 void paint_Error(char* text, ROW_NAME row);
 void paint_Main(void);
 void InitScreen_AddLine_ili(const char* Text, const char FirstLine);

Gascounter_main.c

@@ -639,13 +639,18 @@ void init(void)
 	}
 	else
 	{
-		
+		#ifdef ili9341
+		Print_add_Line(STR_INIT_PRESS_ERR,2);
+		#endif
+		#ifdef GCM_old_disp
+		Print_add_Line(STR_INIT_PRESS_ERR,0);
+		#endif
 		connected.BMP = 0;
 		connected.BMP_on_Startup = 0;
 		connected.TWI = 1;
 		BMP_Temperature = 0;
 		BMP_Pressure = 0;
-		Print_add_Line(" ",0);
+		//Print_add_Line(" ",0);
 
 	}
 
@@ -1249,7 +1254,7 @@ void execute_server_CMDS(uint8_t reply_id){
 
 		case GET_SC_XBEE_MASK:
 		;
-			
+		
 		sendbuffer[0] = xbee.ScanChannels >> 8;
 		sendbuffer[1] = xbee.ScanChannels;
 
@@ -1284,7 +1289,7 @@ void execute_server_CMDS(uint8_t reply_id){
 		xbee.CoordIdentifier[NI_len] =  '\0';
 
 		xbee_pseudo_send_AT_response( 'N', 'I', 0, sendbuffer, 0);
-		
+		break;
 		default:;
 		uint8_t AT_Code = frameBuffer[reply_id].type;
 
@@ -1721,7 +1726,7 @@ int main(void)
 	while(1)
 	{
 		delta_t = count_t_elapsed - time_first_try;
-		if(delta_t > 60)
+		if(delta_t > WAITTIME_COORDINATOR_ACTIVATION)
 		{
 			Print_add_Line("...failed!",0);
 			Print_add_Line("offline mode",0);
@@ -2077,8 +2082,8 @@ int main(void)
 
 
 		if((delta.t_send >= options.t_transmission_max * 60)|| //
-		(delta.t_send >= options.t_transmission_min && delta.Volume_since_last_send > options.delta_V)||
-		(delta.t_send >= options.t_transmission_min && delta.Pressure_since_last_send > options.delta_p)||
+		(delta.t_send >= options.t_transmission_min && delta.Volume_since_last_send >= options.delta_V)||
+		(delta.t_send >= options.t_transmission_min && delta.Pressure_since_last_send >= options.delta_p)||
 		(delta.t_send >= options.t_transmission_min && status_reset_on_send && status_reset_on_send != last.Status_on_Send) )
 		{
 

Gascounter_main.h

@@ -36,6 +36,7 @@
 #define MEASUREMENT_MESSAGE_LENGTH 23  /**< @brief Number of Bytes that makes up one Measurement Message*/
 #define NUMBER_LOGIN_BYTES	    36     /**< @brief Number of Bytes in login Message from Server   */
 
+#define WAITTIME_COORDINATOR_ACTIVATION 300
 //#define COM_TIMEOUT_TIME 		10	/**< @brief Communication Timeout-period in Seconds  */
 
 

StringPixelCoordTable_ili9341.h

@@ -112,13 +112,14 @@
 #define STR_INIT_CLOCK_ERR "Init DS3231M RTC  ...error"
 #define STR_INIT_PRESS "Init BMP085"
 #define STR_INIT_PRESS_SUCC "Init BMP085  ...success"
+#define STR_INIT_PRESS_ERR  "Init BMP085   not connected"
 #define STR_INIT_DONE "Init done"
 
 
 
 // Strings
 
-#define STR_INIT_OFFLINE "Init Offline"
+#define STR_INIT_OFFLINE "Network Err"
 #define STR_INIT_OFFLINE_MESSAGE "Network connection \ncould not be establishedon startup\n\nNetworkstatus:\n%s"
 #define STR_NO_COORDINATOR_FOUND "No Coordinator found"
 #define STR_NO_SERVER_FOUND "No Server found"