theengsdecoder 1.9.8__tar.gz → 1.9.9__tar.gz

{theengsdecoder-1.9.8 → theengsdecoder-1.9.9}/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(decoder VERSION 1.9.8)
+project(decoder VERSION 1.9.9)
 find_package(PythonExtensions REQUIRED)
 
 add_library(_decoder MODULE TheengsDecoder/_decoder.cpp src/decoder.cpp)

{theengsdecoder-1.9.8 → theengsdecoder-1.9.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: theengsdecoder
-Version: 1.9.8
+Version: 1.9.9
 Summary: A message decoder for the Internet of Things
 Author: Theengs
 License:  GPL-3.0 License

{theengsdecoder-1.9.8 → theengsdecoder-1.9.9}/src/decoder.h

@@ -50,6 +50,7 @@ public:
     LYWSD02,
     LYWSDCGQ,
     CGP1W,
+    CGP22C,
     CGP23W,
     CGG1_STOCK,
     CGG1_ATC1441,

theengsdecoder-1.9.9/src/devices/CGP22C_json.h

@@ -0,0 +1,56 @@
+const char* _CGP22C_json = "{\"brand\":\"ClearGrass/Qingping\",\"model\":\"Thermo-Hygrometer CO2 Detector\",\"model_id\":\"CGP22C\",\"tag\":\"0f\",\"condition\":[\"servicedata\",\"=\",42,\"index\",2,\"5d\",\"&\",\"uuid\",\"index\",0,\"fdcd\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",20,4,true,true],\"post_proc\":[\"/\",10]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",24,4,true,false],\"post_proc\":[\"/\",10]},\"co2\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",38,4,true,false]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",32,2,false,false],\"post_proc\":[\"&\",127]},\"mac\":{\"decoder\":[\"revmac_from_hex_data\",\"servicedata\",4]}}}";
+/*R""""(
+{
+   "brand":"ClearGrass/Qingping",
+   "model":"Thermo-Hygrometer CO2 Detector",
+   "model_id":"CGP22C",
+   "tag":"0f",
+   "condition":["servicedata", "=", 42, "index", 2, "5d", "&", "uuid", "index", 0, "fdcd"],
+   "properties":{
+      "tempc":{
+         "decoder":["value_from_hex_data", "servicedata", 20, 4, true, true],
+         "post_proc":["/", 10]
+      },
+      "hum":{
+         "decoder":["value_from_hex_data", "servicedata", 24, 4, true, false],
+         "post_proc":["/", 10]
+      },
+      "co2":{
+         "decoder":["value_from_hex_data", "servicedata", 38, 4, true, false]
+      },
+      "batt":{
+         "decoder":["value_from_hex_data", "servicedata", 32, 2, false, false],
+         "post_proc":["&", 127]
+      },
+      "mac":{
+         "decoder":["revmac_from_hex_data", "servicedata", 4]
+      }
+   }
+})"""";*/
+
+const char* _CGP22C_json_props = "{\"properties\":{\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"},\"co2\":{\"unit\":\"ppm\",\"name\":\"carbon_dioxide\"},\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"mac\":{\"unit\":\"string\",\"name\":\"MAC address\"}}}";
+/*R""""(
+{
+   "properties":{
+      "tempc":{
+         "unit":"°C",
+         "name":"temperature"
+      },
+      "hum":{
+         "unit":"%",
+         "name":"humidity"
+      },
+      "co2":{
+         "unit":"ppm",
+         "name":"carbon_dioxide"
+      },
+      "batt":{
+         "unit":"%",
+         "name":"battery"
+      },
+      "mac":{
+         "unit":"string",
+         "name":"MAC address"
+      }
+   }
+})"""";*/

{theengsdecoder-1.9.8 → theengsdecoder-1.9.9}/src/devices/FEASY_json.h

