Merge branch 'master' into add-basv3

Author: john30

.gitignore

@@ -1,6 +1,4 @@
 *~
-/ebusd-configuration-*.deb
-/ebusd-configuration-*.tgz
-node_modules
+node_modules/
 out*
-utils/dist
+dist/

ChangeLog.md

@@ -1,12 +1,12 @@
 #!/bin/bash
 sed -i \
   -e 's/^id,/#id,/' \
-  latest/en/_templates.csv latest/de/_templates.csv \
+  ./en/_templates.csv ./de/_templates.csv \
 && sed -i \
   -e 's#^errorok,#onoff2,UCH,240=off;15=on,,\nyesno2,UCH,240=no;15=yes,,\nerrorok,#' \
   -e 's#^errorok,#yesno2,UCH,240=no;15=yes,,\nerrorok,#' \
-  latest/en/vaillant/_templates.csv latest/de/vaillant/_templates.csv \
-&& find latest/ -mindepth 3 -type f -not -name "_templates.csv" -exec sed -i \
+  ./en/vaillant/_templates.csv ./de/vaillant/_templates.csv \
+&& find . -mindepth 3 -type f -not -name "_templates.csv" -exec sed -i \
   -e 's#\(HcName.*\),STR:11,#\1,hcname,#i' \
   -e 's#\(phone.*\),STR:9,#\1,phone,#i' \
   -e 's#,UCH,hour,#,hours,,#i' \
@@ -31,12 +31,29 @@ sed -i \
   -e 's#,,night-\?time#,,NightTime#i' \
   -e 's#,,Time&Date#,,TimeDate#i' \
   -e 's#,UCH,240=off;15=on,#,onoff2,,#' \
-  -e 's#,UCH,,,"Off=0, On=1"#,onoff,,,#' \
-  -e 's#,UCH,240=no;15=yes,#,yesno2,,#' \
+  -e 's#,UCH,,,"Off=0, On=1"#,onoff,,,#i' \
+  -e 's#,UCH,0=off;1=on,#,onoff,,#i' \
+  -e 's#,UCH,240=no;15=yes,#,yesno2,,#i' \
+  -e 's#,UCH,0=no;1=yes,#,yesno,,#i' \
   -e 's#,RückmeldungB#,RueckmeldungB#' \
   -e 's#ReglerCurrentTEMP#ReglerCurrentTemp#' \
   -e 's#\(,CounterStartattempts[.*],\)temp0,#\1UCH,#' \
   -e 's#ForWay#FourWay#g' \
+  -e 's#punp#pump#g' \
+  -e 's#IGN:1,,,[^,]*#IGN:1,,,#g' \
+  -e 's#\(temp[^,*]\),,,\([^,]*\)1/2 \?°C \(resolution|Auflösung\)#\1,,,\2#gi' \
+  -e 's#,,,\([^,]*\)1/2 \?°C \(resolution|Auflösung\)#,2,°C,\1#g' \
+  -e 's#,,,\([^,]*\)1 \?°C \(resolution|Auflösung\)#,,°C,\1#g' \
+  -e 's#°K#K#g' \
+  -e 's#,,,\([^,]*\)1 \?K \(resolution|Auflösung\)#,,K,\1#g' \
+  -e 's#,,,\([^,]*\) (°C)#,,°C,\1#g' \
+  -e 's#,,,\([^,]*\) (K)#,,K,\1#g' \
+  -e 's# (°C)##g' \
+  -e 's# (K)##g' \
+  -e 's# (yes \?/ \?no)##gi' \
+  -e 's# (on \?/ \?off)##gi' \
+  -e 's#D2C,,°C#temp,,#g' \
+  -e 's#D2C,,K#calibration,,#g' \
   \{\} \; \
 && npm run csv2tsp-extra \
 && npm run csv2tsp \