works for gcm disp

Author: Wegmann Peter

DispAdapter.c

@@ -21,11 +21,16 @@
 #include "disp/gcm_old_lcd_driver.h"
 #endif
 
+#ifdef ili9341
 #include "disp/display_lib.h"
 #include "disp/ili9341_driver.h"
+#include "StringPixelCoordTable_ili9341.h"
+#endif
 
 
-#include "StringPixelCoordTable_ili9341.h"
+
+#ifdef ili9341
+
 
 InitScreenType InitScreen_ili = {
 	.ForeColor = ERR,
@@ -37,7 +42,7 @@ InitScreenType InitScreen_ili = {
 	.XScale = 1,
 	.YScale = 1
 };
-
+#endif
 
 
 void lcd_init(void){
@@ -77,8 +82,8 @@ void lcd_Cls(unsigned int color){
 	#endif
 
 	#ifdef GCM_old_disp
-		LCD_Clear();
-#endif
+	LCD_Clear();
+	#endif
 }
 
 
@@ -154,40 +159,50 @@ void paint_info_line(char * line, _Bool update){
 
 
 
+
 void paint_string_row(char *text,ROW_NAME row,uint8_t update,char* unit,uint16_t color){
-		if (update)
-		{
-			lcd_Print("               ",X_LEFT_EDGE + DESCRUPTOR_LEN * FONT2_W,Y_VALUES_START + FONT2_H * row,2,1,1,color,BGC);
-		}
-		
-		strcat(text," ");
-		
-		lcd_Print(text,X_LEFT_EDGE + DESCRUPTOR_LEN * FONT2_W,Y_VALUES_START + FONT2_H * row,2,1,1,color,BGC);
+	#ifdef ili9341
+	if (update)
+	{
+		lcd_Print("               ",X_LEFT_EDGE + DESCRUPTOR_LEN * FONT2_W,Y_VALUES_START + FONT2_H * row,2,1,1,color,BGC);
+	}
+	
+	lcd_Print(text,X_LEFT_EDGE + DESCRUPTOR_LEN * FONT2_W,Y_VALUES_START + FONT2_H * row,2,1,1,color,BGC);
+	
+	lcd_Print(" ",X_LEFT_EDGE + DESCRUPTOR_LEN * FONT2_W + strlen(text) * FONT2_W,Y_VALUES_START + FONT2_H * row,2,1,1,color,BGC);
 
-		lcd_Print(unit,HALF_SPACE_WIDTH_FONT_2 + X_LEFT_EDGE + (DESCRUPTOR_LEN+strlen(text)-1) * FONT2_W, Y_VALUES_START + FONT2_H * row,2,1,1,color,BGC);
+	lcd_Print(unit,HALF_SPACE_WIDTH_FONT_2 + X_LEFT_EDGE + (DESCRUPTOR_LEN+strlen(text)) * FONT2_W, Y_VALUES_START + FONT2_H * row,2,1,1,color,BGC);
+	#endif
 }
 
 void paint_Main(void){
+	#ifdef ili9341
 	lcd_Print("Inf:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * INFO  ,2,1,1,FGC,BGC);
 	lcd_Print("Val:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * VALUE  ,2,1,1,FGC,BGC);
 	lcd_Print("Vol:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * VOLUME ,2,1,1,FGC,BGC);
 	lcd_Print("Cor:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * CORRVOL,2,1,1,FGC,BGC);
 	lcd_Print("Tmp:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * TEMP   ,2,1,1,FGC,BGC);
 	lcd_Print("Prs:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * PRESS  ,2,1,1,FGC,BGC);
 	lcd_Print("Con:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * CONN  ,2,1,1,FGC,BGC);
-} 
+
+	#endif
+}
 
 
 
 void paint_Value(uint64_t 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);
 
 	paint_string_row(numberbuffer,row,0,unit,white);
+	#endif
 }
 
 void paint_Error(char* text, ROW_NAME row){
+	#ifdef ili9341
 	paint_string_row(text,row,1,"",red);
+	#endif
 }
 
 //=========================================================================
@@ -198,6 +213,8 @@ void paint_Error(char* text, ROW_NAME row){
 // if FirstLine is 1 clear page and start with first line
 void InitScreen_AddLine_ili(const char* Text, const char FirstLine)
 {
+	#ifdef ili9341
+
 	if (FirstLine == 1)
 	{
 		InitScreen_ili.NextLine = 1;
@@ -219,21 +236,28 @@ void InitScreen_AddLine_ili(const char* Text, const char FirstLine)
 		_delay_ms(1000);		  // wait until next page is displayed
 	}
 	_delay_ms(500);
+	#endif // ili9341
 
 }
 
 void setInitScreen_ili(uint16_t fore, uint16_t back, uint8_t nextLine, uint8_t FontNr, uint8_t XScale, uint8_t YScale){
+	#ifdef ili9341
+
 	InitScreen_ili.ForeColor = fore;
 	InitScreen_ili.BackColor = back;
 	InitScreen_ili.NextLine = nextLine;
 	InitScreen_ili.FontNr = FontNr;
 	InitScreen_ili.XScale = XScale;
 	InitScreen_ili.YScale = YScale;
+	#endif
 }
 
 
 void paint_info_line_ili(char *line, _Bool update)
 {
+	#ifdef ili9341
+
 	if (!update) LCD_Print("                      ",  X_PIL_2, Y_PIL_90, 1, 1, 1, FGC, BGC);  // clears line (not necessary if in update mode)
 	LCD_Print(line,  X_PIL_2, Y_PIL_90, 1, 1, 1, ERR, BGC);
-}
+	#endif
+}

Gascounter_main.c

@@ -51,6 +51,7 @@
 #include "module_globals.h"
 #include "adwandler.h"
 #include "assert.h"
+#include "timerUtil.h"
 
 
 
@@ -102,7 +103,7 @@ deltaType delta = {.Volume_since_last_send = 0,.Pressure_since_last_send = 0,.t_
 *
 * Timestamps and Pressurevalues for last send/display-reset/ping - Event
 */
-lastType last= {.Pressure_on_send = 0,.time_send = 0,.time_display_reset = 0,.time_ping = 0, .time_Pressure_Temp_meas = 0, .time_I2C_check = 0,.time_valid_time_reading = 0};
+lastType last= {.Pressure_on_send = 0,.time_send = 0,.time_display_reset = 0, .time_Pressure_Temp_meas = 0,.time_valid_time_reading = 0};
 
 
 
@@ -794,7 +795,7 @@ void displayTemPreVol(void){
 
 	paint_string_row(print_temp,INFO,0,"", FGC);
 
-	
+
 
 	if (ex_mode == online)
 	{
@@ -803,11 +804,11 @@ void displayTemPreVol(void){
 	}
 	else
 	{
-		if(NetStatIndex == 1){
+		if(xbee.netstat == NO_SERVER){
 			paint_string_row(xbee_get_coordID(),CONN,0,"", orange);
 
 		}
-		if(NetStatIndex == 2){
+		if(xbee.netstat == NO_NETWORK){
 			paint_string_row(xbee_get_coordID(),CONN,0,"", red);
 		}
 	}
@@ -977,7 +978,7 @@ void displayTemPreVol(void){
 	}
 	else
 	{
-		paint_info_line(NetStat[NetStatIndex],0);
+		paint_info_line(NetStat[xbee.netstat],0);
 	}
 
 
@@ -1229,7 +1230,7 @@ void reset_display(uint8_t clear)
 
 	if (clear)
 	{
-		lcd_Cls(white);
+		lcd_Cls(BGC);
 	}
 
 	paint_Main();
@@ -1336,7 +1337,7 @@ uint8_t xbee_send_login_msg(uint8_t db_cmd_type, uint8_t *buffer)
 				paint_Value(frameBuffer[reply_Id].data_len,VOLUME,1,3,"");
 				#endif
 				#ifdef GCM_old_disp
-				Print_add_Line("len false",0,0);
+				Print_add_Line("len false",0);
 				LCD_Value(frameBuffer[reply_Id].data_len,0,0,1,"num ");
 				#endif
 
@@ -1609,6 +1610,7 @@ uint8_t ping_server(void)
 		_delay_ms(500);
 		SET_ERROR(NETWORK_ERROR);
 		ex_mode = offline;
+		t_start(RECONNECT,options.Ping_Intervall*60);
 		return 0;
 	}
 	else
@@ -1638,11 +1640,10 @@ uint8_t ping_server(void)
 /**
 * @brief Checks current Connection Status. Possible states are "No Network" if no connection to a coordinator could be established. "No Server", if the Device is connected to a coordinator but, pings sent by #ping_server() are not answered. And "Online" if pings are answered by the server. The State is saved in #NetStatIndex
 *
-* @param dest_high high 32-bit of coordinator address
-* @param dest_low  low  32-bit of coordinator address
 *
 * @return uint8_t 1 if online and 0 if there are any problems with the connection to the server
 */
+/*
 uint8_t analyze_Connection(void)
 {
 	FUNCTION_TRACE
@@ -1658,6 +1659,9 @@ uint8_t analyze_Connection(void)
 		CLEAR_ERROR(NETWORK_ERROR);
 		
 		CLEAR_ERROR(NO_REPLY_ERROR);
+		
+		xbee_coordIdentifier();
+		
 		if(!ping_server()){
 			paint_info_line("NoServ",0);
 			NetStatIndex = 2;
@@ -1687,7 +1691,7 @@ uint8_t analyze_Connection(void)
 	
 	#endif
 }
-
+*/
 
 /**
 * @brief Receives new options in #buffer and validates them. The validity of the options is reported back to the Server via a #OPTIONS_SET_ACK Message containing the status#byte_93.
@@ -2021,7 +2025,7 @@ int main(void)
 
 	_Bool CoordActive = false;
 
-	// set default sc mask 
+	// set default sc mask
 	xbee_Set_Scan_Channels(xbee.ScanChannels);
 	// main part
 	while(1)
@@ -2204,7 +2208,8 @@ int main(void)
 				_delay_ms(500);
 				SET_ERROR(NETWORK_ERROR);
 				ex_mode = offline;
-				analyze_Connection();
+				t_start(RECONNECT,options.Ping_Intervall*60);
+
 
 
 			}
@@ -2374,7 +2379,8 @@ int main(void)
 					_delay_ms(500);
 					SET_ERROR(NETWORK_ERROR);
 					ex_mode = offline;
-					analyze_Connection();
+					t_start(RECONNECT,options.Ping_Intervall*60);
+
 				}
 			}
 
@@ -2395,9 +2401,9 @@ int main(void)
 		//		Checks on all I2C DEVICES are done every 5min
 		//=========================================================================================
 
-		if ((count_t_elapsed - last.time_I2C_check) > 10 )
+		if (t_check(I2C_CHECK))
 		{
-			last.time_I2C_check = count_t_elapsed;
+			t_start(I2C_CHECK,10);
 
 			if(!connected.TWI || !connected.DS3231M || (!connected.BMP && connected.BMP_on_Startup) || CHECK_ERROR(I2C_BUS_ERROR))
 			{
@@ -2520,15 +2526,15 @@ int main(void)
 			//   PING
 			//==========================================================
 			// since pressure/temp is measured every 5s and ping is done every 60+2 seconds to ensure they dont get triggerd at the same Second
-			if (((count_t_elapsed % (options.Ping_Intervall*60)) == 2) && ((count_t_elapsed - last.time_ping) > 5 ))
+			if (t_check(PING))
 			{
-				last.time_ping = count_t_elapsed;
+				t_start(PING,options.Ping_Intervall * 60);
 
 
 				if(!ping_server()){
-					if(!analyze_Connection()){
-						break; // Ping unsuccessful --> offline Mode
-					}
+
+					break; // Ping unsuccessful --> offline Mode
+
 				}
 
 
@@ -2570,7 +2576,11 @@ int main(void)
 			//========================================================
 			// try to Reconnect after every 60s (Reconnect_after_time)
 			//========================================================
-			if (count_t_elapsed % (options.Ping_Intervall*60) == 2){
+			if (t_check(RECONNECT)){
+				
+				t_start(RECONNECT,options.Ping_Intervall*60);
+				
+				paint_string_row("RECON",CONN +1 ,1,"",red);
 				#ifdef USE_XBEE
 
 				if (!xbee_reconnect(0))
@@ -2638,6 +2648,7 @@ int main(void)
 									_delay_ms(500);
 									SET_ERROR(NETWORK_ERROR);
 									ex_mode = offline;
+									t_start(RECONNECT,options.Ping_Intervall*60);
 									reset_display(1);
 									break;
 

Gascounter_main.h

@@ -151,10 +151,8 @@ typedef struct {
 	uint32_t Pressure_on_send;         /**< @brief Pressure the last time Data was sent/stored to the Server/memory (in 0.1 mbar)*/
 	uint32_t time_send;				   /**< @brief Absolute time of last sending of Data*/
 	uint32_t time_display_reset;       /**< @brief Absolute time of last Display Reset*/
-	uint32_t time_ping;				   /**< @brief Absolute time of last Ping*/
 	uint32_t time_Pressure_Temp_meas;  /**< @brief Absolute time of last Temp and Pressure Measurement */
 	uint32_t time_TWI_action;          /**< @brief Absolute time of last TWI read/write/stop */
-	uint32_t time_I2C_check;		   /**< @brief Absolute time of last I2C Peripheral checkup */
 	uint32_t time_valid_time_reading;   /**< @brief Absolute time of last Valid Time reading  */
 }lastType;
 
@@ -376,6 +374,6 @@ uint8_t xbee_send_login_msg(uint8_t db_cmd_type, uint8_t *buffer);
 void execute_server_CMDS(uint8_t reply_id);
 uint8_t ping_server(void);
 void Set_Options(uint8_t *optBuffer,uint8_t answer_code);
-uint8_t analyze_Connection(void);
+//uint8_t analyze_Connection(void);
 
 #endif  // Gascounter_main.h

avr-util-library

@@ -136,7 +136,7 @@
       <Value>F_CPU=6144000</Value>
       <Value>GASCOUNTER_MODULE</Value>
       <Value>USE_XBEE</Value>
-      <Value>ili9341</Value>
+      <Value>GCM_old_disp</Value>
     </ListValues>
   </avrgcc.compiler.symbols.DefSymbols>
   <avrgcc.compiler.directories.IncludePaths>
@@ -333,6 +333,12 @@
     <Compile Include="StringPixelCoordTable_ili9341.h">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="timerUtil.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="timerUtil.h">
+      <SubType>compile</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="avr-util-library\" />