From 3ac988f2680d1d1ccdf6d6c03cae45b4ffd04a25 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 4 Jan 2024 19:08:30 +0100 Subject: [PATCH 01/31] Fix: 2024-01-04 -> 2024-04-01 (Ostermontag) Add Ostersonntag (2x): not really necessary as it's a sunday. --- etc/psa_tariff/tariff01.json | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index 8662012..1d7fed4 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -211,6 +211,13 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, + { + "pedwt_id": 2177, + "pedwt_period_exc_day_id": 2023, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, { "pedwt_id": 2178, "pedwt_period_exc_day_id": 2022, @@ -260,6 +267,13 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, + { + "pedwt_id": 2201, + "pedwt_period_exc_day_id": 2039, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, { "pedwt_id": 2202, "pedwt_period_exc_day_id": 2038, @@ -410,8 +424,16 @@ { "ped_id": 2022, "ped_label": "Ostermontag", - "ped_date_start": "2024-01-04", - "ped_date_end": "2024-01-04", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", + "ped_period_special_day_id": 1, + "ped_year": 2024 + }, + { + "ped_id": 2023, + "ped_label": "Ostersonntag", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", "ped_period_special_day_id": 1, "ped_year": 2024 }, @@ -519,6 +541,14 @@ "ped_period_special_day_id": 1, "ped_year": 2025 }, + { + "ped_id": 2039, + "ped_label": "Ostersonntag", + "ped_date_start": "2025-04-20", + "ped_date_end": "2025-04-20", + "ped_period_special_day_id": 1, + "ped_year": 2025 + }, { "ped_id": 2038, "ped_label": "Staatsfeiertag", From bbe0f2aa0bbf5cd3eb520927d1580f37035d6ef4 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 16 Jan 2024 08:31:07 +0100 Subject: [PATCH 02/31] Added installation of mxt-touch-reset --- etc/psa_update/opkg_commands | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 13c1190..807f1f1 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -4,11 +4,10 @@ # opkg-commands added to this file will be executed by ATBUpdateTool. ############################################################################### # -opkg info atbqt -opkg info atbupdatetool opkg update opkg install prepare-update opkg install atbupdatetool +opkg install mxt-touch-reset # opkg remove atb-accountingtool # opkg install atb-accountingtool opkg --cache /var/cache/opkg --download-only upgrade From 91e7fc3725aeded5137b08afdc5e92a142d50dcb Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 16 Jan 2024 08:48:09 +0100 Subject: [PATCH 03/31] base jsonfiles for korneuburg --- etc/psa_config/DC2C_cash.json | 8 ++++---- etc/psa_config/DC2C_conf.json | 2 +- etc/psa_config/DC2C_print01.json | 20 +++++++------------- etc/psa_config/DC2C_print02.json | 9 +-------- etc/psa_config/DC2C_print03.json | 16 +++++++--------- etc/psa_config/DC2C_print05.json | 20 +++++++------------- etc/psa_config/DC2C_print06.json | 12 +++--------- etc/psa_config/DC2C_print07.json | 16 +++++++--------- etc/psa_config/DC2C_print31.json | 19 ------------------- 9 files changed, 37 insertions(+), 85 deletions(-) diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 5269ffb..4da11dc 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -2,13 +2,13 @@ "title":"DC2C_cash ", "project":"Korneuburg", "version":"15.10.2023 14:55 02.00.06", -"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,255,200,100,50,20,10,5], -"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,3,200,100,50,20,10,5], -"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,0], +"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1], +"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3], +"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,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)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1], +"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], "LocalTaxRate":19, "ForeignTaxRate":0, "Surcharge":0, diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 6319798..eac5bb1 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -7,6 +7,6 @@ "borough":1, "zone":1, "alias":0, -"location":"Vorplatz 1" +"location":"Lebzeltergasse 4-12" } diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 7c9fee0..37348c9 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -7,24 +7,18 @@ "styl":"align c", "feed":"margin02", "feed":"rim02", -"text":"PARKTICKET", +"text":"Korneuburg", +"feed":"nl" +"feed":"nl" +"text":"Parkschein", +"feed":"nl", +"feed":"nl", "styl":"size 00", -"feed":"nl", -"text":"Bitte gut sichtbar", -"feed":"nl", -"text":"hinter die Scheibe", -"feed":"nl", -"text":"legen", -"feed":"nl", -"feed":"nl", "styl":"align l", -"text":"Ihr Kennzeichen: ", -"feed":"nl", "styl":"size 11", "vari":"Dynamic01", "styl":"size 00", -"feed":"nl", -"text":"Parkende: ", +"text":"Parkzeit bezahlt bis: ", "feed":"nl", "styl":"size 11", "vari":"Dynamic04", diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 007dbda..e12632d 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -3,20 +3,13 @@ "project":"Korneuburg", "Version":"15.11.2023 00001", "issued":"13.11.2023 01.01", -"text":"Standort: ", -"feed":"nl", -"vari":"location", "feed":"nl", "text":"Bezahlt: ", "styl":"size 11", "vari":"Dynamic07", "text":"", "feed":"nl", -"styl":"size 00", -"text":"Gedruckt am: ", -"vari":"wday deu short", -"vari":"date ge", -"vari":"time long" +"styl":"size 00" } diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index 66579c9..45bbd26 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -4,21 +4,19 @@ "Version":"15.11.2023 00001", "feed":"nl", "styl":"size 00", +"text":"Standort: ", +"feed":"nl", +"vari":"location", "text":"Automat: ", "vari":"manu", -"text":"Gruppe: ", -"vari":"group", -"text":"Zone: ", -"vari":"zone", "feed":"nl", -"text":"Ort: ", -"vari":"location", "styl":"align c", -"text":"Korneuburg", +"text":"Bitte gut sichtbar", "feed":"nl", -"text":"Automatentechnik ", +"text":"hinter die Scheibe", +"feed":"nl", +"text":"legen", "feed":"nl", -"text":"Baumann GmbH", "feed":"eject" } diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index 2aa0838..4b9a246 100755 --- a/etc/psa_config/DC2C_print05.json +++ b/etc/psa_config/DC2C_print05.json @@ -7,24 +7,18 @@ "styl":"align c", "feed":"margin02", "feed":"rim02", -"text":"PARKTICKET", +"text":"Korneuburg", +"feed":"nl" +"feed":"nl" +"text":"Parkschein", +"feed":"nl", +"feed":"nl", "styl":"size 00", -"feed":"nl", -"text":"Bitte gut sichtbar", -"feed":"nl", -"text":"hinter die Scheibe", -"feed":"nl", -"text":"legen", -"feed":"nl", -"feed":"nl", "styl":"align l", -"text":"Ihr Kennzeichen: ", -"feed":"nl", "styl":"size 11", "vari":"Dynamic01", "styl":"size 00", -"feed":"nl", -"text":"Parkende: ", +"text":"Parkzeit bezahlt bis: ", "feed":"nl", "styl":"size 11", "vari":"Dynamic04", diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index 935f6bc..7622b92 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -3,20 +3,14 @@ "project":"Korneuburg", "Version":"15.11.2023 00001", "issued":"13.11.2023 01.01", -"text":"Standort: ", -"feed":"nl", -"vari":"location", "feed":"nl", "text":"Bezahlt: ", "styl":"size 11", "vari":"Dynamic07", -"text":"€", +"text":"", "feed":"nl", -"styl":"size 00", -"text":"Gedruckt am: ", -"vari":"wday deu short", -"vari":"date ge", -"vari":"time long" +"styl":"size 00" + } diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index c96d59d..4fc2640 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -4,21 +4,19 @@ "Version":"15.11.2023 00001", "feed":"nl", "styl":"size 00", +"text":"Standort: ", +"feed":"nl", +"vari":"location", "text":"Automat: ", "vari":"manu", -"text":"Gruppe: ", -"vari":"group", -"text":"Zone: ", -"vari":"zone", "feed":"nl", -"text":"Ort: ", -"vari":"location", "styl":"align c", -"text":"Korneuburg", +"text":"Bitte gut sichtbar", "feed":"nl", -"text":"Automatentechnik ", +"text":"hinter die Scheibe", +"feed":"nl", +"text":"legen", "feed":"nl", -"text":"Baumann GmbH", "feed":"eject" } diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json index bdc8844..407bf89 100755 --- a/etc/psa_config/DC2C_print31.json +++ b/etc/psa_config/DC2C_print31.json @@ -15,25 +15,6 @@ "vari":"date ge", "vari":"time long", "feed":"nl", -"text":"KuNu: ", -"vari":"cunu", -"text":"MaNu: ", -"vari":"manu", -"text":"Ort: ", -"vari":"location", -"text":"Gruppe: ", -"vari":"group", -"text":"Zone: ", -"vari":"zone", -"text":"Name: ", -"vari":"alias", -"feed":"nl", -"text":"**Automatentechnik ", -"feed":"nl", -"text":" Baumann GmbH ***", -"feed":"nl", -"text":" * * * * * * * * * ", -"feed":"nl", "feed":"eject" } From c266959586cadf9a8e158c2201a7a0c851fa2c5c Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 16 Jan 2024 08:52:38 +0100 Subject: [PATCH 04/31] base jsonfiles for korneuburg (added line for git) --- etc/psa_config/DC2C_cash.json | 1 - etc/psa_config/DC2C_conf.json | 2 +- etc/psa_config/DC2C_device.json | 1 + etc/psa_config/DC2C_print01.json | 1 + etc/psa_config/DC2C_print02.json | 17 +++-------------- etc/psa_config/DC2C_print03.json | 17 +++-------------- etc/psa_config/DC2C_print04.json | 2 +- etc/psa_config/DC2C_print05.json | 1 + etc/psa_config/DC2C_print06.json | 1 + etc/psa_config/DC2C_print07.json | 1 + etc/psa_config/DC2C_print08.json | 2 +- etc/psa_config/DC2C_print31.json | 1 + etc/psa_config/DC2C_print32.json | 1 + 13 files changed, 16 insertions(+), 32 deletions(-) diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 4da11dc..9636b46 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -14,5 +14,4 @@ "Surcharge":0, "Discount":0 } -#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500], diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index eac5bb1..ff536d5 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -9,4 +9,4 @@ "alias":0, "location":"Lebzeltergasse 4-12" } - +# diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index b28eb68..970e5a2 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -25,3 +25,4 @@ "foreign":1, "refPrint":0 } +# diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 37348c9..805f7cb 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -26,6 +26,7 @@ "styl":"size 00", "feed":"nl" } +# diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index e12632d..0265c11 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -1,4 +1,4 @@ -{ +{ "title":"DC2C_pri02", "project":"Korneuburg", "Version":"15.11.2023 00001", @@ -10,16 +10,5 @@ "text":"", "feed":"nl", "styl":"size 00" -} - - - - - - - - - - - - +} +# diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index 45bbd26..fbd0578 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -1,4 +1,4 @@ -{ +{ "title":"DC2C_pri03", "project":"Korneuburg", "Version":"15.11.2023 00001", @@ -18,16 +18,5 @@ "text":"legen", "feed":"nl", "feed":"eject" -} - - - - - - - - - - - - +} +# diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json index ea36ed5..5d2d6f6 100755 --- a/etc/psa_config/DC2C_print04.json +++ b/etc/psa_config/DC2C_print04.json @@ -3,4 +3,4 @@ "project":"Korneuburg", "Version":"15.11.2023 01.01", "text":""; -} \ No newline at end of file +}# diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index 4b9a246..58a0605 100755 --- a/etc/psa_config/DC2C_print05.json +++ b/etc/psa_config/DC2C_print05.json @@ -38,3 +38,4 @@ +# diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index 7622b92..5a59e2e 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -24,3 +24,4 @@ +# diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index 4fc2640..f07ff99 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -31,3 +31,4 @@ +# diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index e664cda..3956520 100755 --- a/etc/psa_config/DC2C_print08.json +++ b/etc/psa_config/DC2C_print08.json @@ -3,4 +3,4 @@ "project":"Korneuburg", "Version":"15.11.2023 01.01", "text":""; -} \ No newline at end of file +}# diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json index 407bf89..a00c205 100755 --- a/etc/psa_config/DC2C_print31.json +++ b/etc/psa_config/DC2C_print31.json @@ -19,3 +19,4 @@ } +# diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json index 2f1c024..a500236 100755 --- a/etc/psa_config/DC2C_print32.json +++ b/etc/psa_config/DC2C_print32.json @@ -40,3 +40,4 @@ } +# From 1c24d1721e163b0e3718a55641d3ab57feede56a Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 16 Jan 2024 09:57:25 +0100 Subject: [PATCH 05/31] base jsonfiles for korneuburg (added line for git) --- etc/psa_config/DC2C_cash.json | 1 + etc/psa_config/DC2C_device.json | 1 + etc/psa_config/DC2C_print01.json | 1 + etc/psa_config/DC2C_print02.json | 1 + etc/psa_config/DC2C_print03.json | 1 + etc/psa_config/DC2C_print04.json | 1 + etc/psa_config/DC2C_print05.json | 1 + etc/psa_config/DC2C_print06.json | 1 + etc/psa_config/DC2C_print07.json | 1 + etc/psa_config/DC2C_print08.json | 1 + etc/psa_config/DC2C_print31.json | 1 + etc/psa_config/DC2C_print32.json | 1 + 12 files changed, 12 insertions(+) diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 9636b46..4fee2c9 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -15,3 +15,4 @@ "Discount":0 } +# diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index 970e5a2..4b522b4 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -26,3 +26,4 @@ "refPrint":0 } # +# diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 805f7cb..1ec949b 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -39,3 +39,4 @@ +# diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 0265c11..fbf6ecf 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -12,3 +12,4 @@ "styl":"size 00" } # +# diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index fbd0578..0dfee73 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -20,3 +20,4 @@ "feed":"eject" } # +# diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json index 5d2d6f6..487656f 100755 --- a/etc/psa_config/DC2C_print04.json +++ b/etc/psa_config/DC2C_print04.json @@ -4,3 +4,4 @@ "Version":"15.11.2023 01.01", "text":""; }# +# diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index 58a0605..e92ba5c 100755 --- a/etc/psa_config/DC2C_print05.json +++ b/etc/psa_config/DC2C_print05.json @@ -38,4 +38,5 @@ +# # diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index 5a59e2e..8da60c2 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -24,4 +24,5 @@ +# # diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index f07ff99..1bf5961 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -31,4 +31,5 @@ +# # diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index 3956520..673fc43 100755 --- a/etc/psa_config/DC2C_print08.json +++ b/etc/psa_config/DC2C_print08.json @@ -4,3 +4,4 @@ "Version":"15.11.2023 01.01", "text":""; }# +# diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json index a00c205..2f46bf1 100755 --- a/etc/psa_config/DC2C_print31.json +++ b/etc/psa_config/DC2C_print31.json @@ -20,3 +20,4 @@ # +# diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json index a500236..4c0eac8 100755 --- a/etc/psa_config/DC2C_print32.json +++ b/etc/psa_config/DC2C_print32.json @@ -41,3 +41,4 @@ # +# From 3fd6d27eacfe23fb6083cd4058bdd809e3ff7675 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 17 Jan 2024 17:11:27 +0100 Subject: [PATCH 06/31] Change dc-json-files for testing --- etc/psa_config/DC2C_cash.json | 1 + etc/psa_config/DC2C_conf.json | 1 + etc/psa_config/DC2C_device.json | 1 + etc/psa_config/DC2C_print01.json | 1 + etc/psa_config/DC2C_print02.json | 1 + etc/psa_config/DC2C_print03.json | 1 + etc/psa_config/DC2C_print04.json | 1 + etc/psa_config/DC2C_print05.json | 1 + etc/psa_config/DC2C_print06.json | 1 + etc/psa_config/DC2C_print07.json | 1 + etc/psa_config/DC2C_print08.json | 1 + etc/psa_config/DC2C_print31.json | 1 + etc/psa_config/DC2C_print32.json | 1 + 13 files changed, 13 insertions(+) diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 4fee2c9..1ece8cc 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -16,3 +16,4 @@ } # +# diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index ff536d5..4d7da4d 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -10,3 +10,4 @@ "location":"Lebzeltergasse 4-12" } # +# diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index 4b522b4..8f1174e 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -27,3 +27,4 @@ } # # +# diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 1ec949b..75a5c32 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -39,4 +39,5 @@ +# # diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index fbf6ecf..0a650c9 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -13,3 +13,4 @@ } # # +# diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index 0dfee73..f30d9a4 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -21,3 +21,4 @@ } # # +# diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json index 487656f..60329d8 100755 --- a/etc/psa_config/DC2C_print04.json +++ b/etc/psa_config/DC2C_print04.json @@ -5,3 +5,4 @@ "text":""; }# # +# diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index e92ba5c..b9b7281 100755 --- a/etc/psa_config/DC2C_print05.json +++ b/etc/psa_config/DC2C_print05.json @@ -38,5 +38,6 @@ +# # # diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index 8da60c2..9302f75 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -24,5 +24,6 @@ +# # # diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index 1bf5961..9939fab 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -31,5 +31,6 @@ +# # # diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index 673fc43..9dfb910 100755 --- a/etc/psa_config/DC2C_print08.json +++ b/etc/psa_config/DC2C_print08.json @@ -5,3 +5,4 @@ "text":""; }# # +# diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json index 2f46bf1..bfe8a0f 100755 --- a/etc/psa_config/DC2C_print31.json +++ b/etc/psa_config/DC2C_print31.json @@ -21,3 +21,4 @@ # # +# diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json index 4c0eac8..34969cb 100755 --- a/etc/psa_config/DC2C_print32.json +++ b/etc/psa_config/DC2C_print32.json @@ -42,3 +42,4 @@ # # +# From 2d911758ee9ffbde44888735a1cb7c118a27e3f9 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 17 Jan 2024 17:42:55 +0100 Subject: [PATCH 07/31] machNum=8, location: Hauptplatz 39 Gericht --- etc/psa_config/DC2C_conf.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 4d7da4d..130809e 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,11 +3,11 @@ "project":"Korneuburg", "version":"15.11.2023 00001", "custNum":714, -"machNum":1000, +"machNum":8, "borough":1, "zone":1, "alias":0, -"location":"Lebzeltergasse 4-12" +"location":"Hauptplatz 39 Gericht" } # # From 71add54bf2c37f9c396ad7d9b63a3f1ab6e7e800 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Sat, 2 Mar 2024 13:03:14 +0100 Subject: [PATCH 08/31] opkg: only install atb-dc-libraries --- etc/psa_update/opkg_commands | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 807f1f1..967b8e7 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -8,10 +8,11 @@ opkg update opkg install prepare-update opkg install atbupdatetool opkg install mxt-touch-reset +opkg install atb-dc-libraries # opkg remove atb-accountingtool # opkg install atb-accountingtool -opkg --cache /var/cache/opkg --download-only upgrade -opkg --cache /var/cache/opkg upgrade +#opkg --cache /var/cache/opkg --download-only upgrade +#opkg --cache /var/cache/opkg upgrade # opkg remove apism # opkg install apism opkg info apism From b415712c0c32852bec03ef48807b5d43ff3d54cd Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 6 Mar 2024 10:18:44 +0100 Subject: [PATCH 09/31] Add SystemControl.ini -> reboot at 0, 7, 13 --- etc/atb/SystemControl.ini | 85 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 etc/atb/SystemControl.ini diff --git a/etc/atb/SystemControl.ini b/etc/atb/SystemControl.ini new file mode 100644 index 0000000..e8b9624 --- /dev/null +++ b/etc/atb/SystemControl.ini @@ -0,0 +1,85 @@ +[AT_TASKS] +1\arguments=restart, atbapp +1\envs= +1\hourOfDay=4 +1\id=ATBAPP_RESTART +1\program=/bin/systemctl +2\arguments=restart, apism +2\envs= +2\hourOfDay=4 +2\id=APISM_RESTART +2\program=/bin/systemctl +3\arguments=start, atbupdatetool +3\envs= +3\hourOfDay=1 +3\id=PTU5UPDATE +3\program=/bin/systemctl + +4\arguments= +4\envs= +4\hourOfDay=0 +4\id=REBOOT_0 +4\program=/sbin/reboot + +5\arguments= +5\envs= +5\hourOfDay=7 +5\id=REBOOT_7 +5\program=/sbin/reboot + +6\arguments= +6\envs= +6\hourOfDay=13 +6\id=REBOOT_13 +6\program=/sbin/reboot + +size=6 + +[BACKLIGHT] +SensorMax=3500 +SensorMin=0 +curve=1 +dimLowValue=499 +dimMax=100 +dimMin=20 +inputBrightness=499 + +[COMMON] +startBacklightController=true +startMQTTController=false +startMonitoringController=false +startSuspendController=false + +[MONITORING] +http_dataFormat=HTTP +http_host=127.0.0.1 +http_ignoreSslErrors=on +http_port=5000 +http_protocol=http +http_service= +monitoring_heartbeatInterval=60 +protocol=mqtt +useDeviceId=on +useRingbuffer=on + +[MQTT] +mqtt_QoS=0 +mqtt_TopicDeviceType=MP +mqtt_TopicPrefix=ATB +mqtt_TopicScheme=ATB_ISMAS +mqtt_debug=on +mqtt_host=mqtt2.atb-comm.de +mqtt_password=xyz123 +mqtt_port=8883 +mqtt_useSsl=on +mqtt_username=testuser + +[NETWORKCHECK] +PingHost=google.com +networkRestart=/sbin/ifup -a +setOOO=off +useNetworkCheck=on + +[SUSPEND] +program=/home/root/system_powerdown_wakeup.sh +suspendLoopTimerValue=8 From 1043aa004055fa4db4af7b480c53534a19058b4b Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 6 Mar 2024 13:32:10 +0100 Subject: [PATCH 10/31] PTU5SystemController: switch on monitoring --- etc/atb/SystemControl.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/atb/SystemControl.ini b/etc/atb/SystemControl.ini index e8b9624..d407b9a 100644 --- a/etc/atb/SystemControl.ini +++ b/etc/atb/SystemControl.ini @@ -46,8 +46,8 @@ inputBrightness=499 [COMMON] startBacklightController=true -startMQTTController=false -startMonitoringController=false +startMQTTController=true +startMonitoringController=true startSuspendController=false [MONITORING] From 1e120dca551d0edc3648dc60d038e9d18d68fa48 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 6 Mar 2024 15:13:59 +0100 Subject: [PATCH 11/31] Revert making reeboots! --- etc/atb/SystemControl.ini | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/etc/atb/SystemControl.ini b/etc/atb/SystemControl.ini index d407b9a..7dfd03e 100644 --- a/etc/atb/SystemControl.ini +++ b/etc/atb/SystemControl.ini @@ -15,25 +15,25 @@ 3\id=PTU5UPDATE 3\program=/bin/systemctl -4\arguments= -4\envs= -4\hourOfDay=0 -4\id=REBOOT_0 -4\program=/sbin/reboot +#4\arguments= +#4\envs= +#4\hourOfDay=0 +#4\id=REBOOT_0 +#4\program=/sbin/reboot -5\arguments= -5\envs= -5\hourOfDay=7 -5\id=REBOOT_7 -5\program=/sbin/reboot +#5\arguments= +#5\envs= +#5\hourOfDay=7 +#5\id=REBOOT_7 +#5\program=/sbin/reboot -6\arguments= -6\envs= -6\hourOfDay=13 -6\id=REBOOT_13 -6\program=/sbin/reboot +#6\arguments= +#6\envs= +#6\hourOfDay=13 +#6\id=REBOOT_13 +#6\program=/sbin/reboot -size=6 +size=3 [BACKLIGHT] SensorMax=3500 From 5f401b0de93a25d9033104054d46484c880c69dd Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 7 Mar 2024 08:15:27 +0100 Subject: [PATCH 12/31] Add price per hour (to be compatible with Kirchdorf) --- etc/psa_tariff/tariff01.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index 1d7fed4..9bc319e 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -49,6 +49,11 @@ "pra_payment_option_id": 1049, "pra_payment_unit_id": 1, "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 2, + "pra_price": 120 } ], "Duration": [ From dae9f92f7d1080843d0a15702e536b544831e9be Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Thu, 7 Mar 2024 10:00:38 +0100 Subject: [PATCH 13/31] Update ptu5-systemcontroller (modem re-enable) --- 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 967b8e7..fe70550 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -9,6 +9,7 @@ opkg install prepare-update opkg install atbupdatetool opkg install mxt-touch-reset opkg install atb-dc-libraries +opkg install ptu5-systemcontroller # opkg remove atb-accountingtool # opkg install atb-accountingtool #opkg --cache /var/cache/opkg --download-only upgrade From 0dbd7a5796d0e0f4063242a4b1b77d79fd2ff2a0 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Thu, 7 Mar 2024 12:05:49 +0100 Subject: [PATCH 14/31] Install atb-modemtools --- 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 fe70550..ca713f9 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -10,6 +10,7 @@ opkg install atbupdatetool opkg install mxt-touch-reset opkg install atb-dc-libraries opkg install ptu5-systemcontroller +opkg install atb-modemtools # opkg remove atb-accountingtool # opkg install atb-accountingtool #opkg --cache /var/cache/opkg --download-only upgrade From 5d7592a98d864ea5402e6e2d95867e7f6a704d52 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 13 Mar 2024 10:24:33 +0100 Subject: [PATCH 15/31] Turn off 5-cent coin --- 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 1ece8cc..77940f1 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -4,7 +4,7 @@ "version":"15.10.2023 14:55 02.00.06", "CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1], "CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3], -"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0], +"CoinAccept(15..0)":[1,1,1,1,1,0,1,1,1,1,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], From 952651eb5644e006b5a568a86b302dc13172f73e Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 13 Mar 2024 16:55:28 +0100 Subject: [PATCH 16/31] Add atbapp-configuration --- etc/atbapp/ATBAPP.ini | 102 ++ etc/atbapp/states/APP_States.xml | 217 +++ etc/atbapp/text/HMI_Texte.xml | 2585 ++++++++++++++++++++++++++++++ 3 files changed, 2904 insertions(+) create mode 100644 etc/atbapp/ATBAPP.ini create mode 100644 etc/atbapp/states/APP_States.xml create mode 100644 etc/atbapp/text/HMI_Texte.xml diff --git a/etc/atbapp/ATBAPP.ini b/etc/atbapp/ATBAPP.ini new file mode 100644 index 0000000..464fc38 --- /dev/null +++ b/etc/atbapp/ATBAPP.ini @@ -0,0 +1,102 @@ +[COMMON] +com_port_name=/dev/ttyS2 +com_baud_rate=9600 +lang1=de_AT +lang2=en_GB +lang3=it_IT +lang4=de_DE + +defaultLanguage=1 + +CharacterSet="ISO 8859-15" + +#useLanguage=[128+][64+][32+][16] +useLanguage=192 +#usePayment=[128+][64+][32+][16] +usePayment=96 +#useVehicle=[128+][64+][32+][16] +useVehicle=192 +useProduct=192 + +showInfoButton=false +showHelpButton=false + +textfile=/opt/app/ATBAPP/text/HMI_Texte.xml +logfile=/var/log/atbqt.log +alternativeLogoFile= +#alternativeLogoFile= + +feature_Log=off +feature_TouchFeedback=off +feature_StartButton=on +feature_selfOOO=off +feature_ShowParkingTime=off + +touch_feedback_gpio=121 +touch_feedback_on_value=1 +touch_feedback_off_value=0 + +#ooo_mode={useDisk|otherMachine} +ooo_mode=useDisk +sellTimeout_time=60 + + +useAppStates=1 +statefile=/opt/app/ATBAPP/states/APP_States.xml + +[SCREENCONFIG] +sc_31="0,1,0" +sc_33="1,0,1" +sc_3F="1,0,0" +sc_40="1,0,1" +sc_41="1,0,1" +sc_44="1,0,1" +sc_35="0,0,0" +sc_51="1,0,1" +sc_52="1,0,0" +sc_53="1,0,0" + + +[PLUGINS] +CCPlugin=TCP_ZVT_CCPlugin +CalculatePricePlugin=MOBILISIS_CalculatePricePlugin +DeviceControllerPlugin=ATBDeviceControllerPlugin + +[TCP_CONTROL] +enable=0 + +[PAYMENT] +currencySymbol=€ +currencyISOCode=EUR +cashVariant=Coins +paymentPointInTime=poa +useDecimal=yes + +[MOBILISIS_CalculatePricePlugin] +useDebug=1 +tariffFileName=/etc/psa_tariff/tariff01.json + +[ATBDeviceControllerPlugin] +serialPort=ttymxc2 +printerEncoding="Windows-1252" + +[IngenicoZVT_CCPlugin] +debug=1 +PortName=/dev/ttyS3 +ZVT=AT +sleep=0 +CurrencyCode=EUR +dcHours="0" + +[TCP_ZVT_CCPlugin] +CurrencyCode=EUR +debug=1 +IP=192.168.6.242 +Port=22000 +SSL=0 +ZVT=DE +sleep=1 +printIntermediateStatus=1 +Password=835322 +NumberOfChars=37 +dcHours="0" diff --git a/etc/atbapp/states/APP_States.xml b/etc/atbapp/states/APP_States.xml new file mode 100644 index 0000000..b00a237 --- /dev/null +++ b/etc/atbapp/states/APP_States.xml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/atbapp/text/HMI_Texte.xml b/etc/atbapp/text/HMI_Texte.xml new file mode 100644 index 0000000..c95b196 --- /dev/null +++ b/etc/atbapp/text/HMI_Texte.xml @@ -0,0 +1,2585 @@ + + + + + + + + + + + + + + + + + + + Ticket anfordern + Request Ticket + Demander un billet + Ticket anfordern + Richiedi un biglietto + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + INDIETRO + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + + + + + + + + Son + Sun + Dim + Son + Dom + + + Mon + Mon + Lun + Mon + Lun + + + Die + Tue + Mar + Die + Mar + + + Mit + Wed + Mer + Mit + Mer + + + Don + Thu + Jeu + Don + Gio + + + Fre + Fri + Ven + Fre + Ven + + + Sam + Sat + Sam + Sam + Sab + + + + + Herzlich Willkommen + Payment required + Paiment S.V.P. + Bitte bezahlen + Pagamenti possibili + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Automatennummer: + Automatennummer: + Machine number: + Numéro machine: + Parcometro n°: + + + + + + + + + + + + + + + + + Start + Start + Start + Start + Start + + + + + + + + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + AUTOMAT WECHSELT + AUTOMAT WECHSELT + MACHINE GIVES CHANGE + L'HORODATEUR REND LA MONNAIE + SCAMBIO AUTOMATICO + + + FREI PARKEN + FREE PARKING + GARER GRATUIT + FREI PARKEN + PARCHEGGIO GRATUIT + + + + + Kennzeichen: + License plate: + + Kennzeichen: + + + + + + + + + + + + + + + + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + + + + + + + + + + Münzen einwerfen… + Insert coins… + Pièces d'insertion… + Münzen einwerfen… + Inserire le monete… + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bitte Parkzeit vorwählen… + Please select parking time… + Sélectionner la durée de stationnement… + Bitte Parkzeit vorwählen… + Selezioni il tempo di sosta… + + + Parkzeit vorwählen + Select time + Sélectionnez l'heure + Parkzeit vorwählen + Selezionare un tempo + + + Gratisticket 2h + Gratisticket 2h + Free ticket 2h + Billet gratuit 2h + Biglietto gratuito 2h + + + 1 Tag + 1 day + 1 jour + 1 Tag + 1 giorno + + + 1 Tag + 1 day + 1 jour + 1 Tag + 1 giorno + + + 1 Tag + 1 day + 1 jour + 1 Tag + 1 giorno + + + 1 Tag + 1 day + 1 jour + 1 Tag + 1 giorno + + + + + + + + + + + + + + + + + + + + + + + + Parkzeitende: + Parkzeitende: + Park. time ends: + Heure de fin: + Fine sosta: + + + Zu bezahlen: + Zu bezahlen: + Amount to pay: + à payer: + Da pagare: + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + INDIETRO + + + MEHR ZAHLEN… + MEHR ZAHLEN… + PAY MORE… + PAYER PLUS… + PIÙ PAGARE… + + + HÖCHSTPARKDAUER ERREICHT + HÖCHSTPARKDAUER ERREICHT + MAX. TICKET AMOUNT + MAXIMUM + TEMPO MASSIMO DI PARCHEGGIO + + + MINDESTPARKGEBÜHR + MINDESTPARKGEBÜHR + MINIMUM PARKING FEE + MINIMUM + TARIFFA MINIMA DI PARCHEGGIO + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + CON I SOLDI ESATTA + + + + + Bitte Parkzeit vorwählen… + Please select parking time… + Sélectionner la durée de stationnement… + Bitte Parkzeit vorwählen… + Selezioni il tempo di sosta… + + + Parkzeit vorwählen + Select time + Sélectionnez l'heure + Parkzeit vorwählen + + + + Tagesticket + Dayticket + Billet journée + Tagesticket + + + + 1,0 € + 1,0 € + 1,0 € + 1,0 € + + + + 1,0 € + 1,0 € + 1,0 € + 1,0 € + + + + 0,1 € + 0,1 € + 0,1 € + 0,1 € + + + + 0,1 € + 0,1 € + 0,1 € + 0,1 € + + + + + + + + + + + + + + + + + + + + + + + + + Parkzeitende: + Parkzeitende: + Park. time ends: + Heure de fin: + Fine sosta: + + + Zu bezahlen: + Zu bezahlen: + Amount to pay: + à payer: + Da pagare: + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + + + + MEHR ZAHLEN… + MEHR ZAHLEN… + PAY MORE… + PAYER PLUS… + + + + HÖCHSTPARKDAUER ERREICHT + HÖCHSTPARKDAUER ERREICHT + MAX. TICKET AMOUNT + MAXIMUM + TEMPO MASSIMO DI PARCHEGGIO + + + MINDESTPARKGEBÜHR + MINDESTPARKGEBÜHR + MINIMUM PARKING FEE + MINIMUM + TARIFFA MINIMA DI PARCHEGGIO + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + + + Folgen Sie den Anweisungen auf dem PIN-Pad. + Follow the instructions on the PIN pad. + Suivez les instructions sur le clavier NIP. + Folgen Sie den Anweisungen auf dem PIN-Pad. + Seguire le istruzioni del PIN pad. + + + + + Bezahlung OK, warten Sie auf das Ticket… + Bezahlung OK, warten Sie auf das Ticket… + Payment OK, wait for ticket… + Paiement OK, attendez que le billet… + Stampa in corso… ritirare il biglietto! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bitte warten… + Bitte warten… + Please wait… + Attendez svp… + Si prega di attendere… + + + Kundenbeleg wird gedruckt… + Kundenbeleg wird gedruckt… + Printing customer receipt… + Imprimer le reçu du client… + Stampa della ricevuta + + + + + Ticket entnehmen. + Ticket entnehmen. + Take your ticket. + Prenez billet. + Prendere Biglietto. + + + Vielen Dank, auf Wiedersehen. + Vielen Dank, auf Wiedersehen. + Thank you, goodbye. + Merci, au revoir. + Grazie, arrivederci. + + + + + Bitte Parkzeit vorwählen… + Please select parking time… + Sélectionner la durée de stationnement… + Bitte Parkzeit vorwählen… + + + + Parkzeit vorwählen + Select time + Sélectionnez l'heure + Parkzeit vorwählen + + + + Tagesticket + Dayticket + Billet journée + Tagesticket + + + + 1,5 € + 1,5 € + 1,5 € + 1,5 € + + + + 1,5 € + 1,5 € + 1,5 € + 1,5 € + + + + 0,1 € + 0,1 € + 0,1 € + 0,1 € + + + + 0,1 € + 0,1 € + 0,1 € + 0,1 € + + + + + + + + + + + + + + + + + + + + + + + + + Parkzeitende: + Parkzeitende: + Park. time ends: + Heure de fin: + Fine sosta: + + + Zu bezahlen: + Zu bezahlen: + Amount to pay: + à payer: + Importo: + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + + + + MEHR ZAHLEN… + MEHR ZAHLEN… + PAY MORE… + PAYER PLUS… + + + + HÖCHSTPARKDAUER ERREICHT + HÖCHSTPARKDAUER ERREICHT + MAX. TICKET AMOUNT + MAXIMUM + TEMPO MASSIMO DI PARCHEGGIO + + + MINDESTPARKGEBÜHR + MINDESTPARKGEBÜHR + MINIMUM PARKING FEE + MINIMUM + TARIFFA MINIMA DI PARCHEGGIO + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + + + Bitte Geld entnehmen… + Bitte Geld entnehmen… + Please take change… + Prendre le changement… + Ritirare le monete… + + + + + Überbezahlt, bitte Geld entnehmen… + Überbezahlt, Bitte Geld entnehmen… + Overpaid, please take change… + Surpayé, prendre le changement… + Pagamento eccessivo, ritirare le monete… + + + + + + + Registrierung war erfolgreich. + Registration was successful. + + Registrierung war erfolgreich. + + + + Ein Ticket wird nicht benötigt. + A ticket is not required. + + Ein Ticket wird nicht benötigt. + + + + Auf Wiedersehen! + Goodbye! + Au revoir! + Auf Wiedersehen! + + + + + + Parkzeitende: + Parkzeitende: + Park. time ends: + Heure de fin: + Fine sosta: + + + + + + + + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + + + + + + + + Parkschein anfordern? + Parkschein anfordern? + Request Ticket? + Demande billet? + Richiesta biglietto. + + + NEIN + NEIN + NO + NON + NO + + + JA + JA + YES + OUI + SI + + + Überbezahlt! + Überbezahlt! + Overpaid! + trop-percu! + Pagamento in eccesso! + + + Überbezahlt + Überbezahlt + Overpaid + trop-percu + Pagamento in eccesso! + + + Maximalanzahl der Münzen erreicht! + Maximalanzahl der Münzen erreicht! + Reached maximum number of coins! + + + + + MINDESTPARKGEBÜHR + MINDESTPARKGEBÜHR + MINIMUM PARKING FEE + MINIMUM + TARIFFA MINIMA DI PARCHEGGIO + + + + + Parkende: + End of Parking time: + Fin du temps: + Parkende: + Fine sosta: + + + + + + + + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + + + + + + + + Parkschein anfordern? + Request Ticket? + Demande billet? + Parkschein anfordern? + + + + NEIN + NEIN + NO + NON + + + + JA + JA + YES + OUI + + + + Überbezahlt! + Überbezahlt! + Overpaid! + trop-percu! + + + + Überbezahlt! + Überbezahlt! + Overpaid! + trop-percu! + + + + Maximalanzahl der Münzen erreicht! + Maximalanzahl der Münzen erreicht! + Reached maximum number of coins! + + + + + MINDESTPARKGEBÜHR + MINDESTPARKGEBÜHR + MINIMUM PARKING FEE + MINIMUM + TARIFFA MINIMA DI PARCHEGGIO + + + + + Frei parken + Free parking + Garer gratuit + Frei parken + Parcheggio gratuito + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + AUTOMAT WECHSELT + AUTOMAT WECHSELT + MACHINE GIVES CHANGE + L'HORODATEUR REND LA MONNAIE + SCAMBIO AUTOMATICO + + + FREI PARKEN + FREE PARKING + GARER GRATUIT + FREI PARKEN + PARCHEGGIO GRATUITO + + + + + Bitte wählen sie den Tarif… + Please, choose tariff… + Sélectionnez le tarif… + Bitte wählen sie den Tarif… + Prego selezionare la tariffa… + + + PKW + CAR + VOITURE + PKW + AUTO + + + BUS / LKW + BUS / TRUCK + BUS / CAMION + BUS / LKW + BUS / AUTOCARRI + + + + + + + + + + + + + + + + + 3 Tageskarte + 3 days ticket + Trois jours + 3 Tageskarte + Tre giorni + + + Wochenkarte + Week ticket + Billet de semaine + Wochenkarte + + + + BUS + BUS + BUS + BUS + BUS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bitte wählen sie den Tarif… + Please, choose tariff… + Sélectionnez le tarif… + Bitte wählen sie den Tarif… + Prego selezionare la tariffa… + + + PKW + Car + Voiture + PKW + Autovetture + + + Camper + Camper + Campeur + Camper + Camper + + + + + + + + + + + + + + + + + 3 Tageskarte + 3 days ticket + Trois jours + 3 Tageskarte + Tre giorni + + + Wochenkarte + Week ticket + Billet de semaine + Wochenkarte + Biglietto settimanale + + + BUS + BUS + BUS + BUS + BUS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bitte wählen sie den Tarif… + Please, choose tariff… + Sélectionnez le tarif… + Bitte wählen sie den Tarif… + Seleziona la tariffa… + + + Stundenvorwahl + Preselect hours + Présélectionnez les heures + Stundenvorwahl + + + + Tageskarte + Day ticket + Billet d'une journée + Tageskarte + + + + + + + + + + + + + + + + + + 3 Tageskarte + 3 days ticket + Trois jours + 3 Tageskarte + + + + Wochenkarte + Week ticket + Billet de semaine + Wochenkarte + + + + BUS + BUS + BUS + BUS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bitte Zahlart wählen + Please select a payment method + Sélectionner un mode de paiement + Bitte Zahlart wählen + Selezioni il tipo di pagamento + + + Parkende: + End of Parking time: + Fin du temps: + Parkende: + Fine sosta: + + + + + + + + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + + + + + + + + + + + + + + + Barzahlung + Barzahlung + Cash + en espèces + Contanti + + + Kartenzahlung + Kartenzahlung + Card + Carte + Con Carta + + + Frei Parken 2h + Frei Parken 2h + Free parking 2h + Parking gratuit 2h + Parcheggio gratuito 2h + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + INDIETRO + + + + + Bitte Bezahlen: + Bitte Bezahlen: + Please Pay: + Payer: + Prego inserire monete: + + + Parkende: + End of Parking time: + Fin du temps: + Parkende: + Fine sosta: + + + + + + + + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + MEHR ZAHLEN… + MEHR ZAHLEN… + PAY MORE… + PAYER PLUS… + + + + HÖCHSTPARKDAUER ERREICHT + HÖCHSTPARKDAUER ERREICHT + MAX. TICKET AMOUNT + MAXIMUM + TEMPO MASSIMO DI PARCHEGGIO + + + MINDESTPARKGEBÜHR + MINDESTPARKGEBÜHR + MINIMUM PARKING FEE + MINIMUM + TARIFFA MINIMA DI PARCHEGGIO + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + + + Bitte Bezahlen: + Bitte Bezahlen: + Please Pay: + Payer: + Prego inserire monete: + + + Parkende: + End of Parking time: + Fin du temps: + Parkende: + Fine sosta: + + + + + + + + + + Betrag: + Betrag: + Amount: + Montant: + Da pagare: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + INDIETRO + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + MEHR ZAHLEN… + MEHR ZAHLEN + PAY MORE… + PAYER PLUS… + PIÙ PAGARE + + + HÖCHSTPARKDAUER ERREICHT + HÖCHSTPARKDAUER ERREICHT + MAX. TICKET AMOUNT + MAXIMUM + TEMPO MASSIMO DI PARCHEGGIO + + + MINDESTPARKGEBÜHR + MINDESTPARKGEBÜHR + MINIMUM PARKING FEE + MINIMUM + TARIFFA MINIMA DI PARCHEGGIO + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + + + Bitte Bezahlen: + Bitte Bezahlen: + Please Pay: + Payer: + Prego inserire monete: + + + + + + + + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + + + + + + + + + + + + + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + MEHR ZAHLEN… + MEHR ZAHLEN… + PAY MORE… + PAYER PLUS… + + + + HÖCHSTPARKDAUER ERREICHT + HÖCHSTPARKDAUER ERREICHT + MAX. TICKET AMOUNT + MAXIMUM + TEMPO MASSIMO DI PARCHEGGIO + + + MINDESTPARKGEBÜHR + MINDESTPARKGEBÜHR + MINIMUM PARKING FEE + MINIMUM + TARIFFA MINIMA DI PARCHEGGIO + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + + + Karte: Anzeige Guthaben + Card: Display credits + Carte: Afficher crédit + Karte: Anzeige Guthaben + + + + Freiparkzeit: + Free parking time: + Temps libre: + Freiparkzeit: + + + + Punktestand: + Score: + Score: + Punktestand: + + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + + + Bitte Bezahlen: + Bitte Bezahlen: + Please Pay: + Payer: + Prego inserire monete: + + + + + + + + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + MEHR ZAHLEN… + MEHR ZAHLEN… + PAY MORE… + PAYER PLUS… + + + + HÖCHSTPARKDAUER ERREICHT + HÖCHSTPARKDAUER ERREICHT + MAX. TICKET AMOUNT + MAXIMUM + TEMPO MASSIMO DI PARCHEGGIO + + + MINDESTPARKGEBÜHR + MINDESTPARKGEBÜHR + MINIMUM PARKING FEE + MINIMUM + TARIFFA MINIMA DI PARCHEGGIO + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + + + Bitte Münzen einwerfen + Please insert coins + Insérer des pièces + Bitte Münzen einwerfen + Inserire le monete + + + Parkende: + End of Parking time: + Fin du temps: + Parkende: + Fine sosta: + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + Angerechnete Freiparkzeit: + Credited free parking time: + Crédité temps de stationnement gratuit: + Angerechnete Freiparkzeit: + + + + Angerechnete Punkte: + Credited points: + Points crédités + Angerechnete Punkte: + + + + + + + + + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + + + + Falsche Karte! + Wrong card! + Mauvaise carte! + Falsche Karte! + + + + Kein Guthaben! + No credit! + Aucun crédit! + Kein Guthaben! + + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + + + Karte - Kein Guthaben! + Card - No credit! + Carte - Aucun crédit! + Karte - Kein Guthaben! + + + + Parkende: + End of Parking time: + Fin du temps: + Parkende: + Fine sosta: + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + Angerechnete Freiparkzeit: + Credited free parking time: + Crédité temps de stationnement gratuit: + Angerechnete Freiparkzeit: + + + + Angerechnete Punkte: + Credited points: + Points crédités + Angerechnete Punkte: + + + + Kein Guthaben! + No credit! + Aucun crédit! + Kein Guthaben! + + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + + + + Falsche Karte! + Wrong card! + Mauvaise carte! + Falsche Karte! + + + + Kein Guthaben! + No credit! + Aucun crédit! + Kein Guthaben! + + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + + + Abbruch durch Kartenterminal! + Abbruch durch Kartenterminal! + Abort by card terminal! + Arrêt terminal de carte! + Operazione interrotta! + + + + + Bitte Münzen einwerfen + Please insert coins + Insérer des pièces + Bitte Münzen einwerfen + Inserire le monete + + + Parkende: + End of Parking time: + Fin du temps: + Parkende: + Fine sosta: + + + + + + + + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + + + + Falsche Karte! + Wrong card! + Mauvaise carte! + Falsche Karte! + + + + Kein Guthaben! + No credit! + Aucun crédit! + Kein Guthaben! + + + + BITTE PASSEND ZAHLEN + BITTE PASSEND ZAHLEN + PLEASE, PAY APPROPRIATELY + SVP PAYEZ APPROPRIE + SIETE PREGATI DI PAGARE L'IMPORTO ESATTO + + + + + Kartenzahlung fehlgeschlagen! + Kartenzahlung fehlgeschlagen! + Cardpayment failed! + ... + + + + + + Druck fehlgeschlagen! + Druck fehlgeschlagen! + Printing failed! + L'impression a échoué! + La stampa non è riuscita! + + + + + Karte vorhalten... + Present card + Présenter une carte + Karte vorhalten... + Inserisca o avvicini la carta + + + Parkzeit: + Parkzeit: + Park. time ends: + Heure de fin: + Fine sosta: + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + INDIETRO + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + Bitte Anzeige im Karten-Terminal beachten! + Please note the terminal display! + Veuillez suivre les instructions sul l'affichage du terminal de la carte. + Bitte Anzeige im Karten-Terminal beachten! + Prego seguire le istruzioni sul display del terminale carte. + + + Falsche Karte! + Wrong card! + Mauvaise carte! + Falsche Karte! + Carta sbagliata! + + + Zu wenig Guthaben + Zu wenig Guthaben + Insufficient credit + Crédit insuffisant + + + + Fehler Kartenleser + Fehler Kartenleser + Reader error + Erreur de lecteur de carte + + + + Warte auf Kartenterminal… + Warte auf Kartenterminal… + Waiting for card reader… + En attendant le terminal de carte… + Aspettando il terminale della carta… + + + + + Karte vorhalten... + Present card + Présenter une carte + Karte vorhalten... + + + + Parkzeitende: + Parkzeitende: + Park. time ends: + Heure de fin: + Fine sosta: + + + Betrag: + Betrag: + Amount: + Montant: + Importo: + + + ABBRUCH + ABBRUCH + CANCEL + ANNULER + ANNULLA + + + ZURÜCK + ZURÜCK + BACK + ARRIÈRE + + + + WEITER + WEITER + NEXT + PLUS + AVANTI + + + Falsche Karte! + Wrong card! + Mauvaise carte! + Falsche Karte! + + + + Zu wenig Guthaben + Insufficient credit + Crédit insuffisant + Zu wenig Guthaben + + + + Fehler Kartenleser + Reader error + Erreur de lecteur de carte + Fehler Kartenleser + + + + + + Dieser Automat ist vorübergehend außer Betrieb. + This machine is temporary out of service. + Cette machine est hors service temporaire. + Dieser Automat ist vorübergehend außer Betrieb. + Questa macchina è temporaneamente fuori servizio. + + + Bitte Parkscheibe einlegen. + Please use parking disc. + Utilisez disque de stationnement. + Bitte Parkscheibe einlegen. + Prego esporre il disco orario. + + + + + + + + + + Wir bitten um Entschuldigung. + We apologize for the inconvenience. + Nous sommes désolés. + Wir bitten um Entschuldigung. + Siamo spiacenti. + + + + + + + + + + Bitte Parkscheibe einlegen. + Please use parking disc. + Utilisez disque de stationnement. + Bitte Parkscheibe einlegen. + Prego esporre il disco orario. + + + Bitte benutzen Sie einen anderen Automaten. + Please use another vending machine. + Utilisez disque de stationnement. + Bitte benutzen Sie einen anderen Automaten. + Si prega di utilizzare un'altra macchina. + + + + + + + SERVICE_DOOR_OPENED + + + + + + Bitte Münzkasse entnehmen + Please remove coinbox + VAULT_DOOR_OPENED + VAULT_DOOR_OPENED + VAULT_DOOR_OPENED + + + Bitte Münzkasse wieder einstecken + Please insert coinbox + COIN_BOX_REMOVED + COIN_BOX_REMOVED + COIN_BOX_REMOVED + + + Bitte Kassentüre schließen + Please close vault door + COIN_BOX_INSERTED + COIN_BOX_INSERTED + COIN_BOX_INSERTED + + + + + + + + + + + + + + + + + + From 45cd6b95c8ad999922d3529d162eb8d999aeb814 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Thu, 14 Mar 2024 11:35:59 +0100 Subject: [PATCH 17/31] DeviceController: switch on mifare with reed-contact --- etc/psa_config/DC2C_device.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index 8f1174e..53f21cc 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -4,7 +4,7 @@ "Version":"04.12.2023 00103", "printer":1, "coinChk":1, -"mifRd":1, +"mifRd":2, "solarPwr":0, "modem":1, "creditCard":1, From 9d7ad67a3cfe71f259fb841c494ba0a450e85913 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Thu, 14 Mar 2024 14:02:01 +0100 Subject: [PATCH 18/31] ATBAPP: ooo-mode is "use other machine" --- etc/atbapp/ATBAPP.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/atbapp/ATBAPP.ini b/etc/atbapp/ATBAPP.ini index 464fc38..8ee0043 100644 --- a/etc/atbapp/ATBAPP.ini +++ b/etc/atbapp/ATBAPP.ini @@ -37,7 +37,7 @@ touch_feedback_on_value=1 touch_feedback_off_value=0 #ooo_mode={useDisk|otherMachine} -ooo_mode=useDisk +ooo_mode=otherMachine sellTimeout_time=60 From 5a5adeaa748f8da86504515659fcd5141217b006 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Fri, 15 Mar 2024 07:40:24 +0100 Subject: [PATCH 19/31] DC: shutter: automatic start coin acceptance --- etc/psa_config/DC2C_device.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index 53f21cc..84d9909 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -10,7 +10,7 @@ "creditCard":1, "escrow":1, "RejMotor":0, -"shutter":1, +"shutter":2, "billRd":0, "vaultLock":0, "autoAlarm":1, From a370cab7a0ed007a680d500d37ae83d38d85a524 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Fri, 15 Mar 2024 14:23:23 +0100 Subject: [PATCH 20/31] DC: shutter: do not automatic start coin acceptance --- etc/psa_config/DC2C_device.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index 84d9909..c32090a 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -4,7 +4,7 @@ "Version":"04.12.2023 00103", "printer":1, "coinChk":1, -"mifRd":2, +"mifRd":1, "solarPwr":0, "modem":1, "creditCard":1, From 7651213dfe233ae375b4d6c9ab02024044dbe403 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 2 Apr 2024 15:49:30 +0200 Subject: [PATCH 21/31] Updated to use logo --- etc/psa_config/DC2C_print01.json | 4 +--- etc/psa_config/DC2C_print05.json | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 75a5c32..dd9c6c9 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -7,6 +7,7 @@ "styl":"align c", "feed":"margin02", "feed":"rim02", +"graf":"logo1", "text":"Korneuburg", "feed":"nl" "feed":"nl" @@ -26,7 +27,6 @@ "styl":"size 00", "feed":"nl" } -# @@ -39,5 +39,3 @@ -# -# diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index b9b7281..0be5525 100755 --- a/etc/psa_config/DC2C_print05.json +++ b/etc/psa_config/DC2C_print05.json @@ -7,6 +7,7 @@ "styl":"align c", "feed":"margin02", "feed":"rim02", +"graf":"logo1", "text":"Korneuburg", "feed":"nl" "feed":"nl" @@ -38,6 +39,3 @@ -# -# -# From 925bbd85b1c45302c12874b2b6b010cf4a558a52 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 3 Apr 2024 14:00:00 +0200 Subject: [PATCH 22/31] Updated (Thomas) --- etc/psa_config/DC2C_conf.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index 130809e..eac5bb1 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,11 +3,10 @@ "project":"Korneuburg", "version":"15.11.2023 00001", "custNum":714, -"machNum":8, +"machNum":1000, "borough":1, "zone":1, "alias":0, -"location":"Hauptplatz 39 Gericht" +"location":"Lebzeltergasse 4-12" } -# -# + From 71f1479db966c52427088de0939ab5da002c2017 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 9 Apr 2024 16:21:54 +0200 Subject: [PATCH 23/31] Added: opkg upgrade ptu5-systemcontroller --- etc/psa_update/opkg_commands | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index ca713f9..31182d9 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -11,12 +11,13 @@ opkg install mxt-touch-reset opkg install atb-dc-libraries opkg install ptu5-systemcontroller opkg install atb-modemtools +opkg upgrade ptu5-systemcontroller # opkg remove atb-accountingtool # opkg install atb-accountingtool #opkg --cache /var/cache/opkg --download-only upgrade #opkg --cache /var/cache/opkg upgrade # opkg remove apism # opkg install apism -opkg info apism -opkg info atbqt -opkg info atbupdatetool +# opkg info apism +# opkg info atbqt +# opkg info atbupdatetool From ef4ae8bb00bf89cfb87280b152747119d236c7c7 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 23 Apr 2024 13:44:26 +0200 Subject: [PATCH 24/31] Use new device file: settings changed: shutter: 1 --- etc/psa_config/DC2C_device.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index c32090a..be682ba 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -10,7 +10,7 @@ "creditCard":1, "escrow":1, "RejMotor":0, -"shutter":2, +"shutter":1, "billRd":0, "vaultLock":0, "autoAlarm":1, @@ -23,8 +23,7 @@ "BattWarn":11800, "BattErr":11200, "foreign":1, -"refPrint":0 +"refundPrint":1, +"billWarnLev":4, +"billFullLev":7 } -# -# -# From 862e07cea3b26c5af7a76641dfd1d84107e161db Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 23 Apr 2024 13:48:10 +0200 Subject: [PATCH 25/31] Only keep "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 31182d9..680a964 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -5,13 +5,13 @@ ############################################################################### # opkg update -opkg install prepare-update -opkg install atbupdatetool -opkg install mxt-touch-reset -opkg install atb-dc-libraries -opkg install ptu5-systemcontroller -opkg install atb-modemtools -opkg upgrade ptu5-systemcontroller +# opkg install prepare-update +# opkg install atbupdatetool +# opkg install mxt-touch-reset +# opkg install atb-dc-libraries +# opkg install ptu5-systemcontroller +# opkg install atb-modemtools +# opkg upgrade ptu5-systemcontroller # opkg remove atb-accountingtool # opkg install atb-accountingtool #opkg --cache /var/cache/opkg --download-only upgrade From 85713e2bb5e55e1117b30533d714c8b859bf5e8e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 24 Apr 2024 12:49:35 +0200 Subject: [PATCH 26/31] Removed any holiday not in 2024 --- etc/psa_tariff/tariff01.json | 223 +++++------------------------------ 1 file changed, 29 insertions(+), 194 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index 9bc319e..649054c 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -386,69 +386,14 @@ } ], "SpecialDays": [ - { - "ped_id": 11, - "ped_label": "Mariae Empfaengnis", - "ped_date_start": "2023-12-08", - "ped_date_end": "2023-12-08", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 13, - "ped_label": "Christtag", - "ped_date_start": "2023-12-25", - "ped_date_end": "2023-12-25", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 14, - "ped_label": "Stefanitag", - "ped_date_start": "2023-12-26", - "ped_date_end": "2023-12-26", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2016, - "ped_label": "Neujahr", - "ped_date_start": "2024-01-01", - "ped_date_end": "2024-01-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2021, - "ped_label": "Heilig Drei Koenige", - "ped_date_start": "2024-01-06", - "ped_date_end": "2024-01-06", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2022, - "ped_label": "Ostermontag", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, - { - "ped_id": 2023, - "ped_label": "Ostersonntag", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, { "ped_id": 2024, "ped_label": "Staatsfeiertag", "ped_date_start": "2024-05-01", "ped_date_end": "2024-05-01", "ped_period_special_day_id": 1, - "ped_year": 0 + "ped_year": 0, + "comment_ped_year": "check year if 0" }, { "ped_id": 2025, @@ -456,7 +401,17 @@ "ped_date_start": "2024-05-09", "ped_date_end": "2024-05-09", "ped_period_special_day_id": 1, - "ped_year": 2024 + "ped_year": 0, + "comment_ped_year": "check year if 0" + }, + { + "ped_id": 2060, + "ped_label": "Pfingst Sonntag", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", + "ped_period_special_day_id": 1, + "ped_year": 0, + "comment_ped_year": "check year if 0" }, { "ped_id": 2026, @@ -464,7 +419,8 @@ "ped_date_start": "2024-05-20", "ped_date_end": "2024-05-20", "ped_period_special_day_id": 1, - "ped_year": 2024 + "ped_year": 0, + "comment_ped_year": "check year if 0" }, { "ped_id": 2027, @@ -472,7 +428,8 @@ "ped_date_start": "2024-05-30", "ped_date_end": "2024-05-30", "ped_period_special_day_id": 1, - "ped_year": 2024 + "ped_year": 0, + "comment_ped_year": "check year if 0" }, { "ped_id": 2028, @@ -480,7 +437,8 @@ "ped_date_start": "2024-08-15", "ped_date_end": "2024-08-15", "ped_period_special_day_id": 1, - "ped_year": 0 + "ped_year": 0, + "comment_ped_year": "check year if 0" }, { "ped_id": 2029, @@ -488,7 +446,8 @@ "ped_date_start": "2024-10-26", "ped_date_end": "2024-10-26", "ped_period_special_day_id": 1, - "ped_year": 0 + "ped_year": 0, + "comment_ped_year": "check year if 0" }, { "ped_id": 2030, @@ -496,7 +455,8 @@ "ped_date_start": "2024-11-01", "ped_date_end": "2024-11-01", "ped_period_special_day_id": 1, - "ped_year": 0 + "ped_year": 0, + "comment_ped_year": "check year if 0" }, { "ped_id": 2031, @@ -504,7 +464,8 @@ "ped_date_start": "2024-08-12", "ped_date_end": "2024-08-12", "ped_period_special_day_id": 1, - "ped_year": 0 + "ped_year": 0, + "comment_ped_year": "check year if 0" }, { "ped_id": 2032, @@ -512,7 +473,8 @@ "ped_date_start": "2024-12-25", "ped_date_end": "2024-12-25", "ped_period_special_day_id": 1, - "ped_year": 0 + "ped_year": 0, + "comment_ped_year": "check year if 0" }, { "ped_id": 2034, @@ -520,135 +482,8 @@ "ped_date_start": "2024-12-26", "ped_date_end": "2024-12-26", "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2035, - "ped_label": "Neujahr", - "ped_date_start": "2025-01-01", - "ped_date_end": "2025-01-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2036, - "ped_label": "Heilig Drei Koenige", - "ped_date_start": "2025-06-01", - "ped_date_end": "2025-06-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2037, - "ped_label": "Ostermontag", - "ped_date_start": "2025-04-21", - "ped_date_end": "2025-04-21", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2039, - "ped_label": "Ostersonntag", - "ped_date_start": "2025-04-20", - "ped_date_end": "2025-04-20", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2038, - "ped_label": "Staatsfeiertag", - "ped_date_start": "2025-05-01", - "ped_date_end": "2025-05-01", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2050, - "ped_label": "Christi Himmelfahrt", - "ped_date_start": "2025-05-29", - "ped_date_end": "2025-05-29", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2051, - "ped_label": "Pfingstmontag", - "ped_date_start": "2025-06-09", - "ped_date_end": "2025-06-09", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2052, - "ped_label": "Fronlaeichnam", - "ped_date_start": "2025-06-19", - "ped_date_end": "2025-06-19", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2053, - "ped_label": "Mariae Himmelfahrt", - "ped_date_start": "2025-08-15", - "ped_date_end": "2025-08-15", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2054, - "ped_label": "Nationalfeiertag", - "ped_date_start": "2025-10-26", - "ped_date_end": "2025-10-26", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2055, - "ped_label": "Allerheiligen", - "ped_date_start": "2025-11-01", - "ped_date_end": "2025-11-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2056, - "ped_label": "Mariae Empfaengnis", - "ped_date_start": "2025-12-08", - "ped_date_end": "2025-12-08", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2057, - "ped_label": "Christtag", - "ped_date_start": "2025-12-25", - "ped_date_end": "2025-12-25", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2058, - "ped_label": "Stefanitag", - "ped_date_start": "2025-12-26", - "ped_date_end": "2025-12-26", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2059, - "ped_label": "Neujahr", - "ped_date_start": "2026-01-01", - "ped_date_end": "2026-01-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2060, - "ped_label": "Heilige Drei Koenige", - "ped_date_start": "2026-01-06", - "ped_date_end": "2026-01-06", - "ped_period_special_day_id": 1, - "ped_year": 0 + "ped_year": 0, + "comment_ped_year": "check year if 0" } ], "PeriodYear": [ From 50f9d9b320b1c1feef5f55ca25f7ad47b8a58560 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 24 Apr 2024 15:35:29 +0200 Subject: [PATCH 27/31] Check in files as created by Thomas. --- etc/psa_config/DC2C_cash.json | 5 ++--- etc/psa_config/DC2C_device.json | 5 +++-- etc/psa_config/DC2C_print02.json | 19 ++++++++++++++----- etc/psa_config/DC2C_print03.json | 19 ++++++++++++++----- etc/psa_config/DC2C_print04.json | 4 +--- etc/psa_config/DC2C_print06.json | 3 --- etc/psa_config/DC2C_print07.json | 3 --- etc/psa_config/DC2C_print08.json | 4 +--- etc/psa_config/DC2C_print31.json | 3 --- etc/psa_config/DC2C_print32.json | 3 --- 10 files changed, 35 insertions(+), 33 deletions(-) diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 77940f1..4da11dc 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -4,7 +4,7 @@ "version":"15.10.2023 14:55 02.00.06", "CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1], "CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3], -"CoinAccept(15..0)":[1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,0], +"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,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], @@ -14,6 +14,5 @@ "Surcharge":0, "Discount":0 } +#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500], -# -# diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index be682ba..b9d073c 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -24,6 +24,7 @@ "BattErr":11200, "foreign":1, "refundPrint":1, -"billWarnLev":4, -"billFullLev":7 +"billWarnLev":400, +"billFullLev":500 + } diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 0a650c9..e12632d 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -1,4 +1,4 @@ -{ +{ "title":"DC2C_pri02", "project":"Korneuburg", "Version":"15.11.2023 00001", @@ -10,7 +10,16 @@ "text":"", "feed":"nl", "styl":"size 00" -} -# -# -# +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index f30d9a4..45bbd26 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -1,4 +1,4 @@ -{ +{ "title":"DC2C_pri03", "project":"Korneuburg", "Version":"15.11.2023 00001", @@ -18,7 +18,16 @@ "text":"legen", "feed":"nl", "feed":"eject" -} -# -# -# +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json index 60329d8..ea36ed5 100755 --- a/etc/psa_config/DC2C_print04.json +++ b/etc/psa_config/DC2C_print04.json @@ -3,6 +3,4 @@ "project":"Korneuburg", "Version":"15.11.2023 01.01", "text":""; -}# -# -# +} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index 9302f75..7622b92 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -24,6 +24,3 @@ -# -# -# diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index 9939fab..4fc2640 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -31,6 +31,3 @@ -# -# -# diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index 9dfb910..e664cda 100755 --- a/etc/psa_config/DC2C_print08.json +++ b/etc/psa_config/DC2C_print08.json @@ -3,6 +3,4 @@ "project":"Korneuburg", "Version":"15.11.2023 01.01", "text":""; -}# -# -# +} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json index bfe8a0f..407bf89 100755 --- a/etc/psa_config/DC2C_print31.json +++ b/etc/psa_config/DC2C_print31.json @@ -19,6 +19,3 @@ } -# -# -# diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json index 34969cb..2f1c024 100755 --- a/etc/psa_config/DC2C_print32.json +++ b/etc/psa_config/DC2C_print32.json @@ -40,6 +40,3 @@ } -# -# -# From b102e3a26d3722515959f71319d5dc5bfdc1f7ab Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Tue, 21 May 2024 09:11:58 +0200 Subject: [PATCH 28/31] opkg: install release 20240517-1 --- etc/psa_update/opkg_commands | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 680a964..7e3564b 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -4,20 +4,12 @@ # opkg-commands added to this file will be executed by ATBUpdateTool. ############################################################################### # +opkg info atbqt +opkg info atbupdatetool opkg update -# opkg install prepare-update -# opkg install atbupdatetool -# opkg install mxt-touch-reset -# opkg install atb-dc-libraries -# opkg install ptu5-systemcontroller -# opkg install atb-modemtools -# opkg upgrade ptu5-systemcontroller -# opkg remove atb-accountingtool -# opkg install atb-accountingtool -#opkg --cache /var/cache/opkg --download-only upgrade -#opkg --cache /var/cache/opkg upgrade -# opkg remove apism -# opkg install apism -# opkg info apism -# opkg info atbqt -# opkg info atbupdatetool +opkg install prepare-update +opkg --cache /var/cache/opkg --download-only upgrade +opkg --cache /var/cache/opkg upgrade +opkg info apism +opkg info atbqt +opkg info atbupdatetool From 699d8448975ec642b694ec8b54eeb7f41fe05ffc Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Tue, 21 May 2024 17:30:05 +0200 Subject: [PATCH 29/31] Revert "opkg: install release 20240517-1" This reverts commit b102e3a26d3722515959f71319d5dc5bfdc1f7ab. --- etc/psa_update/opkg_commands | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 7e3564b..680a964 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -4,12 +4,20 @@ # opkg-commands added to this file will be executed by ATBUpdateTool. ############################################################################### # -opkg info atbqt -opkg info atbupdatetool opkg update -opkg install prepare-update -opkg --cache /var/cache/opkg --download-only upgrade -opkg --cache /var/cache/opkg upgrade -opkg info apism -opkg info atbqt -opkg info atbupdatetool +# opkg install prepare-update +# opkg install atbupdatetool +# opkg install mxt-touch-reset +# opkg install atb-dc-libraries +# opkg install ptu5-systemcontroller +# opkg install atb-modemtools +# opkg upgrade ptu5-systemcontroller +# opkg remove atb-accountingtool +# opkg install atb-accountingtool +#opkg --cache /var/cache/opkg --download-only upgrade +#opkg --cache /var/cache/opkg upgrade +# opkg remove apism +# opkg install apism +# opkg info apism +# opkg info atbqt +# opkg info atbupdatetool From 2c8fd8a43dbc12fbeb8bf8bbfe2809bca4856eed Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Tue, 18 Jun 2024 11:23:38 +0200 Subject: [PATCH 30/31] opkg install release 2024-06-18 --- etc/psa_update/opkg_commands | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 680a964..ba11ba6 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -5,19 +5,12 @@ ############################################################################### # opkg update -# opkg install prepare-update -# opkg install atbupdatetool -# opkg install mxt-touch-reset -# opkg install atb-dc-libraries -# opkg install ptu5-systemcontroller -# opkg install atb-modemtools -# opkg upgrade ptu5-systemcontroller -# opkg remove atb-accountingtool -# opkg install atb-accountingtool -#opkg --cache /var/cache/opkg --download-only upgrade -#opkg --cache /var/cache/opkg upgrade -# opkg remove apism -# opkg install apism -# opkg info apism -# opkg info atbqt -# opkg info atbupdatetool +opkg install prepare-update +# +opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries +opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc +opkg --cache /var/cache/opkg --download-only upgrade atbqt +# +opkg --cache /var/cache/opkg upgrade atb-dc-libraries +opkg --cache /var/cache/opkg upgrade atb-plugin-dc +opkg --cache /var/cache/opkg upgrade atbqt From daaa1cd8b8c2d90a829d52f01ea4f2b45ee8c236 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Mon, 24 Jun 2024 15:11:43 +0200 Subject: [PATCH 31/31] DC_device: add paramter "housing" ... ... this is for enabling door switches on 1256 DC --- etc/psa_config/DC2C_device.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index b9d073c..da8b929 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -25,6 +25,6 @@ "foreign":1, "refundPrint":1, "billWarnLev":400, -"billFullLev":500 - +"billFullLev":500, +"housing":1 }