fixed typo: cach -> cache

Zone5 to be used as update-help: machines in zone5: 10, 11, 31
Add special handling for 2025-01-01: 2 hours are free of charge.
2024-12-18 11:59:15 +01:00 · 2024-12-16 13:33:58 +01:00 · 2024-12-13 12:59:18 +01:00 · 2024-12-13 12:58:57 +01:00 · 2024-12-11 07:48:48 +01:00 · 2024-12-09 17:35:22 +01:00
8 changed files with 117 additions and 274 deletions
--- a/etc/atbapp/ATBAPP.ini
+++ b/etc/atbapp/ATBAPP.ini
@ -1,115 +1,7 @@
-[COMMON]
-com_port_name=/dev/ttyS1
-com_baud_rate=9600
-lang1=lt_LT
-lang2=en_GB
-lang3=de_DE
-lang4=ru_RU
-lang5=
-
-defaultLanguage=1
-CharacterSet="ISO 8859-13"
-
-showInfoButton=false
-showHelpButton=false
-
-#useLanguage=[128+][64+][32+][16]
-useLanguage=240
-#usePayment=[128+][64+][32+][16]
-usePayment=96
-#useVehicle=[128+][64+][32+][16+][8]
-useVehicle=192
-#useProduct=[128+][64+][32+][16+][8]
-useProduct=192
-
-textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
-logfile=/var/log/atbqt.log
-alternativeLogoFile=/opt/app/ATBAPP/logo/logo_klaipeda2.png
-
-feature_Log=off
-feature_TouchFeedback=off
-feature_StartButton=on
-feature_selfOOO=off
-feature_ShowParkingTime=off
-
-suspend_methode=sysfs
-suspend_program=
-suspend_time=8
-
-touch_feedback_gpio=121
-touch_feedback_on_value=1
-touch_feedback_off_value=0
-
-#ooo_mode={useDisk|otherMachine}
-ooo_mode=otherMachine
-sellTimeout_time=60
-
-showInfoButton=false
-showHelpButton=false
-
-useAppStates=1
-statefile=/opt/app/ATBAPP/states/APP_States.xml
-
-[SCREENCONFIG]
-sc_31="1,1,0"
-sc_33="1,0,1"
-sc_3F="1,0,0"
-sc_40="1,0,1"
-sc_41="1,0,0"
-sc_35="0,0,0"
-sc_51="1,0,1"
-sc_52="1,0,0"
-sc_53="1,0,0"
-
-
-[PLUGINS]
-CCPlugin=AsyncPOS_CCPlugin
-CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
-DeviceControllerPlugin=ATBDeviceControllerPlugin
-
-
-[IngenicoISelf_CCPlugin]
-debug=1
-PortName=/dev/ttymxc0
-ZVT=DE
-sleep=1
-sleepExtended=1
-Currency=HUF
-
-
-[TCP_CONTROL]
-enable=1
-
-
-[PAYMENT]
-currencySymbol=€
-currencyISOCode=EUR
-cashVariant=CoinsAndNotes
-paymentPointInTime=poa
-useDecimal=yes
-
-
-[MOBILISIS_CalculatePricePlugin]
-useDebug=1
-tariffFileName=/etc/psa_tariff/tariff01.json
-
 [ATBDeviceControllerPlugin]
+printerEncoding=Windows-1257
+printerLocale=lt_LT
 serialPort=ttymxc2
-printerEncoding="Windows-1257"
-printerLocale="lt_LT"
-
-[TCP_ZVT_CCPlugin]
-CurrencyCode=EUR
-debug=1
-IP=192.168.6.242
-Port=22000
-SSL=0
-ZVT=DE
-sleep=1
-printIntermediateStatus=1
-Password=277296
-NumberOfChars=37
-dcHours="0"

 [AsyncPOS_CCPlugin]
 APAK=8AC304380E0E476BA2558B75DB9E2516
@ -123,3 +15,101 @@ parity=0
 sleep=0
 stopBits=1
 terminalPowerOnOffHours="06:00:00,22:00:00"