@@ -1,4 +1,4 @@
-const char* _FEASY_json = "{\"brand\":\"Feasycom\",\"model\":\"Beacon\",\"model_id\":\"FEASY\",\"tag\":\"0608\",\"condition\":[\"servicedata\",\"=\",22,\"&\",\"uuid\",\"index\",0,\"fff0\"],\"properties\":{\"beaconmodel\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",0,2,false,false],\"lookup\":[\"15\",\"BP102\",\"19\",\"BP109\",\"1a\",\"BP103\",\"1b\",\"BP104\",\"1c\",\"BP201\",\"1d\",\"BP106\",\"1e\",\"BP101\",\"24\",\"BP120\",\"27\",\"BP108\",\"28\",\"BP108N\",\"29\",\"BP103B\"]},\"batt\":{\"condition\":[\"servicedata\",20,\"!\",\"65\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",20,2,false,false],\"post_proc\":[\"&\",127]},\"plugged-in\":{\"condition\":[\"servicedata\",20,\"65\"],\"decoder\":[\"static_value\",true]},\"_plugged-in\":{\"condition\":[\"servicedata\",20,\"!\",\"65\"],\"decoder\":[\"static_value\",false]},\"mac\":{\"decoder\":[\"mac_from_hex_data\",\"servicedata\",8]}}}";
+const char* _FEASY_json = "{\"brand\":\"Feasycom\",\"model\":\"Beacon\",\"model_id\":\"FEASY\",\"tag\":\"0608\",\"condition\":[\"servicedata\",\"=\",22,\"&\",\"uuid\",\"index\",0,\"fff0\"],\"properties\":{\"beaconmodel\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",0,2,false,false],\"lookup\":[\"15\",\"BP102\",\"19\",\"BP109\",\"1a\",\"BP103\",\"1b\",\"BP104\",\"1c\",\"BP201\",\"1d\",\"BP106\",\"1e\",\"BP101\",\"24\",\"BP120\",\"27\",\"BP108\",\"28\",\"BP108N\",\"29\",\"BP103B\",\"46\",\"BP104D\"]},\"batt\":{\"condition\":[\"servicedata\",20,\"!\",\"65\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",20,2,false,false],\"post_proc\":[\"&\",127]},\"plugged_in\":{\"condition\":[\"servicedata\",20,\"65\"],\"decoder\":[\"static_value\",true]},\"_plugged_in\":{\"condition\":[\"servicedata\",20,\"!\",\"65\"],\"decoder\":[\"static_value\",false]},\"mac\":{\"decoder\":[\"mac_from_hex_data\",\"servicedata\",8]}}}";
 
 /*R""""(
 {
@@ -20,18 +20,19 @@ const char* _FEASY_json = "{\"brand\":\"Feasycom\",\"model\":\"Beacon\",\"model_
                    "24", "BP120", 
                    "27", "BP108", 
                    "28", "BP108N",
-                   "29", "BP103B"]
+                   "29", "BP103B",
+                   "46", "BP104D"]
       },
       "batt":{
          "condition":["servicedata", 20, "!", "65"],
          "decoder":["value_from_hex_data", "servicedata", 20, 2, false, false],
          "post_proc":["&", 127]
       },
-      "plugged-in":{
+      "plugged_in":{
          "condition":["servicedata", 20, "65"],
          "decoder":["static_value", true]
       },
-      "_plugged-in":{
+      "_plugged_in":{
          "condition":["servicedata", 20, "!", "65"],
          "decoder":["static_value", false]
       },
@@ -41,7 +42,7 @@ const char* _FEASY_json = "{\"brand\":\"Feasycom\",\"model\":\"Beacon\",\"model_
    }
 })"""";*/
 
-const char* _FEASY_json_props = "{\"properties\":{\"beaconmodel\":{\"unit\":\"string\",\"name\":\"beacon model\"},\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"plugged-in\":{\"unit\":\"status\",\"name\":\"plug\"},\"mac\":{\"unit\":\"string\",\"name\":\"MAC address\"}}}";
+const char* _FEASY_json_props = "{\"properties\":{\"beaconmodel\":{\"unit\":\"string\",\"name\":\"beacon model\"},\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"plugged_in\":{\"unit\":\"status\",\"name\":\"plug\"},\"mac\":{\"unit\":\"string\",\"name\":\"MAC address\"}}}";
 /*R""""(
 {
    "properties":{
@@ -53,7 +54,7 @@ const char* _FEASY_json_props = "{\"properties\":{\"beaconmodel\":{\"unit\":\"st
          "unit":"%",
          "name":"battery"
       },
-      "plugged-in":{
+      "plugged_in":{
          "unit":"status",
          "name":"plug"
       },

{theengsdecoder-1.9.8 → theengsdecoder-1.9.9}/src/devices.h

@@ -25,6 +25,7 @@
 #include "devices/CGDN1_json.h"
 #include "devices/CGH1_json.h"
 #include "devices/CGP1W_json.h"
+#include "devices/CGP22C_json.h"
 #include "devices/CGP23W_json.h"
 #include "devices/CGPR1_json.h"
 #include "devices/ECOFLOW_ADV_json.h"
@@ -143,6 +144,7 @@ const char* _devices[][2] = {
     {_LYWSD02_json, _LYWSD02_json_props},
     {_LYWSDCGQ_json, _LYWSDCGQ_json_props},
     {_CGP1W_json, _CGP1W_json_props},
+    {_CGP22C_json, _CGP22C_json_props},
     {_CGP23W_json, _CGP23W_json_props},
     {_CGG1_json_STOCK, _CGG1_json_props},
     {_CGG1_json_ATC1441, _CGG1_json_props},

{theengsdecoder-1.9.8 → theengsdecoder-1.9.9}/theengsdecoder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: theengsdecoder
-Version: 1.9.8
+Version: 1.9.9
 Summary: A message decoder for the Internet of Things
 Author: Theengs
 License:  GPL-3.0 License

{theengsdecoder-1.9.8 → theengsdecoder-1.9.9}/theengsdecoder.egg-info/SOURCES.txt

@@ -464,6 +464,7 @@ src/devices/CGDN1_json.h
 src/devices/CGG1_json.h
 src/devices/CGH1_json.h
 src/devices/CGP1W_json.h
+src/devices/CGP22C_json.h
 src/devices/CGP23W_json.h
 src/devices/CGPR1_json.h
 src/devices/ECOFLOW_ADV_json.h