From 5bc3fdb1535d71a892b0eb229610a3385bdba778 Mon Sep 17 00:00:00 2001
From: Magnus Persson <magnus@noreply.github.com>
Date: Fri, 4 Nov 2022 18:55:37 +0100
Subject: [PATCH] Merge branch 'dev' of https://github.com/mp-se/gravitymon
 into dev

---
 1.json                      |  10 ++++++++++
 docs/v1.0/.nojekyll         |   0
 ex/EspStackTraceDecoder.jar | Bin 0 -> 3056 bytes
 ex/decode.bat               |   4 ++++
 test.json                   |  21 +++++++++++++++++++++
 test2.json                  |  27 +++++++++++++++++++++++++++
 6 files changed, 62 insertions(+)
 create mode 100644 1.json
 create mode 100644 docs/v1.0/.nojekyll
 create mode 100644 ex/EspStackTraceDecoder.jar
 create mode 100644 ex/decode.bat
 create mode 100644 test.json
 create mode 100644 test2.json

diff --git a/1.json b/1.json
new file mode 100644
index 0000000..c8fc3db
--- /dev/null
+++ b/1.json
@@ -0,0 +1,10 @@
+{
+  "key": "gravitymon66a1b0",
+  "data": {
+    "Temperature": 27,
+    "Battery": 4.99,
+    "Tilt": 88.86,
+    "Rssi": -51,
+    "Gravity": 1.1173
+  }
+}
diff --git a/docs/v1.0/.nojekyll b/docs/v1.0/.nojekyll
new file mode 100644
index 0000000..e69de29
diff --git a/ex/EspStackTraceDecoder.jar b/ex/EspStackTraceDecoder.jar
new file mode 100644
index 0000000000000000000000000000000000000000..bc53018315d8e6f7d1d4cab2fbd6228b9f49f4b1
GIT binary patch
literal 3056
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

literal 0
HcmV?d00001

