kopia lustrzana https://github.com/weetmuts/wmbusmeters
Added another izar mfct/type/version combo for izars.
rodzic
52a1f0fa34
commit
5e8c7b93d8
|
@ -22,3 +22,7 @@ telegram=|1944304c9c5824210c04a363140013716577ec59e8663ab0d31c|
|
|||
telegram=|1944304CDEFFE420CC01A2|63120013258F907B0AFF12529AC33B|
|
||||
{"media":"water","meter":"izar","name":"IzarWater5","id":"20e4ffde","prefix":"C15SA","serial_number":"007710","total_m3":159.832,"last_month_total_m3":157.76,"last_month_measure_date":"2021-02-01","remaining_battery_life_y":9,"current_alarms":"no_alarm","previous_alarms":"no_alarm","transmit_period_s":32,"manufacture_year":"2015","timestamp":"1111-11-11T11:11:11Z"}
|
||||
|
||||
# Yet another version of IZAR
|
||||
|
||||
telegram=19442423860775035048A251520015BEB6B2E1ED623A18FC74A5
|
||||
{"media":"water","meter":"izar","name":"IzarWater6","id":"48500375","prefix":"","serial_number":"000000","total_m3":521.602,"last_month_total_m3":519.147,"last_month_measure_date":"2021-11-15","remaining_battery_life_y":9,"current_alarms":"no_alarm","previous_alarms":"leakage","transmit_period_s":8,"manufacture_year":"0","timestamp":"1111-11-11T11:11:11Z"}
|
||||
|
|
|
@ -71,6 +71,7 @@
|
|||
X(IZAR, MANUFACTURER_SAP, 0x04, -1) \
|
||||
X(IZAR, MANUFACTURER_SAP, 0x07, 0x00) \
|
||||
X(IZAR, MANUFACTURER_DME, 0x07, 0x78) \
|
||||
X(IZAR, MANUFACTURER_HYD, 0x07, 0x86) \
|
||||
X(IZAR3, MANUFACTURER_SAP, 0x00, 0x88) \
|
||||
X(LANSENSM, MANUFACTURER_LAS, 0x1a, 0x03) \
|
||||
X(LANSENTH, MANUFACTURER_LAS, 0x1b, 0x07) \
|
||||
|
|
|
@ -17,7 +17,8 @@ METERS="IzarWater izar 21242472 NOKEY
|
|||
IzarWater2 izar 66236629 NOKEY
|
||||
IzarWater3 izar 20481979 NOKEY
|
||||
IzarWater4 izar 2124589c NOKEY
|
||||
IzarWater5 izar 20e4ffde NOKEY"
|
||||
IzarWater5 izar 20e4ffde NOKEY
|
||||
IzarWater6 auto 48500375 NOKEY"
|
||||
|
||||
cat simulations/simulation_izars.txt | grep '^{' > $TEST/test_expected.txt
|
||||
$PROG --format=json simulations/simulation_izars.txt $METERS > $TEST/test_output.txt 2> $TEST/test_stderr.txt
|
||||
|
@ -74,6 +75,11 @@ Received telegram from: 20e4ffde
|
|||
type: Water meter (0x07)
|
||||
ver: 0x00
|
||||
driver: izar
|
||||
Received telegram from: 48500375
|
||||
manufacturer: (HYD) Hydrometer (0x2324)
|
||||
type: Water meter (0x07)
|
||||
ver: 0x86
|
||||
driver: izar
|
||||
EOF
|
||||
|
||||
RES=$($PROG --logfile=$LOGFILE --t1 simulations/simulation_izars.txt 2>&1)
|
||||
|
|
Ładowanie…
Reference in New Issue