Fix units for TPMS and JQJCY01YM (#111)

* Fix units for TPMS and JQJCY01YM * Improve documentation for JQJCY01YM and HHCCPOT002
theengs · May 9, 2022 · c21fe3e · c21fe3e
1 parent 849d688
commit c21fe3e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docs/devices/HHCCPOT002.md b/docs/devices/HHCCPOT002.md
@@ -7,6 +7,6 @@
 |Short Description|Moisture, temperature and fertility sensor|
 |Communication|BLE broadcast|
 |Frequency|2.4Ghz|
-|Power source|CR2032|
+|Power source|Rechargeable battery, USB|
 |Exchanged data|moisture, fertility|
 |Encrypted|No|
diff --git a/docs/devices/JQJCY01YM.md b/docs/devices/JQJCY01YM.md
@@ -8,5 +8,5 @@
 |Communication|BLE broadcast|
 |Frequency|2.4Ghz|
 |Power source|2 AA|
-|Exchanged data|formaldehyde, humidity, battery|
+|Exchanged data|formaldehyde, temperature, humidity, battery|
 |Encrypted|No|
diff --git a/src/devices/JQJCY01YM_json.h b/src/devices/JQJCY01YM_json.h
@@ -28,7 +28,7 @@ const char* _JQJCY01YM_json = "{\"brand\":\"Xiaomi\",\"model\":\"Formaldehyde de
    }
 })"""";*/
 
-const char* _JQJCY01YM_json_props = "{\"properties\":{\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"},\"for\":{\"unit\":\"%\",\"name\":\"formaldehyde\"}}}";
+const char* _JQJCY01YM_json_props = "{\"properties\":{\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"},\"for\":{\"unit\":\"mg/m³\",\"name\":\"formaldehyde\"}}}";
 /*R""""(
 {
    "properties":{
@@ -45,7 +45,7 @@ const char* _JQJCY01YM_json_props = "{\"properties\":{\"batt\":{\"unit\":\"%\",\
          "name":"humidity"
       },
       "for":{
-         "unit":"%",
+         "unit":"mg/m³",
          "name":"formaldehyde"
       }
    }

diff --git a/src/devices/TPMS_json.h b/src/devices/TPMS_json.h
@@ -28,7 +28,7 @@ const char* _TPMS_json = "{\"brand\":\"GENERIC\",\"model\":\"TPMS\",\"model_id\"
    }
 })"""";*/
 
-const char* _TPMS_json_props = "{\"properties\":{\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"pres\":{\"unit\":\"kPa\",\"name\":\"temperature\"},\"count\":{\"unit\":\"int\",\"name\":\"count\"},\"alarm\":{\"unit\":\"status\",\"name\":\"alarm\"}}}";
+const char* _TPMS_json_props = "{\"properties\":{\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"pres\":{\"unit\":\"kPa\",\"name\":\"pressure\"},\"count\":{\"unit\":\"int\",\"name\":\"count\"},\"alarm\":{\"unit\":\"status\",\"name\":\"alarm\"}}}";
 /*R""""(
 {
    "properties":{
@@ -42,7 +42,7 @@ const char* _TPMS_json_props = "{\"properties\":{\"batt\":{\"unit\":\"%\",\"name
       },
       "pres":{
          "unit":"kPa",
-         "name":"temperature"
+         "name":"pressure"
       },
       "count":{
          "unit":"int",