theengsdecoder 1.9.6__tar.gz → 1.9.8__tar.gz

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

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

theengsdecoder-1.9.8/PKG-INFO

@@ -0,0 +1,55 @@
+Metadata-Version: 2.1
+Name: theengsdecoder
+Version: 1.9.8
+Summary: A message decoder for the Internet of Things
+Author: Theengs
+License:  GPL-3.0 License
+Description-Content-Type: text/markdown
+
+# Theengs Decoder
+
+## Installation
+
+* Create a virtual environment
+`python3 -m venv theengs-venv`
+
+* Activate the virtual environment
+`source theengs-venv/bin/activate`
+
+* Install and upgrade pip
+`python3 -m pip install --upgrade pip`
+
+* Install dependencies
+`pip3 install setuptools setuptools_scm cmake==3.25.0 wheel scikit-build ninja`
+
+* Clone Theengs Decoder
+`git clone --recursive https://github.com/Theengs/decoder.git`
+
+* cd to python folder inside the repository
+`cd decoder/python`
+
+* Copy sources inside the build repository
+`cp -r ../src .`
+
+* Build wheel
+`python3 setup.py bdist_wheel`
+
+* Install
+`cd ..`
+`pip3 install python/dist/*.whl`
+
+* Verify installation
+`python3 -c "from TheengsDecoder import decodeBLE; print('Successfully imported decodeBLE from PR_build.yml')"`
+
+You should see:
+`Successfully imported decodeBLE from PR_build.yml`
+
+## using
+
+`import TheengsDecoder`
+
+## methods
+
+- `decodeBLE(string)` Returns a new string with the decoded data in json format or None.
+- `getProperties('model_id string')` Returns the properties (string) of the given model ID or None
+- `getAttribute('model_id string', 'attribute string')` Return the value (string) of named attrubte of the model ID or None.

theengsdecoder-1.9.8/README.md

@@ -0,0 +1,47 @@
+# Theengs Decoder
+
+## Installation
+
+* Create a virtual environment
+`python3 -m venv theengs-venv`
+
+* Activate the virtual environment
+`source theengs-venv/bin/activate`
+
+* Install and upgrade pip
+`python3 -m pip install --upgrade pip`
+
+* Install dependencies
+`pip3 install setuptools setuptools_scm cmake==3.25.0 wheel scikit-build ninja`
+
+* Clone Theengs Decoder
+`git clone --recursive https://github.com/Theengs/decoder.git`
+
+* cd to python folder inside the repository
+`cd decoder/python`
+
+* Copy sources inside the build repository
+`cp -r ../src .`
+
+* Build wheel
+`python3 setup.py bdist_wheel`
+
+* Install
+`cd ..`
+`pip3 install python/dist/*.whl`
+
+* Verify installation
+`python3 -c "from TheengsDecoder import decodeBLE; print('Successfully imported decodeBLE from PR_build.yml')"`
+
+You should see:
+`Successfully imported decodeBLE from PR_build.yml`
+
+## using
+
+`import TheengsDecoder`
+
+## methods
+
+- `decodeBLE(string)` Returns a new string with the decoded data in json format or None.
+- `getProperties('model_id string')` Returns the properties (string) of the given model ID or None
+- `getAttribute('model_id string', 'attribute string')` Return the value (string) of named attrubte of the model ID or None.

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

@@ -117,6 +117,7 @@ public:
     BM3IN1,
     BM4IN1,
     MS_CDP,
+    ECOFLOW_ADV,
     FEASY,
     GAEN,
     HHCCPOT002,

theengsdecoder-1.9.8/src/devices/ECOFLOW_ADV_json.h

@@ -0,0 +1,39 @@
+const char* _ECOFLOW_ADV_json = "{\"brand\":\"EcoFlow\",\"model\":\"Power Station\",\"model_id\":\"ECOFLOW_ADV\",\"tag\":\"1409\",\"condition\":[\"manufacturerdata\",\"=\",52,\"index\",0,\"b5b5\"],\"properties\":{\"version\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",6,6],\"lookup\":[\"00\",\"off\",\"523630\",\"RIVER 2\",\"523631\",\"RIVER 2 Max\",\"523632\",\"RIVER 2 Pro\",\"523635\",\"RIVER 3\",\"523333\",\"DELTA 2\"]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",38,2,false,false],\"post_proc\":[\"&\",127]}}}";
+/*R""""(
+{
+   "brand":"EcoFlow",
+   "model":"Power Station",
+   "model_id":"ECOFLOW_ADV",
+   "tag":"1409",
+   "condition":["manufacturerdata", "=", 52, "index", 0, "b5b5"],
+   "properties":{
+      "version":{
+        "decoder":["string_from_hex_data", "manufacturerdata", 6, 6],
+        "lookup":["00", "off",
+                  "523630", "RIVER 2",
+                  "523631", "RIVER 2 Max",
+                  "523632", "RIVER 2 Pro",
+                  "523635", "RIVER 3",
+                  "523333", "DELTA 2"]
+      },
+      "batt":{
+        "decoder":["value_from_hex_data", "manufacturerdata", 38, 2, false, false],
+        "post_proc":["&", 127]
+      }
+   }
+})"""";*/
+
+const char* _ECOFLOW_ADV_json_props = "{\"properties\":{\"version\":{\"unit\":\"string\",\"name\":\"model version\"},\"batt\":{\"unit\":\"%\",\"name\":\"battery\"}}}";
+/*R""""(
+{
+   "properties": {
+      "version":{
+        "unit":"string",
+        "name":"model version"
+      },
+      "batt": {
+        "unit": "%",
+        "name": "battery"
+      }
+   }
+})"""";*/

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

@@ -27,6 +27,7 @@
 #include "devices/CGP1W_json.h"
 #include "devices/CGP23W_json.h"
 #include "devices/CGPR1_json.h"
+#include "devices/ECOFLOW_ADV_json.h"
 #include "devices/FEASY_json.h"
 #include "devices/GAEN_json.h"
 #include "devices/H5055_json.h"
@@ -209,6 +210,7 @@ const char* _devices[][2] = {
     {_BM3IN1_json, _BM3IN1_json_props},
     {_BM4IN1_json, _BM4IN1_json_props},
     {_MS_CDP_json, _MS_CDP_json_props},
+    {_ECOFLOW_ADV_json, _ECOFLOW_ADV_json_props},
     {_FEASY_json, _FEASY_json_props},
     {_GAEN_json, _GAEN_json_props},
     {_HHCCPOT002_json, _HHCCPOT002_json_props},

theengsdecoder-1.9.8/theengsdecoder.egg-info/PKG-INFO

@@ -0,0 +1,55 @@
+Metadata-Version: 2.1
+Name: theengsdecoder
+Version: 1.9.8
+Summary: A message decoder for the Internet of Things
+Author: Theengs
+License:  GPL-3.0 License
+Description-Content-Type: text/markdown
+
+# Theengs Decoder
+
+## Installation
+
+* Create a virtual environment
+`python3 -m venv theengs-venv`
+
+* Activate the virtual environment
+`source theengs-venv/bin/activate`
+
+* Install and upgrade pip
+`python3 -m pip install --upgrade pip`
+
+* Install dependencies
+`pip3 install setuptools setuptools_scm cmake==3.25.0 wheel scikit-build ninja`
+
+* Clone Theengs Decoder
+`git clone --recursive https://github.com/Theengs/decoder.git`
+
+* cd to python folder inside the repository
+`cd decoder/python`
+
+* Copy sources inside the build repository
+`cp -r ../src .`
+
+* Build wheel
+`python3 setup.py bdist_wheel`
+
+* Install
+`cd ..`
+`pip3 install python/dist/*.whl`
+
+* Verify installation
+`python3 -c "from TheengsDecoder import decodeBLE; print('Successfully imported decodeBLE from PR_build.yml')"`
+
+You should see:
+`Successfully imported decodeBLE from PR_build.yml`
+
+## using
+
+`import TheengsDecoder`
+
+## methods
+
+- `decodeBLE(string)` Returns a new string with the decoded data in json format or None.
+- `getProperties('model_id string')` Returns the properties (string) of the given model ID or None
+- `getAttribute('model_id string', 'attribute string')` Return the value (string) of named attrubte of the model ID or None.

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

@@ -466,6 +466,7 @@ src/devices/CGH1_json.h
 src/devices/CGP1W_json.h
 src/devices/CGP23W_json.h
 src/devices/CGPR1_json.h
+src/devices/ECOFLOW_ADV_json.h
 src/devices/FEASY_json.h
 src/devices/GAEN_json.h
 src/devices/H5055_json.h

theengsdecoder-1.9.6/PKG-INFO

@@ -1,33 +0,0 @@
-Metadata-Version: 2.1
-Name: theengsdecoder
-Version: 1.9.6
-Summary: A message decoder for the Internet of Things
-Author: Theengs
-License:  GPL-3.0 License
-Description-Content-Type: text/markdown
-
-# Theengs Decoder
-
-## dependencies
-Building this module it requires scikit-build and cmake, if not already installed you will need to open a terminal and execute:
-```
-pip install scikit-build
-apt-get install cmake
-```
-
-## installation
-
-From a terminal cd to this folder and execute:
-```
-python setup.py install --user
-```
-
-## using
-
-`import TheengsDecoder`
-
-## methods
-
-- `decodeBLE(string)` Returns a new string with the decoded data in json format or None.
-- `getProperties('model_id string')` Returns the properties (string) of the given model ID or None
-- `getAttribute('model_id string', 'attribute string')` Return the value (string) of named attrubte of the model ID or None.

theengsdecoder-1.9.6/README.md

@@ -1,25 +0,0 @@
-# Theengs Decoder
-
-## dependencies
-Building this module it requires scikit-build and cmake, if not already installed you will need to open a terminal and execute:
-```
-pip install scikit-build
-apt-get install cmake
-```
-
-## installation
-
-From a terminal cd to this folder and execute:
-```
-python setup.py install --user
-```
-
-## using
-
-`import TheengsDecoder`
-
-## methods
-
-- `decodeBLE(string)` Returns a new string with the decoded data in json format or None.
-- `getProperties('model_id string')` Returns the properties (string) of the given model ID or None
-- `getAttribute('model_id string', 'attribute string')` Return the value (string) of named attrubte of the model ID or None.

theengsdecoder-1.9.6/theengsdecoder.egg-info/PKG-INFO

@@ -1,33 +0,0 @@
-Metadata-Version: 2.1
-Name: theengsdecoder
-Version: 1.9.6
-Summary: A message decoder for the Internet of Things
-Author: Theengs
-License:  GPL-3.0 License
-Description-Content-Type: text/markdown
-
-# Theengs Decoder
-
-## dependencies
-Building this module it requires scikit-build and cmake, if not already installed you will need to open a terminal and execute:
-```
-pip install scikit-build
-apt-get install cmake
-```
-
-## installation
-
-From a terminal cd to this folder and execute:
-```
-python setup.py install --user
-```
-
-## using
-
-`import TheengsDecoder`
-
-## methods
-
-- `decodeBLE(string)` Returns a new string with the decoded data in json format or None.
-- `getProperties('model_id string')` Returns the properties (string) of the given model ID or None
-- `getAttribute('model_id string', 'attribute string')` Return the value (string) of named attrubte of the model ID or None.