Cleanup failed merge

1.json

@@ -1,10 +0,0 @@
-{
-  "key": "gravitymon66a1b0",
-  "data": {
-    "Temperature": 27,
-    "Battery": 4.99,
-    "Tilt": 88.86,
-    "Rssi": -51,
-    "Gravity": 1.1173
-  }
-}

ex/decode.bat

@@ -1,4 +0,0 @@
-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

ex/exception_dump.txt

@@ -1,35 +0,0 @@
-
-User exception (panic/abort/assert)
---------------- CUT HERE FOR EXCEPTION DECODER ---------------
-
-Panic core_esp8266_main.cpp:215 loop_task
-
->>>stack>>>
-
-ctx: sys
-sp: 3fffff10 end: 3fffffb0 offset: 0000
-3fffff10:  00000000 02ac3bd9 40280793 3ffeaec4
-3fffff20:  000000fe 00000000 00000000 00000000  
-3fffff30:  00000000 00000000 00000000 3fff1edc
-3fffff40:  3fff1fa8 3fff1fa8 3fff0280 3fff1e94
-3fffff50:  3fffdad0 00000000 3ffe8648 4022d992  
-3fffff60:  402854b2 3fffdab0 00000000 4022d9ff
-3fffff70:  00000000 3fffdad0 3fff1e94 4022d0d8
-3fffff80:  40000f49 40000f49 3fffdab0 40000f49
-3fffff90:  40000e19 000b5a21 00000000 00000005  
-3fffffa0:  00000000 aa55aa55 000000d0 401057f9
-<<<stack<<<
-
---------------- CUT HERE FOR EXCEPTION DECODER ---------------
-
- ets Jan  8 2013,rst cause:2, boot mode:(3,6)
-
-load 0x4010f000, len 3460, room 16 
-tail 4
-chksum 0xcc
-load 0x3fff20b8, len 40, room 4
-tail 4
-chksum 0xc9
-csum 0xc9
-v000b5a30
-~ld

test.json

@@ -1,21 +0,0 @@
-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"}|

test2.json

@@ -1,27 +0,0 @@
-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"}|