new Ble ver, 2 parts

2026-05-27 13:19:22 +03:00 · 2023-11-15 21:54:02 +03:00
parent 5f1a9b23e5
commit e5781dc424
92 changed files with 6745 additions and 28 deletions
--- a/lib/decoder/src/devices/RDL52832_json.h
+++ b/lib/decoder/src/devices/RDL52832_json.h
@@ -0,0 +1,154 @@
+const char* _RDL52832_json = "{\"brand\":\"Radioland\",\"model\":\"RDL52832\",\"model_id\":\"RDL52832\",\"tag\":\"070a\",\"condition\":[\"manufacturerdata\",\"=\",50,\"&\",\"name\",\"index\",0,\"RDL52832\"],\"properties\":{\"mfid\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",0,4]},\"uuid\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",8,32]},\"major\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",40,4,false]},\"minor\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",44,4,false]},\"txpower\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",48,2,false]},\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",0,4,false,true],\"post_proc\":[\"/\",256]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,4,false,true],\"post_proc\":[\"/\",256]},\".cal\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,2,false,false],\"post_proc\":[\"/\",10]},\"accx\":{\"condition\":[\"servicedata\",8,\"0000\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",14,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"*\",9.80665]},\"_accx\":{\"condition\":[\"servicedata\",8,\"0001\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",14,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"+\",1,\"*\",9.80665]},\"__accx\":{\"condition\":[\"servicedata\",8,\"0100\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",14,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"*\",-1,\"*\",9.80665]},\"___accx\":{\"condition\":[\"servicedata\",8,\"0101\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",14,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"+\",1,\"*\",-1,\"*\",9.80665]},\"_.cal\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",20,2,false,false],\"post_proc\":[\"/\",10]},\"accy\":{\"condition\":[\"servicedata\",16,\"0000\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",22,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"*\",9.80665]},\"_accy\":{\"condition\":[\"servicedata\",16,\"0001\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",22,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"+\",1,\"*\",9.80665]},\"__accy\":{\"condition\":[\"servicedata\",16,\"0100\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",22,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"*\",-1,\"*\",9.80665]},\"___accy\":{\"condition\":[\"servicedata\",16,\"0101\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",22,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"+\",1,\"*\",-1,\"*\",9.80665]},\"__.cal\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",28,2,false,false],\"post_proc\":[\"/\",10]},\"accz\":{\"condition\":[\"servicedata\",24,\"0000\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",30,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"*\",9.80665]},\"_accz\":{\"condition\":[\"servicedata\",24,\"0001\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",30,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"+\",1,\"*\",9.80665]},\"__accz\":{\"condition\":[\"servicedata\",24,\"0100\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",30,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"*\",-1,\"*\",9.80665]},\"___accz\":{\"condition\":[\"servicedata\",24,\"0101\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",30,2,false,false],\"post_proc\":[\"/\",100,\"+\",\".cal\",\"+\",1,\"*\",-1,\"*\",9.80665]}}}";
+
+/*R""""(
+{
+   "brand":"Radioland",
+   "model":"RDL52832",
+   "model_id":"RDL52832",
+   "tag":"070a",
+   "condition":["manufacturerdata", "=", 50, "&", "name", "index", 0, "RDL52832"],
+   "properties":{
+      "mfid":{
+         "decoder":["string_from_hex_data", "manufacturerdata", 0, 4]
+      },
+      "uuid":{
+         "decoder":["string_from_hex_data", "manufacturerdata", 8, 32]
+      },
+      "major":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 40, 4, false]
+      },
+      "minor":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 44, 4, false]
+      },
+      "txpower":{
+         "decoder":["value_from_hex_data","manufacturerdata", 48, 2, false]
+      },
+      "tempc":{
+         "decoder":["value_from_hex_data", "servicedata", 0, 4, false, true],
+         "post_proc":["/", 256]
+      },
+      "hum":{
+         "decoder":["value_from_hex_data", "servicedata", 4, 4, false, true],
+         "post_proc":["/", 256]
+      },
+      ".cal":{
+         "decoder":["value_from_hex_data", "servicedata", 12, 2, false, false],
+         "post_proc":["/", 10]
+      },
+      "accx":{
+         "condition":["servicedata", 8, "0000"],
+         "decoder":["value_from_hex_data", "servicedata", 14, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "*", 9.80665]
+      },
+      "_accx":{
+         "condition":["servicedata", 8, "0001"],
+         "decoder":["value_from_hex_data", "servicedata", 14, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "+", 1, "*", 9.80665]
+      },
+      "__accx":{
+         "condition":["servicedata", 8, "0100"],
+         "decoder":["value_from_hex_data", "servicedata", 14, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "*", -1, "*", 9.80665]
+      },
+      "___accx":{
+         "condition":["servicedata", 8, "0101"],
+         "decoder":["value_from_hex_data", "servicedata", 14, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "+", 1, "*", -1, "*", 9.80665]
+      },
+      "_.cal":{
+         "decoder":["value_from_hex_data", "servicedata", 20, 2, false, false],
+         "post_proc":["/", 10]
+      },
+      "accy":{
+         "condition":["servicedata", 16, "0000"],
+         "decoder":["value_from_hex_data", "servicedata", 22, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "*", 9.80665]
+      },
+      "_accy":{
+         "condition":["servicedata", 16, "0001"],
+         "decoder":["value_from_hex_data", "servicedata", 22, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "+", 1, "*", 9.80665]
+      },
+      "__accy":{
+         "condition":["servicedata", 16, "0100"],
+         "decoder":["value_from_hex_data", "servicedata", 22, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "*", -1, "*", 9.80665]
+      },
+      "___accy":{
+         "condition":["servicedata", 16, "0101"],
+         "decoder":["value_from_hex_data", "servicedata", 22, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "+", 1, "*", -1, "*", 9.80665]
+      },
+      "__.cal":{
+         "decoder":["value_from_hex_data", "servicedata", 28, 2, false, false],
+         "post_proc":["/", 10]
+      },
+      "accz":{
+         "condition":["servicedata", 24, "0000"],
+         "decoder":["value_from_hex_data", "servicedata", 30, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "*", 9.80665]
+      },
+      "_accz":{
+         "condition":["servicedata", 24, "0001"],
+         "decoder":["value_from_hex_data", "servicedata", 30, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "+", 1, "*", 9.80665]
+      },
+      "__accz":{
+         "condition":["servicedata", 24, "0100"],
+         "decoder":["value_from_hex_data", "servicedata", 30, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "*", -1, "*", 9.80665]
+      },
+      "___accz":{
+         "condition":["servicedata", 24, "0101"],
+         "decoder":["value_from_hex_data", "servicedata", 30, 2, false, false],
+         "post_proc":["/", 100, "+", ".cal", "+", 1, "*", -1, "*", 9.80665]
+      }
+   }
+})"""";*/
+
+const char* _RDL52832_json_props = "{\"properties\":{\"mfid\":{\"unit\":\"hex\",\"name\":\"manufacturer id\"},\"uuid\":{\"unit\":\"hex\",\"name\":\"service uuid\"},\"major\":{\"unit\":\"hex\",\"name\":\"major value\"},\"minor\":{\"unit\":\"hex\",\"name\":\"minor value\"},\"txpower\":{\"unit\":\"dBm\",\"name\":\"tx power @ 1 m\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"},\"accx\":{\"unit\":\"m/s²\",\"name\":\"acceleration x\"},\"accy\":{\"unit\":\"m/s²\",\"name\":\"acceleration y\"},\"accz\":{\"unit\":\"m/s²\",\"name\":\"acceleration z\"}}}";
+/*R""""(
+{
+   "properties":{
+      "mfid":{
+         "unit":"hex",
+         "name":"manufacturer id"
+      },
+      "uuid":{
+         "unit":"hex",
+         "name":"service uuid"
+      },
+      "major":{
+         "unit":"hex",
+         "name":"major value"
+      },
+      "minor":{
+         "unit":"hex",
+         "name":"minor value"
+      },
+      "txpower":{
+         "unit":"dBm",
+         "name":"tx power @ 1 m"
+      },
+      "tempc":{
+         "unit":"°C",
+         "name":"temperature"
+      },
+      "hum":{
+         "unit":"%",
+         "name":"humidity"
+      },
+      "accx":{
+         "unit":"m/s²",
+         "name":"acceleration x"
+      },
+      "accy":{
+         "unit":"m/s²",
+         "name":"acceleration y"
+      },
+      "accz":{
+         "unit":"m/s²",
+         "name":"acceleration z"
+      }
+   }
+})"""";*/