From ce50052c0f24317d989bc64a020d7b9e3f5b2c8a Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Fri, 8 Mar 2024 11:04:17 +0100 Subject: [PATCH 01/10] ATBAPP: update states --- etc/atbapp/states/APP_States_741_Linsinger.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/atbapp/states/APP_States_741_Linsinger.xml b/etc/atbapp/states/APP_States_741_Linsinger.xml index a24dc87..b869eff 100644 --- a/etc/atbapp/states/APP_States_741_Linsinger.xml +++ b/etc/atbapp/states/APP_States_741_Linsinger.xml @@ -22,6 +22,7 @@ + From 424213f0abfd8f435e9979063a51b5bc9c258533 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Fri, 8 Mar 2024 11:07:25 +0100 Subject: [PATCH 02/10] Add 'cut' to template 2 --- etc/psa_config/DC2C_print2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print2.json b/etc/psa_config/DC2C_print2.json index c40da80..3882c6f 100755 --- a/etc/psa_config/DC2C_print2.json +++ b/etc/psa_config/DC2C_print2.json @@ -29,7 +29,7 @@ "feed":"nl", "feed":"nl", "feed":"nl", -"feed":"part" +"feed":"cut" } From 8bbbd491811fbeac224ed57086d1feb173a0da05 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Fri, 8 Mar 2024 11:56:53 +0100 Subject: [PATCH 03/10] DC: no coin checker --- 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 cf5ac41..240e82f 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -3,7 +3,7 @@ "project":"NVT Linsinger", "issued":"18.10.2023 15:00", "printer":1, -"coinChk":3, +"coinChk":0, "mifRd":1, "solarPwr":0, "modem":0, From f7c9bdeb11c69a4be470be2ad1e057be2996d116 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Fri, 8 Mar 2024 11:59:37 +0100 Subject: [PATCH 04/10] Rename printer json files --- etc/psa_config/{DC2C_print1.json => DC2C_print01.json} | 0 etc/psa_config/{DC2C_print2.json => DC2C_print02.json} | 0 etc/psa_config/{DC2C_print3.json => DC2C_print03.json} | 0 etc/psa_config/{DC2C_print4.json => DC2C_print04.json} | 0 etc/psa_config/{DC2C_print5.json => DC2C_print05.json} | 0 etc/psa_config/{DC2C_print6.json => DC2C_print06.json} | 0 etc/psa_config/{DC2C_print7.json => DC2C_print07.json} | 0 etc/psa_config/{DC2C_print8.json => DC2C_print08.json} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename etc/psa_config/{DC2C_print1.json => DC2C_print01.json} (100%) rename etc/psa_config/{DC2C_print2.json => DC2C_print02.json} (100%) rename etc/psa_config/{DC2C_print3.json => DC2C_print03.json} (100%) rename etc/psa_config/{DC2C_print4.json => DC2C_print04.json} (100%) rename etc/psa_config/{DC2C_print5.json => DC2C_print05.json} (100%) rename etc/psa_config/{DC2C_print6.json => DC2C_print06.json} (100%) rename etc/psa_config/{DC2C_print7.json => DC2C_print07.json} (100%) rename etc/psa_config/{DC2C_print8.json => DC2C_print08.json} (100%) diff --git a/etc/psa_config/DC2C_print1.json b/etc/psa_config/DC2C_print01.json similarity index 100% rename from etc/psa_config/DC2C_print1.json rename to etc/psa_config/DC2C_print01.json diff --git a/etc/psa_config/DC2C_print2.json b/etc/psa_config/DC2C_print02.json similarity index 100% rename from etc/psa_config/DC2C_print2.json rename to etc/psa_config/DC2C_print02.json diff --git a/etc/psa_config/DC2C_print3.json b/etc/psa_config/DC2C_print03.json similarity index 100% rename from etc/psa_config/DC2C_print3.json rename to etc/psa_config/DC2C_print03.json diff --git a/etc/psa_config/DC2C_print4.json b/etc/psa_config/DC2C_print04.json similarity index 100% rename from etc/psa_config/DC2C_print4.json rename to etc/psa_config/DC2C_print04.json diff --git a/etc/psa_config/DC2C_print5.json b/etc/psa_config/DC2C_print05.json similarity index 100% rename from etc/psa_config/DC2C_print5.json rename to etc/psa_config/DC2C_print05.json diff --git a/etc/psa_config/DC2C_print6.json b/etc/psa_config/DC2C_print06.json similarity index 100% rename from etc/psa_config/DC2C_print6.json rename to etc/psa_config/DC2C_print06.json diff --git a/etc/psa_config/DC2C_print7.json b/etc/psa_config/DC2C_print07.json similarity index 100% rename from etc/psa_config/DC2C_print7.json rename to etc/psa_config/DC2C_print07.json diff --git a/etc/psa_config/DC2C_print8.json b/etc/psa_config/DC2C_print08.json similarity index 100% rename from etc/psa_config/DC2C_print8.json rename to etc/psa_config/DC2C_print08.json From d790627731755f7b31255e5415dfcbc0762160a1 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Mon, 11 Mar 2024 12:16:45 +0100 Subject: [PATCH 05/10] Update print template 2 --- etc/psa_config/DC2C_print02.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 3882c6f..6bec737 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -22,7 +22,7 @@ "vari":"Dynamic01", "feed":"nl", "text":"Lauf. Nr. ", -"vari":"Dynamic03", +"vari":"Dynamic02", "feed":"nl", "vari":"date ge", "feed":"nl", From 593c4f219c8bd1c2a18b7a19dd34e569dd23c7f4 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Mon, 11 Mar 2024 12:58:31 +0100 Subject: [PATCH 06/10] CashVariant is "NoCash" --- 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 d7bf021..53c8f9c 100644 --- a/etc/atbapp/ATBAPP.ini +++ b/etc/atbapp/ATBAPP.ini @@ -68,7 +68,7 @@ enable=0 [PAYMENT] currencySymbol=€ currencyISOCode=EUR -cashVariant=Coins +cashVariant=NoCash paymentPointInTime=poa useDecimal=yes From 374e8b5e899be507dd2e5cb818860b0cc3c8670f Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Mon, 11 Mar 2024 13:59:44 +0100 Subject: [PATCH 07/10] Update text --- etc/atbapp/text/HMI_Texte_741_Linsinger.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/atbapp/text/HMI_Texte_741_Linsinger.xml b/etc/atbapp/text/HMI_Texte_741_Linsinger.xml index 0e44979..047dcea 100644 --- a/etc/atbapp/text/HMI_Texte_741_Linsinger.xml +++ b/etc/atbapp/text/HMI_Texte_741_Linsinger.xml @@ -664,9 +664,9 @@ - Ticket entnehmen. - Ticket entnehmen. - Take your ticket. + Marken entnehmen. + Marken entnehmen. + Take your stamps. Prenez billet. Prendere Biglietto. From 9f539603dbb5a79b0a27fc8a7cd21ca0f1e228c7 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Mon, 11 Mar 2024 16:32:38 +0100 Subject: [PATCH 08/10] DC2C_devices: mifare-reader is allways on --- 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 240e82f..7d2d81f 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -4,7 +4,7 @@ "issued":"18.10.2023 15:00", "printer":1, "coinChk":0, -"mifRd":1, +"mifRd":2, "solarPwr":0, "modem":0, "creditCard":1, From a4e7889790f944a0691196f93f093eb6b04ca828 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Mon, 11 Mar 2024 16:36:32 +0100 Subject: [PATCH 09/10] Add SystemControl.ini (monitoring switched on) --- 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..7dfd03e --- /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=3 + +[BACKLIGHT] +SensorMax=3500 +SensorMin=0 +curve=1 +dimLowValue=499 +dimMax=100 +dimMin=20 +inputBrightness=499 + +[COMMON] +startBacklightController=true +startMQTTController=true +startMonitoringController=true +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 a0cf7cd40fc21a360401cba685a8289a4358778f Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Tue, 21 May 2024 08:53:29 +0200 Subject: [PATCH 10/10] Update release 20240517-1 --- etc/psa_update/opkg_commands | 5 ----- 1 file changed, 5 deletions(-) diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 13c1190..7e3564b 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -8,13 +8,8 @@ opkg info atbqt opkg info atbupdatetool opkg update opkg install prepare-update -opkg install atbupdatetool -# 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