Amphiro adjustments (#197)

theengs · Sep 6, 2022 · 67d889f · 67d889f
1 parent 61b0229
commit 67d889f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/docs/devices/Amphiro.md b/docs/devices/Amphiro.md
@@ -1,12 +1,12 @@
-# Amphiro/Oras Hydractiva Digital
+# Amphiro/Oras/Hansa Hydractiva/Activejet Digital
 
 |Model Id|[ADHS](https://github.com/theengs/decoder/blob/development/src/devices/Amphiro_json.h)|
 |-|-|
-|Brand|Amphiro/Oras|
-|Model|Hydractiva Digital|
+|Brand|Amphiro/Oras/Hansa|
+|Model|Hydractiva/Activejet Digital|
 |Short Description|Digital hand shower giving real-time feedback and statistics|
 |Communication|BLE broadcast|
 |Frequency|2.4Ghz|
 |Power source|Powered by the water flow|
-|Exchanged data|sessions, time, litres, temperature, energy|
+|Exchanged data|session, duration, volume, temperature, energy|
 |Encrypted|No|
diff --git a/src/devices/Amphiro_json.h b/src/devices/Amphiro_json.h
@@ -1,4 +1,4 @@
-const char* _AMPHIRO_json = "{\"brand\":\"Oras\",\"model\":\"Hydractiva Digital\",\"model_id\":\"ADHS\",\"cidc\":false,\"condition\":[\"manufacturerdata\",\"=\",42,\"index\",0,\"eefa\"],\"properties\":{\"sessions\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",4,6,false,false]},\"time\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",10,4,false,false]},\"litres\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,6,false,false],\"post_proc\":[\"/\",2560]},\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",26,2,false,false]},\"energy\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,false,false],\"post_proc\":[\"/\",100]}}}";
+const char* _AMPHIRO_json = "{\"brand\":\"Oras\",\"model\":\"Hydractiva Digital\",\"model_id\":\"ADHS\",\"cidc\":false,\"condition\":[\"manufacturerdata\",\"=\",42,\"index\",0,\"eefa\"],\"properties\":{\"session\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",4,6,false,false]},\"seconds\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",10,4,false,false]},\"litres\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,6,false,false],\"post_proc\":[\"/\",2560]},\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",26,2,false,false]},\"energy\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,false,false],\"post_proc\":[\"/\",100]}}}";
 /*R""""(
 {
    "brand":"Oras",
@@ -7,10 +7,10 @@ const char* _AMPHIRO_json = "{\"brand\":\"Oras\",\"model\":\"Hydractiva Digital\
    "cidc":false,
    "condition":["manufacturerdata", "=", 42, "index", 0, "eefa"],
    "properties":{
-      "sessions":{
+      "session":{
          "decoder":["value_from_hex_data", "manufacturerdata", 4, 6, false, false]
       },
-      "time":{
+      "seconds":{
          "decoder":["value_from_hex_data", "manufacturerdata", 10, 4, false, false]
       },
       "litres":{
@@ -27,21 +27,21 @@ const char* _AMPHIRO_json = "{\"brand\":\"Oras\",\"model\":\"Hydractiva Digital\
    }
 })"""";*/
 
-const char* _AMPHIRO_json_props = "{\"properties\":{\"sessions\":{\"unit\":\"int\",\"name\":\"sessions\"},\"time\":{\"unit\":\"s\",\"name\":\"time\"},\"litres\":{\"unit\":\"L\",\"name\":\"litres\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"energy\":{\"unit\":\"kWh\",\"name\":\"energy\"}}}";
+const char* _AMPHIRO_json_props = "{\"properties\":{\"session\":{\"unit\":\"int\",\"name\":\"session\"},\"seconds\":{\"unit\":\"s\",\"name\":\"duration\"},\"litres\":{\"unit\":\"L\",\"name\":\"volume\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"energy\":{\"unit\":\"kWh\",\"name\":\"energy\"}}}";
 /*R""""(
 {
    "properties":{
-      "sessions":{
+      "session":{
          "unit":"int",
-         "name":"sessions"
+         "name":"session"
       },
-      "time":{
+      "seconds":{
          "unit":"s",
-         "name":"time"
+         "name":"duration"
       },
       "litres":{
          "unit":"L",
-         "name":"litres"
+         "name":"volume"
       },
       "tempc": {
          "unit": "°C",

diff --git a/tests/BLE/test_ble.cpp b/tests/BLE/test_ble.cpp
@@ -79,7 +79,7 @@ const char* expected_mfg[] = {
     "{\"brand\":\"SmartDry\",\"model\":\"Laundry Sensor\",\"model_id\":\"SDLS\",\"cidc\":false,\"tempc\":29.57704544,\"tempf\":85.23868179,\"hum\":55.99645996,\"shake\":false,\"shake_count\":74,\"volt\":2.929,\"wake\":false}",
     "{\"brand\":\"SmartDry\",\"model\":\"Laundry Sensor\",\"model_id\":\"SDLS\",\"cidc\":false,\"tempc\":29.57704544,\"tempf\":85.23868179,\"hum\":55.99645996,\"shake\":false,\"shake_count\":74,\"volt\":2.929,\"wake\":false}",
     "{\"brand\":\"April Brother\",\"model\":\"ABTemp\",\"model_id\":\"ABTemp\",\"mfid\":\"4c00\",\"uuid\":\"b5b182c7eab14988aa99b5c1517008d9\",\"major\":1,\"batt\":100,\"tempc\":26,\"tempf\":78.8,\"txpower\":-59}",
-    "{\"brand\":\"Oras\",\"model\":\"Hydractiva Digital\",\"model_id\":\"ADHS\",\"cidc\":false,\"sessions\":36,\"time\":21,\"litres\":2.6,\"tempc\":41,\"tempf\":105.8,\"energy\":0.12}",
+    "{\"brand\":\"Oras\",\"model\":\"Hydractiva Digital\",\"model_id\":\"ADHS\",\"cidc\":false,\"session\":36,\"seconds\":21,\"litres\":2.6,\"tempc\":41,\"tempf\":105.8,\"energy\":0.12}",
 };
 
 const char* expected_uuid_mfgsvcdata[] = {