diff --git a/ex/decode.bat b/ex/decode.bat
new file mode 100644
index 0000000..40fd122
--- /dev/null
+++ b/ex/decode.bat
@@ -0,0 +1,4 @@
+set JAVA_HOME=c:\dev\jdk-17.0.1
+%JAVA_HOME%\bin\java -jar EspStackTraceDecoder.jar c:\Users\magnu\.platformio\packages\toolchain-xtensa\bin\xtensa-lx106-elf-addr2line.exe c:\dev\gravitymon\.pio\build\gravity-release\firmware.elf exception_dump.txt
+
+rem %JAVA_HOME%\bin\java -jar EspStackTraceDecoder.jar c:\Users\magnu\.platformio\packages\toolchain-xtensa\bin\xtensa-lx106-elf-addr2line.exe c:\dev\gravitymon\.pio\build\gravity-debug\firmware.elf exception_dump.txt
\ No newline at end of file
diff --git a/test.json b/test.json
new file mode 100644
index 0000000..fa3ebe8
--- /dev/null
+++ b/test.json
@@ -0,0 +1,21 @@
+gravmon/${mdns}/temperature:${temp}|
+gravmon/${mdns}/gravity:${gravity}|
+gravmon/${mdns}/rssi:${rssi}|
+gravmon/${mdns}/tilt:${tilt}|
+gravmon/${mdns}/battery:${battery}|
+homeassistant/sensor/gravmon_${id}/temperature/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_temp","name":"temperature","dev_cla":"temperature","unit_of_meas":"${temp-unit}","stat_t":"gravmon/${mdns}/temperature"}|
+homeassistant/sensor/gravmon_${id}/gravity/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_grav","name":"gravity","dev_cla":"temperature","unit_of_meas":" ${gravity-unit}","stat_t":"gravmon/${mdns}/gravity"}|
+homeassistant/sensor/gravmon_${id}/rssi/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_rssi","name":"rssi","dev_cla":"signal_strength","unit_of_meas":"dBm","stat_t":"gravmon/${mdns}/rssi"}|
+homeassistant/sensor/gravmon_${id}/tilt/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_tilt","name":"tilt","dev_cla":"temperature","stat_t":"gravmon/${mdns}/tilt"}|
+homeassistant/sensor/gravmon_${id}/battery/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":"${id}"},"uniq_id":"${id}_batt","name":"battery","dev_cla":"voltage","unit_of_meas":"V","stat_t":"gravmon/${mdns}/battery"}|
+
+gravmon/garvmon1/temperature:27.0|
+gravmon/garvmon1/gravity:0.0000|
+gravmon/garvmon1/rssi:-65|
+gravmon/garvmon1/tilt:84.76|
+gravmon/garvmon1/battery:4.99|
+homeassistant/sensor/gravmon_66a1b0/temperature/config:{"dev":{"name":"garvmon1","mdl":"gravmon","sw":"1.1.0","ids":"66a1b0"},"uniq_id":"66a1b0_temp","name":"temperature","dev_cla":"temperature","unit_of_meas":"C","stat_t":"gravmon/garvmon1/temperature"}|
+homeassistant/sensor/gravmon_66a1b0/gravity/config:{"dev":{"name":"garvmon1","mdl":"gravmon","sw":"1.1.0","ids":"66a1b0"},"uniq_id":"66a1b0_grav","name":"gravity","dev_cla":"temperature","unit_of_meas":" G","stat_t":"gravmon/garvmon1/gravity"}|
+homeassistant/sensor/gravmon_66a1b0/rssi/config:{"dev":{"name":"garvmon1","mdl":"gravmon","sw":"1.1.0","ids":"66a1b0"},"uniq_id":"66a1b0_rssi","name":"rssi","dev_cla":"signal_strength","unit_of_meas":"dBm","stat_t":"gravmon/garvmon1/rssi"}|
+homeassistant/sensor/gravmon_66a1b0/tilt/config:{"dev":{"name":"garvmon1","mdl":"gravmon","sw":"1.1.0","ids":"66a1b0"},"uniq_id":"66a1b0_tilt","name":"tilt","dev_cla":"temperature","stat_t":"gravmon/garvmon1/tilt"}|
+homeassistant/sensor/gravmon_66a1b0/battery/config:{"dev":{"name":"garvmon1","mdl":"gravmon","sw":"1.1.0","ids":"66a1b0"},"uniq_id":"66a1b0_batt","name":"battery","dev_cla":"voltage","unit_of_meas":"V","stat_t":"gravmon/garvmon1/battery"}|
diff --git a/test2.json b/test2.json
new file mode 100644
index 0000000..67da3b7
--- /dev/null
+++ b/test2.json
@@ -0,0 +1,27 @@
+gravmon/${mdns}/temperature:${temp}|
+gravmon/${mdns}/gravity:${gravity}|
+gravmon/${mdns}/rssi:${rssi}|
+gravmon/${mdns}/tilt:${tilt}|
+gravmon/${mdns}/battery:${battery}|
+gravmon/${mdns}/swver:${app-ver}|
+homeassistant/sensor/gravmon_${id}/temperature/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_temp","name":"Temperature","dev_cla":"temperature","unit_of_meas":"°${temp-unit}","stat_t":"gravmon/${mdns}/temperature"}|
+homeassistant/sensor/gravmon_${id}/tilt/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_tilt","name":"Tilt","stat_t":"gravmon/${mdns}/tilt"}|
+homeassistant/sensor/gravmon_${id}/battery/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_battery","name":"Battery Voltage","dev_cla":"voltage","unit_of_meas":"V","stat_t":"gravmon/${mdns}/battery"}|
+homeassistant/sensor/gravmon_${id}/gravity/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_grav","name":"Gravity","unit_of_meas":" ${gravity-unit}","stat_t":"gravmon/${mdns}/gravity"}|
+homeassistant/sensor/gravmon_${id}/rssi/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_rssi","name":"Signal Strength","dev_cla":"signal_strength","unit_of_meas":" dB","stat_t":"gravmon/${mdns}/rssi"}|
+homeassistant/sensor/gravmon_${id}/swver/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_swver","name":"Software Version","stat_t":"gravmon/${mdns}/swver"}|
+
+gravmon/${mdns}/temperature:${temp}|
+gravmon/${mdns}/temperature:${temp}|
+gravmon/${mdns}/gravity:${gravity}|
+gravmon/${mdns}/rssi:${rssi}|
+gravmon/${mdns}/tilt:${tilt}|
+gravmon/${mdns}/battery:${battery}|
+gravmon/${mdns}/swver:${app-ver}|
+homeassistant/sensor/gravmon_${id}/temperature/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_temp","name":"Temperature","dev_cla":"temperature","unit_of_meas":"°${temp-unit}","stat_t":"gravmon/${mdns}/temperature"}|
+homeassistant/sensor/gravmon_${id}/temperature/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_temp","name":"Temperature","dev_cla":"temperature","unit_of_meas":"°${temp-unit}","stat_t":"gravmon/${mdns}/temperature"}|
+homeassistant/sensor/gravmon_${id}/tilt/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_tilt","name":"Tilt","stat_t":"gravmon/${mdns}/tilt"}|
+homeassistant/sensor/gravmon_${id}/battery/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_battery","name":"Battery Voltage","dev_cla":"voltage","unit_of_meas":"V","stat_t":"gravmon/${mdns}/battery"}|
+homeassistant/sensor/gravmon_${id}/gravity/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_grav","name":"Gravity","unit_of_meas":" ${gravity-unit}","stat_t":"gravmon/${mdns}/gravity"}|
+homeassistant/sensor/gravmon_${id}/rssi/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_rssi","name":"Signal Strength","dev_cla":"signal_strength","unit_of_meas":" dB","stat_t":"gravmon/${mdns}/rssi"}|
+homeassistant/sensor/gravmon_${id}/swver/config:{"dev":{"name":"${mdns}","mdl":"gravmon","sw":"${app-ver}","ids":["${id}"]},"uniq_id":"${id}_swver","name":"Software Version","stat_t":"gravmon/${mdns}/swver"}|