add wireless hydrometer information in log

vitotai · Feb 8, 2024 · 07498d3 · 07498d3
1 parent 121aa46
commit 07498d3
Show file tree

Hide file tree

Showing 39 changed files with 33,047 additions and 32,732 deletions.
diff --git a/src/BrewLogger.cpp b/src/BrewLogger.cpp
@@ -8,6 +8,7 @@
 #if EnableHumidityControlSupport
 #include "HumidityControl.h"
 #endif
+#include "ExternalData.h"
 
 #define LoggingPeriod 60000  //in ms
 #define MinimumGapToSync  600  // in seconds
@@ -859,8 +860,12 @@ BrewLogger::BrewLogger(void){
 		*ptr++ = (char) (_headTime >> 16);
 		*ptr++ = (char) (_headTime >> 8);
 		*ptr++ = (char) (_headTime & 0xFF); //8
+		// insert two bytes
+		*ptr++ = 1; // length
+		*ptr++ = theSettings.GravityConfig()->gravityDeviceType;
+
 		// a record full of all data = 2 + 7 * 2= 16
-		*ptr++ = (char) PeriodTag; //9
+		*ptr++ = (char) PeriodTag; //9 +2 ..
 		*ptr++ = (char) 0x7F; //10
 		for(int i=0;i<VolatileDataHeaderSize;i++){ // 10 + VolatileDataHeaderSize *2
 			*ptr++ = _headData[i] >> 8;
@@ -909,12 +914,59 @@ BrewLogger::BrewLogger(void){
 		*ptr++ = (char) (_pFileInfo->starttime >> 16);
 		*ptr++ = (char) (_pFileInfo->starttime >> 8);
 		*ptr++ = (char) (_pFileInfo->starttime & 0xFF);
+
+		// from V7, reserve a block for gravity device data
+		// starting from length of this block
+		// followed by the device type
+		// more information like names to be come
+		// b0: length of whole block
+		// b1 gravity device type
+		// TLV: type, length, value
+		GravityDeviceConfiguration *gdCfg=theSettings.GravityConfig();
+		if(gdCfg->gravityDeviceType == GravityDeviceIspindel){
+			// length is ??
+			const char *name = externalData.getDeviceName();
+			if(name){
+				uint8_t length =(uint8_t) strlen(name);
+				*ptr++ = 3 + length;
+				*ptr++ = GravityDeviceIspindel;
+
+				*ptr++  = GDIIdentity;
+				*ptr++  = length;
+				for(uint8_t n=0;n<length;n++){
+					*ptr++ = name[n];
+				}
+			}else{
+				*ptr++ = 1;
+				*ptr++ = GravityDeviceIspindel;
+			}
+
+		}else if(gdCfg->gravityDeviceType == GravityDeviceTilt){
+			// total length: 
+			*ptr++ = 4;
+			*ptr++ = GravityDeviceTilt; //1
+			*ptr++  = GDIIdentity;
+			*ptr++  = 1;
+			*ptr++  = theSettings.tiltConfiguration()->tiltColor;
+		}else if(gdCfg->gravityDeviceType == GravityDevicePill){
+			*ptr++ = 9;
+			*ptr++ = GravityDevicePill; //1
+			*ptr++  = GDIAddress;
+			*ptr++  = 6;
+			uint8_t *mac =theSettings.pillConfiguration()->macAddress;
+			for(int m=0;m<6;m++){
+				*ptr++ =mac[m];
+			}
+		}else{
+			// no device
+			*ptr++ = 1;  // length
+			*ptr++ = GravityDeviceNone;  // no device
+		}
 		_logIndex=0;
 		_savedLength=0;
 
 		_commitData(_logIndex,ptr - _logBuffer );
 
-		//DBG_PRINTF("*_startLog*\n");
 	}
 	void BrewLogger::_startVolatileLog(void)
 	{
@@ -1238,7 +1290,7 @@ BrewLogger::BrewLogger(void){
 		size_t gap=rtime - _pFileInfo->starttime;
 		if(rtime < 1545211593L || gap > 60*60*24*30){
 			// something wrong. just give it a minute, relying on following TimeSync Tag
-			DBG_PRINTF("abnormal resume, start:%lu, current:%u gap:%u\n",_pFileInfo->starttime,rtime,gap);
+			DBG_PRINTF("abnormal resume, start:%lu, current:%u gap:%u\n",_pFileInfo->starttime,rtime,gap);
 			gap =60;
 			rtime =  _pFileInfo->starttime + gap;
 		}

diff --git a/src/BrewLogger.h b/src/BrewLogger.h
@@ -52,11 +52,14 @@
 #define INVALID_TEMP_INT 0x7FFF
 #define INVALID_GRAVITY_INT 0x7FFF
 
+#define GDIAddress 1
+#define GDIIdentity 2
+
 #define VolatileDataHeaderSize 7
 #if EnableHumidityControlSupport
-#define VolatileHeaderSize ( VolatileDataHeaderSize*2 + 18)
+#define VolatileHeaderSize ( VolatileDataHeaderSize*2 + 20)
 #else
-#define VolatileHeaderSize ( VolatileDataHeaderSize*2 + 16)
+#define VolatileHeaderSize ( VolatileDataHeaderSize*2 + 18)
 #endif
 
 #define OrderBeerSet 0

diff --git a/src/ExternalData.cpp b/src/ExternalData.cpp
@@ -66,7 +66,7 @@ void ExternalData::gravityDeviceSetting(char *buf){
 	doc["plato"] = _cfg->usePlato;
 
 	doc["fpt"] = _cfg->numCalPoints;
-	doc["name"] = (_ispindelName)? _ispindelName:"Unknown";
+	doc["name"] = getDeviceName();
 
 	buf[0]='G';
 	buf[1]=':';
@@ -454,3 +454,16 @@ void  ExternalData::_deriveFormula(void){
 		DBG_PRINTF("\n");
 	}
 }
+
+
+const char* ExternalData::getDeviceName(void){
+	if(_cfg->gravityDeviceType == GravityDeviceIspindel){
+		return (_ispindelName)? _ispindelName:"iSpindel";
+	}else if(_cfg->gravityDeviceType == GravityDeviceTilt){
+		return "Tilt";
+	}else if(_cfg->gravityDeviceType == GravityDevicePill){
+		return "Pill";
+	}else{
+		return "unkown";
+	}
+}
diff --git a/src/ExternalData.h b/src/ExternalData.h
@@ -180,6 +180,8 @@ class ExternalData
 
 	// data from 
 	void setWaterTiltGravity(float tilt,float sg);
+
+	const char* getDeviceName(void);
 };
 
 extern ExternalData externalData;

diff --git a/wdoc/chinese_config_htm.h b/wdoc/chinese_config_htm.h
diff --git a/wdoc/chinese_gdc_e32_htm.h b/wdoc/chinese_gdc_e32_htm.h
diff --git a/wdoc/chinese_gdc_htm.h b/wdoc/chinese_gdc_htm.h
diff --git a/wdoc/chinese_index_htm.h b/wdoc/chinese_index_htm.h
diff --git a/wdoc/chinese_pressure_htm.h b/wdoc/chinese_pressure_htm.h
diff --git a/wdoc/english_config_htm.h b/wdoc/english_config_htm.h
diff --git a/wdoc/english_gdc_e32_htm.h b/wdoc/english_gdc_e32_htm.h
diff --git a/wdoc/english_gdc_htm.h b/wdoc/english_gdc_htm.h
diff --git a/wdoc/english_index_htm.h b/wdoc/english_index_htm.h
diff --git a/wdoc/english_pressure_htm.h b/wdoc/english_pressure_htm.h
diff --git a/wdoc/italian_config_htm.h b/wdoc/italian_config_htm.h
diff --git a/wdoc/italian_gdc_e32_htm.h b/wdoc/italian_gdc_e32_htm.h
diff --git a/wdoc/italian_gdc_htm.h b/wdoc/italian_gdc_htm.h
diff --git a/wdoc/italian_index_htm.h b/wdoc/italian_index_htm.h
diff --git a/wdoc/italian_pressure_htm.h b/wdoc/italian_pressure_htm.h
diff --git a/wdoc/norwegian_config_htm.h b/wdoc/norwegian_config_htm.h
diff --git a/wdoc/norwegian_gdc_e32_htm.h b/wdoc/norwegian_gdc_e32_htm.h
diff --git a/wdoc/norwegian_gdc_htm.h b/wdoc/norwegian_gdc_htm.h
diff --git a/wdoc/norwegian_index_htm.h b/wdoc/norwegian_index_htm.h
diff --git a/wdoc/norwegian_pressure_htm.h b/wdoc/norwegian_pressure_htm.h
diff --git a/wdoc/portuguese-br_config_htm.h b/wdoc/portuguese-br_config_htm.h
diff --git a/wdoc/portuguese-br_gdc_e32_htm.h b/wdoc/portuguese-br_gdc_e32_htm.h
diff --git a/wdoc/portuguese-br_gdc_htm.h b/wdoc/portuguese-br_gdc_htm.h
diff --git a/wdoc/portuguese-br_index_htm.h b/wdoc/portuguese-br_index_htm.h
diff --git a/wdoc/portuguese-br_pressure_htm.h b/wdoc/portuguese-br_pressure_htm.h
diff --git a/wdoc/slovak_config_htm.h b/wdoc/slovak_config_htm.h
diff --git a/wdoc/slovak_gdc_e32_htm.h b/wdoc/slovak_gdc_e32_htm.h
diff --git a/wdoc/slovak_gdc_htm.h b/wdoc/slovak_gdc_htm.h
diff --git a/wdoc/slovak_index_htm.h b/wdoc/slovak_index_htm.h
diff --git a/wdoc/slovak_pressure_htm.h b/wdoc/slovak_pressure_htm.h
diff --git a/wdoc/spanish_config_htm.h b/wdoc/spanish_config_htm.h
diff --git a/wdoc/spanish_gdc_e32_htm.h b/wdoc/spanish_gdc_e32_htm.h
diff --git a/wdoc/spanish_gdc_htm.h b/wdoc/spanish_gdc_htm.h
diff --git a/wdoc/spanish_index_htm.h b/wdoc/spanish_index_htm.h
diff --git a/wdoc/spanish_pressure_htm.h b/wdoc/spanish_pressure_htm.h