From b5a8cc493cef5feca0ddf70bb8e87c34dd8f261e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 28 Mar 2024 09:16:43 +0100 Subject: [PATCH 01/11] Fix typo: Koenigssee --- etc/psa_config/DC2C_print03.json | 2 +- etc/psa_config/DC2C_print07.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index 3ee8468..2d62300 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -14,7 +14,7 @@ "text":"Ort: ", "vari":"location", "styl":"align c", -"text":"Schönau am Königsee", +"text":"Schönau am Königssee", "feed":"nl", "text":"Automatentechnik ", "feed":"nl", diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index ecce986..cece342 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -14,7 +14,7 @@ "text":"Ort: ", "vari":"location", "styl":"align c", -"text":"Schönau am Königsee", +"text":"Schönau am Königssee", "feed":"nl", "text":"Automatentechnik ", "feed":"nl", From b5e5fd0a7005dc452cf167ef0b9bc6f7d4dc8e8e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 5 Apr 2024 13:51:38 +0200 Subject: [PATCH 02/11] update version to 05.04.2024 --- etc/psa_config/DC2C_print03.json | 2 +- etc/psa_config/DC2C_print07.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index 2d62300..c896bd7 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -1,7 +1,7 @@ { "title":"DC2C_pri03", "project":"Schoenau", -"Version":"15.11.2023 00001", +"Version":"05.04.2024 00001", "feed":"nl", "styl":"size 00", "text":"Automat: ", diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index cece342..b265397 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -1,7 +1,7 @@ { "title":"DC2C_pri07", "project":"Schoenau", -"Version":"15.11.2023 00001", +"Version":"05.04.2024 00001", "feed":"nl", "styl":"size 00", "text":"Automat: ", From c4b7fef7d488efe908805af7716ce118f7d1e0fb Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 8 Apr 2024 16:25:04 +0200 Subject: [PATCH 03/11] update tariff for zone1 and zone2: new prices and extension of parking times --- etc/psa_tariff/tariff01.json | 46 +++++++++++++++++++++++++++++------- etc/psa_tariff/tariff02.json | 32 ++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index 9255ce5..b668dad 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -38,7 +38,7 @@ "pop_day_night_end_time": "15:20:00", "pop_price_night": 0, "pop_min_time": 60, - "pop_max_time": 10080, + "pop_max_time": 14400, "pop_min_price": 300, "pop_carry_over": 1, "pop_daily_card_price": 0, @@ -59,37 +59,52 @@ { "pra_payment_option_id": 1099, "pra_payment_unit_id": 5, - "pra_price": 800 + "pra_price": 900 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 7, - "pra_price": 1600 + "pra_price": 1800 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 8, - "pra_price": 2400 + "pra_price": 2700 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 9, - "pra_price": 3200 + "pra_price": 3600 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 10, - "pra_price": 4000 + "pra_price": 4500 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 11, - "pra_price": 4800 + "pra_price": 5400 }, { "pra_payment_option_id": 1099, "pra_payment_unit_id": 12, - "pra_price": 5600 + "pra_price": 6300 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 13, + "pra_price": 7200 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 14, + "pra_price": 8100 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 15, + "pra_price": 9000 } ], "Duration": [ @@ -142,6 +157,21 @@ "pun_id": 12, "pun_label": "168h", "pun_duration": 10080 + }, + { + "pun_id": 13, + "pun_label": "192h", + "pun_duration": 11520 + }, + { + "pun_id": 14, + "pun_label": "216h", + "pun_duration": 12960 + }, + { + "pun_id": 15, + "pun_label": "240h", + "pun_duration": 14400 } ] } diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index 3493d6a..9a6ccbb 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -38,7 +38,7 @@ "pop_day_night_end_time": "15:07:00", "pop_price_night": 0, "pop_min_time": 60, - "pop_max_time": 10080, + "pop_max_time": 14400, "pop_min_price": 300, "pop_carry_over": 1, "pop_daily_card_price": 0, @@ -90,6 +90,21 @@ "pra_payment_option_id": 1100, "pra_payment_unit_id": 12, "pra_price": 4200 + }, + { + "pra_payment_option_id": 1100, + "pra_payment_unit_id": 13, + "pra_price": 4800 + }, + { + "pra_payment_option_id": 1100, + "pra_payment_unit_id": 14, + "pra_price": 5400 + }, + { + "pra_payment_option_id": 1100, + "pra_payment_unit_id": 15, + "pra_price": 6000 } ], "Duration": [ @@ -142,6 +157,21 @@ "pun_id": 12, "pun_label": "168h", "pun_duration": 10080 + }, + { + "pun_id": 13, + "pun_label": "192h", + "pun_duration": 11520 + }, + { + "pun_id": 14, + "pun_label": "216h", + "pun_duration": 12960 + }, + { + "pun_id": 15, + "pun_label": "240h", + "pun_duration": 14400 } ] } From a9cb491e09ae4ab16ed14c77f62ca4248c4bff45 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 9 Apr 2024 15:10:12 +0200 Subject: [PATCH 04/11] Update tariff-info to trigger new download --- etc/psa_tariff/tariff01.json | 4 ++-- etc/psa_tariff/tariff02.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index b668dad..0ad7adc 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -1,7 +1,7 @@ { "Project" : "Schoenau", - "Version" : "1.0.15", - "Info" : "", + "Version" : "1.2.0", + "Info" : "<>", "Currency": [ { "pcu_id": 1, diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index 9a6ccbb..f008123 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -1,7 +1,7 @@ { "Project" : "Schoenau", - "Version" : "1.1.1", - "Info" : "", + "Version" : "1.2.0", + "Info" : "<<>>", "Currency": [ { "pcu_id": 1, From 242cb32d021a95d4f3f8830751bda671082fc7f9 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 9 Apr 2024 17:01:49 +0200 Subject: [PATCH 05/11] Added opkg install tariff-config-332 --- etc/psa_update/opkg_commands | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 761de0b..5a309b6 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -9,5 +9,6 @@ opkg install prepare-update opkg install atbupdatetool opkg install mxt-touch-reset opkg install apism +opkg install tariff-config-332 opkg info apism opkg info atbupdatetool From bcf680cb85e3fb08ce143fa3ea39621b52cd9c0c Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 10 Apr 2024 10:13:05 +0200 Subject: [PATCH 06/11] Add ptu5-systemcontroller using upgrade --- etc/psa_update/opkg_commands | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 5a309b6..cbce269 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -10,5 +10,5 @@ opkg install atbupdatetool opkg install mxt-touch-reset opkg install apism opkg install tariff-config-332 -opkg info apism -opkg info atbupdatetool +opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller +opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller From 4cd5a889df9b49ebd40d7a4baedded94f2289f54 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 10 Apr 2024 10:29:08 +0200 Subject: [PATCH 07/11] add tariff101.json for zone101 (solar) --- etc/psa_tariff/tariff101.json | 177 ++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 etc/psa_tariff/tariff101.json diff --git a/etc/psa_tariff/tariff101.json b/etc/psa_tariff/tariff101.json new file mode 100644 index 0000000..0ad7adc --- /dev/null +++ b/etc/psa_tariff/tariff101.json @@ -0,0 +1,177 @@ +{ + "Project" : "Schoenau", + "Version" : "1.2.0", + "Info" : "<>", + "Currency": [ + { + "pcu_id": 1, + "pcu_sign": "€", + "pcu_major": "Euro", + "pcu_minor": "Cent", + "pcu_active": true + } + ], + "PaymentMethod": [ + { + "pme_id": 1, + "pme_label": "progressive" + }, + { + "pme_id": 2, + "pme_label": "degressive" + }, + { + "pme_id": 3, + "pme_label": "linear" + }, + { + "pme_id": 4, + "pme_label": "steps" + } + ], + "PaymentOption": [ + { + "pop_id": 1099, + "pop_label": "Zone 1", + "pop_payment_method_id": 4, + "pop_day_end_time": "15:20:00", + "pop_day_night_end_time": "15:20:00", + "pop_price_night": 0, + "pop_min_time": 60, + "pop_max_time": 14400, + "pop_min_price": 300, + "pop_carry_over": 1, + "pop_daily_card_price": 0, + "pop_multi_hour_price": 8 + } + ], + "PaymentRate": [ + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 1, + "pra_price": 300 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 6, + "pra_price": 700 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 5, + "pra_price": 900 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 7, + "pra_price": 1800 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 8, + "pra_price": 2700 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 9, + "pra_price": 3600 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 10, + "pra_price": 4500 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 11, + "pra_price": 5400 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 12, + "pra_price": 6300 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 13, + "pra_price": 7200 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 14, + "pra_price": 8100 + }, + { + "pra_payment_option_id": 1099, + "pra_payment_unit_id": 15, + "pra_price": 9000 + } + ], + "Duration": [ + { + "pun_id": 1, + "pun_label": "1h", + "pun_duration": 60 + }, + { + "pun_id": 3, + "pun_label": "15 min", + "pun_duration": 15 + }, + { + "pun_id": 5, + "pun_label": "24h", + "pun_duration": 1440 + }, + { + "pun_id": 6, + "pun_label": "3h", + "pun_duration": 180 + }, + { + "pun_id": 7, + "pun_label": "48h", + "pun_duration": 2880 + }, + { + "pun_id": 8, + "pun_label": "72h", + "pun_duration": 4320 + }, + { + "pun_id": 9, + "pun_label": "96h", + "pun_duration": 5760 + }, + { + "pun_id": 10, + "pun_label": "120h", + "pun_duration": 7200 + }, + { + "pun_id": 11, + "pun_label": "144h", + "pun_duration": 8640 + }, + { + "pun_id": 12, + "pun_label": "168h", + "pun_duration": 10080 + }, + { + "pun_id": 13, + "pun_label": "192h", + "pun_duration": 11520 + }, + { + "pun_id": 14, + "pun_label": "216h", + "pun_duration": 12960 + }, + { + "pun_id": 15, + "pun_label": "240h", + "pun_duration": 14400 + } + ] +} From 472e605cebd13f03493736adfbc0bb8042858b44 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 12 Apr 2024 09:14:35 +0200 Subject: [PATCH 08/11] sync with master --- etc/psa_tariff/tariff101.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_tariff/tariff101.json b/etc/psa_tariff/tariff101.json index 0ad7adc..2e42b09 100644 --- a/etc/psa_tariff/tariff101.json +++ b/etc/psa_tariff/tariff101.json @@ -1,6 +1,6 @@ { "Project" : "Schoenau", - "Version" : "1.2.0", + "Version" : "1.2.1", "Info" : "<>", "Currency": [ { From 3b703a56bf1578cf554d8d61eae04fdc8ce4aa7d Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 23 Apr 2024 12:36:44 +0200 Subject: [PATCH 09/11] Set version date (23/04) -> trigger git --- etc/psa_config/DC2C_cash.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 00e0bcb..9494d1c 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -1,7 +1,7 @@ { "title":"DC2C_cash ", "project":"Schoenau", -"version":"15.10.2023 14:55 02.00.06", +"version":"23.10.2024 12:22 02.00.06", "CoinDenom(15..0)":[200,100,50,0,0,0,0,0,0,255,200,100,50,20,10,5], "CoinValue(15..0)":[0,380,0,0,0,0,0,0,0,3,200,100,50,20,10,5], "CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1], From d23af483255c61046288212cb795f4e6b97bd1b4 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 6 May 2024 11:09:11 +0200 Subject: [PATCH 10/11] Update DC2C_cash/device.json as provided by Thomas --- etc/psa_config/DC2C_cash.json | 12 ++++++------ etc/psa_config/DC2C_device.json | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 9494d1c..07b6041 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -1,14 +1,14 @@ { "title":"DC2C_cash ", "project":"Schoenau", -"version":"23.10.2024 12:22 02.00.06", -"CoinDenom(15..0)":[200,100,50,0,0,0,0,0,0,255,200,100,50,20,10,5], -"CoinValue(15..0)":[0,380,0,0,0,0,0,0,0,3,200,100,50,20,10,5], -"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1], +"version":"06.05.2024 02.00.07", +"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5], +"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5], +"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0], "ExchangeRate":1, "TokenChannel":6, -"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], -"BillAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1], +"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,50,20,10,5], +"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1], "LocalTaxRate":19, "ForeignTaxRate":0, "Surcharge":0, diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index b71753e..9596d1c 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -23,5 +23,9 @@ "BattWarn":11800, "BattErr":11200, "foreign":1, -"refPrint":1 +"refundPrint":1, +"billWarnLev":300, +"billFullLev":380, +"housing":1 + } From b08b0fabb336cd437ddacb0cf5eec30af4457a57 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 6 May 2024 12:23:37 +0200 Subject: [PATCH 11/11] keep only 'opkg update' --- etc/psa_update/opkg_commands | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index cbce269..6dae920 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -5,10 +5,10 @@ ############################################################################### # opkg update -opkg install prepare-update -opkg install atbupdatetool -opkg install mxt-touch-reset -opkg install apism -opkg install tariff-config-332 -opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller -opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller +# opkg install prepare-update +# opkg install atbupdatetool +# opkg install mxt-touch-reset +# opkg install apism +# opkg install tariff-config-332 +# opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller +# opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller