From 01166c2644da13e364ba288f5b5831b4473f3a5d Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 24 Nov 2023 09:28:34 +0100 Subject: [PATCH 01/12] witch back to machine-id 1000 and zone=0. --- 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 bee0a61..8a6b619 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,9 +3,9 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1000, +"machNum":1004, "borough":0, -"zone":0, +"zone":1, "alias":0, "location":"Vorplatz 1" } From 3ac760eb9be162f395f12394cf098ced63098968 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 24 Nov 2023 09:29:38 +0100 Subject: [PATCH 02/12] Switch back to machine-id 1000 and zone = 0 (original setting) --- 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 8a6b619..bee0a61 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,9 +3,9 @@ "project":"Schoenau", "version":"15.11.2023 00001", "custNum":332, -"machNum":1004, +"machNum":1000, "borough":0, -"zone":1, +"zone":0, "alias":0, "location":"Vorplatz 1" } From cd7db1537216b696201ba2259c0b33927db55d1d Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 24 Nov 2023 09:30:16 +0100 Subject: [PATCH 03/12] Remove euro sign. --- etc/psa_config/DC2C_print02.json | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 25dfd76..0aa5f99 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -10,7 +10,6 @@ "text":"Bezahlt: ", "styl":"size 11", "vari":"Dynamic07", -"text":"€", "feed":"nl", "styl":"size 00", "text":"Gedruckt am: ", From fd3ef4d79f57ccbbdb12ecca975309832e5bfaa8 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 24 Nov 2023 09:30:36 +0100 Subject: [PATCH 04/12] Remove euro sign. --- etc/psa_config/DC2C_print32.json | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json index 2f1c024..96de28b 100755 --- a/etc/psa_config/DC2C_print32.json +++ b/etc/psa_config/DC2C_print32.json @@ -14,7 +14,6 @@ "text":"Erstattungsbetrag: ", "feed":"nl", "vari":"Dynamic07", -"text":"€", "feed":"nl", "text":"KuNu: ", "vari":"cunu", From 5f755bd80053dcddd68fd6e320735d8aebd97a33 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 24 Nov 2023 09:39:53 +0100 Subject: [PATCH 05/12] Revert version to original 00001. --- etc/psa_config/DC2C_print01.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 46caec0..48ad85f 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -1,7 +1,7 @@ { "title":"DC2C_pri01", "project":"Schoenau", -"Version":"15.11.2023 00003", +"Version":"15.11.2023 00001", "styl":"font 10", "styl":"size 11", "styl":"align c", From 909c124fb85964293ae8c1ce0acc74c79d6ea957 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 24 Nov 2023 13:42:42 +0100 Subject: [PATCH 06/12] Add new files (used for new templates) --- etc/psa_config/DC2C_conf21.json | 12 +++++++++ etc/psa_config/DC2C_conf25.json | 12 +++++++++ etc/psa_config/DC2C_conf26.json | 12 +++++++++ etc/psa_config/DC2C_print05.json | 46 ++++++++++++++++++++++++++++++++ etc/psa_config/DC2C_print06.json | 32 ++++++++++++++++++++++ etc/psa_config/DC2C_print07.json | 35 ++++++++++++++++++++++++ etc/psa_config/DC2C_print08.json | 6 +++++ 7 files changed, 155 insertions(+) create mode 100755 etc/psa_config/DC2C_conf21.json create mode 100755 etc/psa_config/DC2C_conf25.json create mode 100755 etc/psa_config/DC2C_conf26.json create mode 100755 etc/psa_config/DC2C_print05.json create mode 100755 etc/psa_config/DC2C_print06.json create mode 100755 etc/psa_config/DC2C_print07.json create mode 100755 etc/psa_config/DC2C_print08.json diff --git a/etc/psa_config/DC2C_conf21.json b/etc/psa_config/DC2C_conf21.json new file mode 100755 index 0000000..b4c77f0 --- /dev/null +++ b/etc/psa_config/DC2C_conf21.json @@ -0,0 +1,12 @@ +{ +"title":"DC2C_config", +"project":"Schoenau", +"version":"15.11.2023 00001", +"custNum":332, +"machNum":21, +"borough":0, +"zone":0, +"alias":0, +"location":"Vorplatz 1" +} + diff --git a/etc/psa_config/DC2C_conf25.json b/etc/psa_config/DC2C_conf25.json new file mode 100755 index 0000000..46e51c4 --- /dev/null +++ b/etc/psa_config/DC2C_conf25.json @@ -0,0 +1,12 @@ +{ +"title":"DC2C_config", +"project":"Schoenau", +"version":"15.11.2023 00001", +"custNum":332, +"machNum":25, +"borough":0, +"zone":0, +"alias":0, +"location":"Vorplatz 1" +} + diff --git a/etc/psa_config/DC2C_conf26.json b/etc/psa_config/DC2C_conf26.json new file mode 100755 index 0000000..198bf09 --- /dev/null +++ b/etc/psa_config/DC2C_conf26.json @@ -0,0 +1,12 @@ +{ +"title":"DC2C_config", +"project":"Schoenau", +"version":"15.11.2023 00001", +"custNum":332, +"machNum":26, +"borough":0, +"zone":0, +"alias":0, +"location":"Vorplatz 1" +} + diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json new file mode 100755 index 0000000..9e637b6 --- /dev/null +++ b/etc/psa_config/DC2C_print05.json @@ -0,0 +1,46 @@ +{ +"title":"DC2C_pri05", +"project":"Schoenau", +"Version":"15.11.2023 00001", +"styl":"font 10", +"styl":"size 11", +"styl":"align c", +"feed":"margin02", +"feed":"rim02", +"text":"PARKTICKET", +"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: ", +"feed":"nl", +"styl":"size 11", +"vari":"Dynamic04", +"vari":"Dynamic03", +"styl":"size 00", +"feed":"nl" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json new file mode 100755 index 0000000..9b8aaaa --- /dev/null +++ b/etc/psa_config/DC2C_print06.json @@ -0,0 +1,32 @@ +{ +"title":"DC2C_pri06", +"project":"Schoenau", +"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" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json new file mode 100755 index 0000000..ecce986 --- /dev/null +++ b/etc/psa_config/DC2C_print07.json @@ -0,0 +1,35 @@ +{ +"title":"DC2C_pri07", +"project":"Schoenau", +"Version":"15.11.2023 00001", +"feed":"nl", +"styl":"size 00", +"text":"Automat: ", +"vari":"manu", +"text":"Gruppe: ", +"vari":"group", +"text":"Zone: ", +"vari":"zone", +"feed":"nl", +"text":"Ort: ", +"vari":"location", +"styl":"align c", +"text":"Schönau am Königsee", +"feed":"nl", +"text":"Automatentechnik ", +"feed":"nl", +"text":"Baumann GmbH", +"feed":"eject" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json new file mode 100755 index 0000000..83c9e9c --- /dev/null +++ b/etc/psa_config/DC2C_print08.json @@ -0,0 +1,6 @@ +{ +"title":"DC2C_pri08", +"project":"Schoenau", +"Version":"15.11.2023 01.01", +"text":""; +} \ No newline at end of file From eff3c6351d15c6ed9cc03b86ac58da9d299a301b Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 28 Nov 2023 10:26:06 +0100 Subject: [PATCH 07/12] Fix typo: 5670 -> 5760. --- etc/psa_tariff/tariff01.json | 2 +- etc/psa_tariff/tariff02.json | 2 +- etc/psa_tariff/tariff03.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index a629b64..c0db9c3 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -126,7 +126,7 @@ { "pun_id": 9, "pun_label": "96h", - "pun_duration": 5670 + "pun_duration": 5760 }, { "pun_id": 10, diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index 8e776b9..5070c2d 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -96,7 +96,7 @@ { "pun_id": 9, "pun_label": "96h", - "pun_duration": 5670 + "pun_duration": 5760 }, { "pun_id": 10, diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json index 8e776b9..5070c2d 100644 --- a/etc/psa_tariff/tariff03.json +++ b/etc/psa_tariff/tariff03.json @@ -96,7 +96,7 @@ { "pun_id": 9, "pun_label": "96h", - "pun_duration": 5670 + "pun_duration": 5760 }, { "pun_id": 10, From a3868cea1b9fee506c030e2ef40c16b97f7a23f8 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 29 Nov 2023 09:33:53 +0100 Subject: [PATCH 08/12] Sync with branch zg1/zone1 --- etc/psa_config/DC2C_print02.json | 2 +- etc/psa_config/DC2C_print32.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 0aa5f99..e3fcdca 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -1,7 +1,7 @@ { "title":"DC2C_pri02", "project":"Schoenau", -"Version":"15.11.2023 00001", +"Version":"15.11.2023 00002", "issued":"13.11.2023 01.01", "text":"Standort: ", "feed":"nl", diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json index 96de28b..d49072f 100755 --- a/etc/psa_config/DC2C_print32.json +++ b/etc/psa_config/DC2C_print32.json @@ -1,7 +1,7 @@ { "title":"DC2C_pri32", "project":"refund reciept", -"Version":"15.11.2023 00001", +"Version":"15.11.2023 00002", "styl":"font 08", "styl":"size 10", "feed":"margin02", From 9480f75479eaf5038b5ed70ab3d1ad75cb43bf51 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 24 Jan 2024 12:31:38 +0100 Subject: [PATCH 09/12] sync with branch zg1/zone1 --- etc/psa_config/DC2C_print02.json | 2 +- etc/psa_config/DC2C_print06.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index e3fcdca..4e40b09 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -1,7 +1,7 @@ { "title":"DC2C_pri02", "project":"Schoenau", -"Version":"15.11.2023 00002", +"Version":"01.12.2023 00008", "issued":"13.11.2023 01.01", "text":"Standort: ", "feed":"nl", diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index 9b8aaaa..f43402e 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -1,7 +1,7 @@ { "title":"DC2C_pri06", "project":"Schoenau", -"Version":"15.11.2023 00001", +"Version":"15.11.2023 00002", "issued":"13.11.2023 01.01", "text":"Standort: ", "feed":"nl", @@ -10,7 +10,6 @@ "text":"Bezahlt: ", "styl":"size 11", "vari":"Dynamic07", -"text":"€", "feed":"nl", "styl":"size 00", "text":"Gedruckt am: ", From f0180cbe305d501f301b65c4b0fe43e0801d2fec Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 24 Jan 2024 12:42:37 +0100 Subject: [PATCH 10/12] Add opkg install mxt-touch-reset to fix touch-screen issues --- 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 13c1190..a7c6d59 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -4,11 +4,12 @@ # opkg-commands added to this file will be executed by ATBUpdateTool. ############################################################################### # -opkg info atbqt -opkg info 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 50367175175b1515caa9e181c8475fa8aa9adb30 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 24 Jan 2024 14:50:14 +0100 Subject: [PATCH 11/12] On not upgrade, but install packages only with direct commands. opkg update opkg install prepare-update opkg install atbupdatetool opkg install mxt-touch-reset opkg install apism opkg info apism opkg info atbupdatetool --- etc/psa_update/opkg_commands | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index a7c6d59..761de0b 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -4,18 +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 -opkg --cache /var/cache/opkg upgrade -# opkg remove apism -# opkg install apism +opkg install apism opkg info apism -opkg info atbqt opkg info atbupdatetool From 9569c90ddc06f92c3e96b3e5e1e194be79fabfde Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 25 Jan 2024 11:39:26 +0100 Subject: [PATCH 12/12] sync with tariff01.json in zg1/zone1 -> Minor: version from 1.0.0 to 1.0.15 --- etc/psa_tariff/tariff01.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index c0db9c3..9255ce5 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -1,6 +1,6 @@ { "Project" : "Schoenau", - "Version" : "1.0.0", + "Version" : "1.0.15", "Info" : "", "Currency": [ {