+
+[COMMON]
+%23ooo_mode={useDisk|otherMachine}
+%23useLanguage=[128+][64+][32+][16]
+%23usePayment=[128+][64+][32+][16]
+%23useProduct=[128+][64+][32+][16+][8]
+%23useVehicle=[128+][64+][32+][16+][8]
+CharacterSet=ISO 8859-13
+alternativeLogoFile=/opt/app/ATBAPP/logo/logo_Palanga.png
+com_baud_rate=9600
+com_port_name=/dev/ttyS1
+defaultLanguage=1
+feature_DBusDisplayControl=on
+feature_DBusDisplayDimLow=off
+feature_DBusSuspendControl=off
+feature_Log=off
+feature_ShowParkingTime=off
+feature_StartButton=on
+feature_TouchFeedback=off
+feature_selfOOO=off
+lang1=lt_LT
+lang2=en_GB
+lang3=de_DE
+lang4=ru_RU
+lang5=
+logfile=/var/log/atbqt.log
+ooo_alternativeLocation=
+ooo_mode=otherMachine
+ooo_serviceEmail=
+ooo_serviceNumber=
+sellTimeout_time=60
+showHelpButton=false
+showInfoButton=false
+statefile=/etc/atbapp/states/APP_States.xml
+suspend_methode=sysfs
+suspend_program=
+suspend_time=8
+textfile=/etc/atbapp/text/HMI_Texte.xml
+touch_feedback_gpio=121
+touch_feedback_off_value=0
+touch_feedback_on_value=1
+useAppStates=1
+useLanguage=240
+usePayment=96
+useProduct=192
+useVehicle=192
+
+[IngenicoISelf_CCPlugin]
+Currency=HUF
+PortName=/dev/ttymxc0
+ZVT=DE
+debug=1
+sleep=1
+sleepExtended=1
+
+[MOBILISIS_CalculatePricePlugin]
+tariffFileName=/etc/psa_tariff/tariff01.json
+useDebug=1
+
+[PAYMENT]
+cashVariant=CoinsAndNotes
+currencyISOCode=EUR
+currencySymbol=€
+paymentPointInTime=poa
+useDecimal=yes
+useHonestPayment=on
+
+[PLUGINS]
+CCPlugin=AsyncPOS_CCPlugin
+CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
+DeviceControllerPlugin=ATBDeviceControllerPlugin
+
+[SCREENCONFIG]
+sc_31="1,1,0"
+sc_33="1,0,1"
+sc_35="0,0,0"
+sc_3F="1,0,0"
+sc_40="1,0,1"
+sc_41="1,0,0"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
+
+[TCP_CONTROL]
+enable=1
+
+[TCP_ZVT_CCPlugin]
+CurrencyCode=EUR
+IP=192.168.6.242
+NumberOfChars=37
+Password=277296
+Port=22000
+SSL=0
+ZVT=DE
+dcHours=0
+debug=1
+printIntermediateStatus=1
+sleep=1
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@ -2,14 +2,19 @@
 "title":"DC2C_pri03",
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
 "styl":"size 00",
-"text":"Sumokėta:", 
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Sumokėta grynais:", 
 "vari":"Dynamic02",
 "styl":"size 21",
-"text":"Raudonoji zona",
+"text":"Geltonoji zona",
 "feed":"nl",
 "styl":"size 10",
-"text":"tarifas 1,50Eur/h",
+"text":"tarifas 60 ct/h",
 "feed":"nl",
 "styl":"size 00",
 "feed":"nl",
