Merge pull request #1 from SampleEnvironment/dev

Dev

Author: Bilchreis

.gitignore

@@ -0,0 +1,13 @@
+.vs/*
+
+
+*.d
+*.o
+*.eep
+*.hex
+*.elf
+*.lss
+*.map
+*.srec
+*.mk
+Makefile

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "avr-util-library"]
 	path = avr-util-library
-	url = git@github.com:SampleEnvironment/avr-util-library.git
+	url = https://github.com/SampleEnvironment/avr-util-library.git

DispAdapter.c

@@ -26,7 +26,7 @@
 #ifdef GCM_old_disp
 
 #include "disp/gcm_old_lcd_driver.h"
-#include "StringPixelCoordTabble_old.h"
+#include "StringPixelCoordTable_old.h"
 #endif
 
 #ifdef ili9341
@@ -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

@@ -45,7 +45,7 @@
 
 #ifdef GCM_old_disp
 #include "disp/gcm_old_lcd_driver.h"
-#include "StringPixelCoordTabble_old.h"
+#include "StringPixelCoordTable_old.h"
 #endif
 
 #ifdef ili9341
@@ -108,7 +108,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_Pressure_Temp_meas = 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, .Status_on_Send = 0};
 
 
 
@@ -327,7 +327,8 @@ uint8_t EEMEM Fun_trace_array[FUNTRACE_ARRAY_SIZE+FUNTRACE_HEADER_LEN];  //eepro
 
 uint16_t EEMEM funtrace_was_activated; //word in eeprom to indicate that funtrace was activated
 
-
+uint16_t EEMEM eeSC_mask;
+uint8_t  EEMEM eeSC_already_sent_from_server;
 
 
 
@@ -447,6 +448,8 @@ void Collect_Measurement_Data(void){
 	// network error is not reset on send/store
 	if(BIT_CHECK(get_status(),NETWORK_ERROR)){BIT_SET(curr_Stat,status_bit_Network_err_91);}
 
+	
+	last.Status_on_Send = status_reset_on_send;
 
 
 	sendbuffer[22] = curr_Stat;
@@ -636,18 +639,32 @@ 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);
 
 	}
 
 
-	xbee_init(&paint_info_line,NULL,0);
+	uint16_t SC_mask = eeprom_read_word(&eeSC_mask);
+	uint8_t SC_aleady_sent_from_server = eeprom_read_byte(&eeSC_already_sent_from_server);
+	
+	if(SC_aleady_sent_from_server == SC_already_received_Pattern){
+		xbee_init(&paint_info_line,NULL,0,SC_mask);
+	}else
+	{
+		xbee_init(&paint_info_line,NULL,0,SC_MASK_DEFAULT);
+	}
+
 
 	xbee_hardware_version();
 	Print_add_Line(STR_INIT_DONE,0);
@@ -1211,7 +1228,43 @@ void execute_server_CMDS(uint8_t reply_id){
 		sendbuffer[0] = 0;
 		xbee_send_message(SET_PING_INTERVALL_CMD,sendbuffer,1);
 		break;
+		
+		case SET_SC_XBEE_MASK:;
+		uint16_t SC_mask = (frameBuffer[reply_id].data[0]<<8) + frameBuffer[reply_id].data[1];
 
+		if(!(SC_mask & 0xE001)){
+			// write new sc mask to eeprom
+			eeprom_update_word(&eeSC_mask, SC_mask);
+			eeprom_update_byte(&eeSC_already_sent_from_server,SC_already_received_Pattern);
+			
+			//refresh xbee  parameters
+			xbee_init(&paint_info_line,NULL,0,SC_mask);
+			xbee_Set_Scan_Channels(xbee.ScanChannels);
+			xbee_WR();
+			
+			//Send Status Ack
+			sendbuffer[0] = 0;
+			xbee_send_message(SET_SC_XBEE_MASK,sendbuffer,1);
+			}else{
+			//Send Status Ack
+			sendbuffer[0] = 1;
+			xbee_send_message(SET_SC_XBEE_MASK,sendbuffer,1);
+		}
+		break;
+		
+		case GET_SC_XBEE_MASK:
+		;
+		
+		sendbuffer[0] = xbee.ScanChannels >> 8;
+		sendbuffer[1] = xbee.ScanChannels;
+
+
+		xbee_send_message(GET_SC_XBEE_MASK, sendbuffer,2);
+
+		break;
+		
+		
+		
 
 
 		#ifdef USE_LAN
@@ -1236,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;
 
@@ -1246,12 +1299,12 @@ void execute_server_CMDS(uint8_t reply_id){
 		{
 
 
-			xbee_pseudo_send_AT_response( 
-				AT_Lut[(uint8_t)(AT_Code-AT_START)][0], // translate AT_code back to At ASCII chars
-				AT_Lut[(uint8_t)(AT_Code-AT_START)][1],
-				1, // Status == 1 --> atcommand not known
-				sendbuffer,
-				0); // empty payload
+			xbee_pseudo_send_AT_response(
+			AT_Lut[(uint8_t)(AT_Code-AT_START)][0], // translate AT_code back to At ASCII chars
+			AT_Lut[(uint8_t)(AT_Code-AT_START)][1],
+			1, // Status == 1 --> atcommand not known
+			sendbuffer,
+			0); // empty payload
 		}
 
 		break;
@@ -1673,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);
@@ -1821,7 +1874,7 @@ int main(void)
 					char boundsstr[100];
 					for(uint8_t i = 0;i < StartStat.bound_err_counter; i++ ){
 						uint8_t errVal = StartStat.boundsErrors[i];
-		
+						
 
 						sprintf(boundsstr,STR_RANGE_ERROR,
 						StartStat.optStrings[errVal],
@@ -2029,11 +2082,12 @@ 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 && status_reset_on_send) )
+		(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) )
 		{
 
+
 
 
 			Collect_Measurement_Data();

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  */
 
 
@@ -148,6 +149,7 @@ typedef struct {
 * Absolute Times/Pressure of the last time an action was executetd i.e: Pinging the Server
 */
 typedef struct {
+	uint16_t Status_on_Send;
 	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*/

README.md

@@ -0,0 +1,46 @@
+# Gascounter-module
+Firmware for *Gascounter Modules*, that monitor the flow through gasmeters. They are meant to be used in conjunction with [Helium Management](https://github.com/SampleEnvironment/Helium-Management) application.
+
+## Getting started
+### Requisities
+In order to start developing/testing/flashing Firmware you will need: 
+- [Microchip Studio](https://www.microchip.com/en-us/tools-resources/develop/microchip-studio)
+- A debugger for example *Atmel Power debugger*
+- Gascounter Module
+- Adapter from 6-Pin connector on Powerdebugger to 10-Pin on *gascounter module* specified [here](https://user-images.githubusercontent.com/85115389/188656912-2c82639d-4e30-490b-87a6-de65de5cbdc6.jpg)
+
+
+
+### Preparations
+Before first compiling the project in Microchip Studio the submodule of the avr-library needs to be initialized:
+```
+git submodule update --init
+```
+
+### Choosing a Release
+In order to generate a executable Firmware of a specific release, `git tag` will list all available releases and 
+```git checkout --recurse-submodules vX.XXX``` 
+will load the release specified by `vX.XXX` (for example `v2.213`).
+
+### Build configurations (from v2.212):
+Build configurations are used to generate firmware binarys that are meant for the same device Type, but with varying Hardware, for example the display that is used. Build configuration names for gascounter modules have the following Format `'DisplayType'-'NetworkInterface'`, and can be set via the dropdown menu depicted in the screenshot below.
+
+![build_configurations](https://user-images.githubusercontent.com/85115389/198265129-1811f6dd-a333-4995-9eb3-8800d6aded16.png)
+
+
+
+| Display Type | Description                                            |
+|--------------|--------------------------------------------------------|
+| GCM_old_disp | old LC-display with low resolution                     |
+| ili9341      | Newer 2.2" rgb Display with a resolution of 240x320px  |
+
+| Network Interface | Description                                                                                             |
+|-------------------|---------------------------------------------------------------------------------------------------------|
+| XBEE              | Gascounter-module communicates via an xbee module with the server                                       |
+| LAN               | Gascountermodule emulates an Xbee module and sends messages directly over Ethernet via an X-Port Module |
+
+
+
+
+For further Information please refer to the [Wiki](https://github.com/SampleEnvironment/gascounter-module/wiki) pages
+

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"

StringPixelCoordTable_old.h

@@ -0,0 +1,52 @@
+/*
+ * StringPixelCoordTabble_old.h
+ *
+ * Created: 24.06.2022 19:35:49
+ *  Author: qfj
+ */ 
+
+
+#ifndef STRINGPIXELCOORDTABBLE_OLD_H_
+#define STRINGPIXELCOORDTABBLE_OLD_H_
+
+
+
+// INIT STRINGS
+#define STR_HZB_GASCOUNTER "HZB Gascount"
+#define STR_LAN_VARIANT "LAN-VARIANT"
+#define STR_XBEE_VARIANT "XBEE-VARIANT"
+#define STR_INIT_START "Init start"
+#define STR_INIT_PORTS "Init ports"
+#define STR_INIT_TIMER "Init timer"
+#define STR_INIT_INTERRUPTS "Init interr."
+#define STR_INIT_USART "Init usart"
+#define STR_INIT_I2C "Init I2C"
+#define STR_INIT_CLOCK "Init Clock"
+#define STR_INIT_CLOCK_SUCC "...success"
+#define STR_INIT_CLOCK_ERR "...error"
+#define STR_INIT_PRESS "Init Press"
+#define STR_INIT_PRESS_SUCC "...success"
+#define STR_INIT_PRESS_ERR "...error"
+#define STR_INIT_DONE "Init done"
+
+// ERROR STRINGS
+#define STR_INIT_OFFLINE "Netw. Err"
+#define STR_INIT_OFFLINE_MESSAGE "Network connection error\n%s"
+#define STR_NO_COORDINATOR_FOUND "No Coord."
+#define STR_NO_SERVER_FOUND "No Server"
+
+#define STR_OPTIONS_LENGTH "Opt. len Err"
+#define STR_OPTIONS_LENGTH_MESSAGE "expected:%i\nreceived:%i"
+
+#define STR_OPTION_RANGE_ERR "Bounds Err."
+#define STR_OPTION_RANGE_ERR_MESSAGE " "
+#define STR_RANGE_ERROR "%s\nr:%lu\ne:[%lu..%lu]\n"
+
+#define STR_BMP_SENSOR_ERROR "BMP Error"
+#define STR_BMP_SENSOR_ERROR_MESSAGE "Temp. Press.Sensor not connected"
+
+#define STR_RTC_ERROR "RTC ERROR"
+#define STR_RTC_ERROR_MESSAGE "Realtime clock not initialized"
+
+
+#endif /* STRINGPIXELCOORDTABBLE_OLD_H_ */