--- a/etc/psa_config/DC2C_print03_red.json
+++ b/etc/psa_config/DC2C_print03_red.json
@ -1,40 +0,0 @@
-{
-"title":"DC2C_pri03",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"size 00",
-"styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
-"styl":"size 00",
-"text":"Sumokėta grynais:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Raudonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 1,50Eur/h",
-"feed":"nl",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
-"vari":"Dynamic08",
-"feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print03_yellow.json
+++ b/etc/psa_config/DC2C_print03_yellow.json
@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri03",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"size 00",
-"styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
-"text":"Sumokėta grynais:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Geltonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 60 ct/h",
-"feed":"nl",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
-"vari":"Dynamic08",
-"feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@ -2,14 +2,19 @@
 "title":"DC2C_pri07",
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "styl":"size 00",
-"text":"Sumokėta:", 
+"text":"Sumokėta kortele:", 
 "vari":"Dynamic02",
 "styl":"size 21",
-"text":"Raudonoji zona",
+"text":"Geltonoji zona",
 "feed":"nl",
 "styl":"size 10",
-"text":"tarifas 1,50Eur/h",
+"text":"tarifas 60 ct/h",
 "feed":"nl",
 "styl":"size 00",
 "feed":"nl",
--- a/etc/psa_config/DC2C_print07_red.json
+++ b/etc/psa_config/DC2C_print07_red.json
@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri07",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"size 00",
-"styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
-"text":"Sumokėta kortele:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Raudonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 1,50Eur/h",
-"feed":"nl",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
-"vari":"Dynamic08",
-"feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print07_yellow.json
+++ b/etc/psa_config/DC2C_print07_yellow.json
@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri07",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
-"styl":"size 00",
-"text":"Sumokėta kortele:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Geltonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 60 ct/h",
-"feed":"nl",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
-"vari":"Dynamic08",
-"feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@ -16,7 +16,7 @@ opkg --cache /var/cache/opkg --download-only upgrade atbqt
 opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
 opkg --cache /var/cache/opkg --download-only install ptu-package-versions
 opkg --cache /var/cache/opkg --download-only install wbdw
-opkg --cach  /var/cache/opkg --download-only upgrade ptu5-sysconfig
+opkg --cache /var/cache/opkg --download-only upgrade ptu5-sysconfig
 #
 opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
 opkg --cache /var/cache/opkg upgrade libmobilisis-calc
Author	SHA1	Message	Date
Gerhard Hoffmann	4c28de4a30	fixed typo: cach -> cache	2024-12-18 11:59:15 +01:00
Gerhard Hoffmann	7baf05b1f0	Zone5 to be used as update-help: machines in zone5: 10, 11, 31	2024-12-16 13:33:58 +01:00
Gerhard Hoffmann	f55c05e884	Add special handling for 2025-01-01: 2 hours are free of charge.	2024-12-13 12:59:18 +01:00
Gerhard Hoffmann	68658f7da7	set terminalPowerOnOffHours: 6:00-22:00	2024-12-13 12:58:57 +01:00
Siegfried Siegert	dfb0254db2	opkg upgrade ptu5-sysconfig	2024-12-11 07:48:48 +01:00
Siegfried Siegert	05597bc697	opkg: install ptu-package-versions ... ... upgrade does not work for packages which are not installed	2024-12-09 17:35:22 +01:00
Siegfried Siegert	6056c642c8	Systemcontrol: switch on suspendcontroller	2024-12-09 12:46:17 +01:00
Siegfried Siegert	05fa475df6	SystemControl: inputBrightness = 30	2024-12-04 12:54:25 +01:00
Siegfried Siegert	c31e38e764	opkg fix: install wbdw	2024-12-03 16:37:20 +01:00
Siegfried Siegert	f343ae6002	opkg: install wbdw	2024-12-03 16:11:26 +01:00
Gerhard Hoffmann	480fe4c820	Copied from Palanga (336)	2024-11-15 12:44:36 +01:00
Siegfried Siegert	86c8aca8cd	Text: screen 0x3c ASC_RECEIPT	2024-11-05 16:40:12 +01:00
Siegfried Siegert	c24f8052e2	Text: Fix typo	2024-11-05 16:40:08 +01:00
Siegfried Siegert	414e03fc62	Selling process / Card payment: ask for printing receipt	2024-11-05 16:40:00 +01:00
Gerhard Hoffmann	c4d8de4a96	Update files (provided by Thomas)	2024-10-31 12:11:03 +01:00
Gerhard Hoffmann	1ae02e6d9f	Add libmobilisis for download/update	2024-10-08 12:52:16 +02:00
Gerhard Hoffmann	e9690e2a90	Update tariff-files for winter term	2024-10-02 16:01:42 +02:00
Gerhard Hoffmann	3027ba38cb	First step for new tariffs: adapt carry-over-times	2024-09-13 10:22:09 +02:00
Gerhard Hoffmann	a2c8e782d8	Change tariff files according to new settings sent from Eugenijus	2024-09-12 15:41:39 +02:00
Gerhard Hoffmann	771a01b8ae	Update as provided by T.Sax.	2024-09-05 08:05:30 +02:00
Gerhard Hoffmann	454d665d94	Add atb-plugin-calculateprice-mobilisis	2024-08-30 11:29:27 +02:00
Gerhard Hoffmann	2d21e7c28b	Update jsons as provided by T.Sax	2024-08-27 16:19:20 +02:00
Gerhard Hoffmann	84aa822885	Set DorPrint=0.	2024-08-27 08:42:45 +02:00
Gerhard Hoffmann	e12fb8c591	updated by th.sax	2024-08-22 15:28:17 +02:00
Gerhard Hoffmann	f91f50e7ff	new file provided by th.sax	2024-08-22 13:28:16 +02:00
Gerhard Hoffmann	f887e12076	smd 08-20 only with CP1257	2024-08-22 08:20:31 +02:00
Gerhard Hoffmann	d677c12ad9	Add settinge time-step-config and pop-allow-overpay	2024-08-21 18:02:48 +02:00
Gerhard Hoffmann	ff78bf1411	Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2	2024-08-21 17:54:37 +02:00
Gerhard Hoffmann	21512f927e	Add settings: + "pop_time_step_config": 1 -> STATIC + "pop_allow_overpay": false	2024-08-21 17:52:58 +02:00
Siegfried Siegert	1b85f4ac03	HMI: Textupdate	2024-08-09 14:00:32 +02:00
Siegfried Siegert	7e6f5e8283	Textupdate: screen Overpaid	2024-08-09 13:46:02 +02:00
Siegfried Siegert	4dbe681477	ATBAPP: states: request for overpayment	2024-08-09 11:47:50 +02:00
Siegfried Siegert	690f60b63d	Update text: "Wait for card terminal"	2024-08-08 17:03:21 +02:00
Siegfried Siegert	ad23378439	Merge branch 'zg1/zone2' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone2	2024-08-08 17:03:09 +02:00
Gerhard Hoffmann	5d51847b24	Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2	2024-08-08 10:30:22 +02:00
Gerhard Hoffmann	f78e84624a	Update jsons-files as provided by Thomas	2024-08-08 10:29:14 +02:00
Siegfried Siegert	88468a9d2a	Setup opkg-commands	2024-08-07 17:16:46 +02:00
Siegfried Siegert	8a3ed1ff11	ATBAPP: states: skip printing bank receipt	2024-08-07 16:45:44 +02:00
Siegfried Siegert	59e020c60b	ATBAPP: add current states	2024-08-07 16:45:40 +02:00
Siegfried Siegert	ce6053f435	ATBAPP: setPrinterEncoding and printerLocale	2024-08-07 16:40:28 +02:00
Gerhard Hoffmann	079d0f4e7e	Tariff for Zone 2 (Yellow) in Kleipeda	2024-08-01 17:22:10 +02:00
Gerhard Hoffmann	f21099f036	Tariff for Zone 1 (Red) in Kleipeda	2024-08-01 17:08:12 +02:00
Gerhard Hoffmann	0085494514	Add atbapp to sync with zone1 branch	2024-07-19 10:36:01 +02:00
Gerhard Hoffmann	f050c5657e	Add JSON files as saved on ATB server	2024-07-19 10:29:11 +02:00
Gerhard Hoffmann	a01f7b6647	Added Red-Zone as Info	2024-07-19 10:07:06 +02:00
Gerhard Hoffmann	109ce63b71	Add tariff for Yellow Zone	2024-07-18 15:38:17 +02:00
Gerhard Hoffmann	f3d04ab718	Provide empty file as start	2024-07-17 14:46:04 +02:00
Gerhard Hoffmann	7b912cea2c	Removed for Kleipeda (too many machines, each one needs maybe own conf-file)	2024-06-28 12:45:39 +02:00
Gerhard Hoffmann	ed92e95e87	Changed to UNIX format (test) and set version info.	2024-06-28 12:45:11 +02:00
Gerhard Hoffmann	7dd4874870	removed empty line after testing	2024-06-28 12:39:33 +02:00
Gerhard Hoffmann	0474b7e649	Add empty line for testing	2024-06-28 12:10:33 +02:00
Siegfried Siegert	120cdc0220	Merge branch 'master' into zg1/zone1	2024-06-27 12:15:55 +02:00
Gerhard Hoffmann	135d93adf1	first draft of tariff for kleipeda	2024-06-06 17:16:29 +02:00