test

removed
2024-04-10 12:44:33 +02:00 · 2024-04-10 12:29:41 +02:00
17 changed files with 414 additions and 6101 deletions
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,16 +1,18 @@
-{	     
-"title":"DC2C_cash  ",
-"Project":"TEST",
-"Version":"0.1.0-2024-05-17",
-"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
-"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
-"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0],
-"ExchangeRate":1,
-"TokenChannel":6,
-"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
-"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
-"LocalTaxRate":19,
-"ForeignTaxRate":0,
-"Surcharge":0,	
-"Discount":0
-}
+{	     
+"title":"DC2C_cash  ",
+"project":"Schoenau",
+"version":"15.10.2023 14:55 02.00.06",
+"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
+"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
+"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0],
+"ExchangeRate":1,
+"TokenChannel":6,
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
+"LocalTaxRate":19,
+"ForeignTaxRate":0,
+"Surcharge":0,	
+"Discount":0
+}
+#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
+
--- a/etc/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
@@ -1,11 +1,12 @@
-{ 
-"title":"DC2C_config",
-"Project":"TEST",
-"Version":"0.1.0-2024-05-17",
-"custNum":999,
-"machNum":996,
-"borough":1,
-"zone":1,
-"alias":0,
-"location":"Loc"
-}
+{ 
+"title":"DC2C_config",
+"project":"Schoenau",
+"version":"15.11.2023 00001",
+"custNum":332,
+"machNum":10,
+"borough":1,
+"zone":1,
+"alias":0,
+"location":"PP Königssee"
+}
+
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,27 +1,27 @@
-{
-"title":"DC2C_device",
-"Project":"TEST",
-"Version":"0.0.8-2024-05-17",
-"printer":1,
-"coinChk":3,
-"mifRd":1,
-"solarPwr":0,
-"modem":0,
-"creditCard":1,
-"escrow":0,
-"RejMotor":0,
-"shutter":1,
-"billRd":1,
-"vaultLock":0,
-"autoAlarm":1,
-"autoOpen":1,
-"AccPrint":1,
-"DorPrint":1,
-"TokPrint":1,
-"CBwarnLev":1600,
-"CBerrLev":1900,
-"BattWarn":11800,
-"BattErr":11200,
-"foreign":1,
-"refPrint":1
-}
+{
+"title":"DC2C_device",
+"project":"Schoenau",
+"Version":"15.11.2024 00102",
+"printer":1,
+"coinChk":3,
+"mifRd":1,
+"solarPwr":0,
+"modem":0,
+"creditCard":1,
+"escrow":0,
+"RejMotor":0,
+"shutter":1,
+"billRd":1,
+"vaultLock":0,
+"autoAlarm":1,
+"autoOpen":1,
+"AccPrint":1,
+"DorPrint":1,
+"TokPrint":1,
+"CBwarnLev":1600,
+"CBerrLev":1900,
+"BattWarn":11800,
+"BattErr":11200,
+"foreign":1,
+"refPrint":1
+}
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,34 +1,46 @@
-{
-"title":"DC2C_pri01",
-"Project":"TEST",
-"Version":"0.0.7-2024-05-17",
-"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"
-}
+{
+"title":"DC2C_pri01",
+"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"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,19 +1,31 @@
-{
-"title":"DC2C_pri02",
-"Project":"TEST",
-"Version":"2024-05-16T09:05",
-"issued":"13.11.2023 01.01",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
-"feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"feed":"nl",
-"styl":"size 00",
-"text":"Gedruckt am: ",
-"vari":"wday deu short",
-"vari":"date ge",	
-"vari":"time long"
-}
+{
+"title":"DC2C_pri02",
+"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",
+"feed":"nl",
+"styl":"size 00",
+"text":"Gedruckt am: ",
+"vari":"wday deu short",
+"vari":"date ge",	
+"vari":"time long"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -1,26 +1,38 @@
-{
-"title":"DC2C_pri03",
-"Project":"TEST",
-"Version":"2024-05-16T09:05",
-"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önigssee",
-"feed":"nl",
-"text":"Ticket-Nr. ",
-"vari":"TickCtr",
-"feed":"nl",
-"text":"Automatentechnik ",
-"feed":"nl",
-"text":"Baumann GmbH",
-"feed":"eject"
-}
+{
+"title":"DC2C_pri03",
+"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önigssee",
+"feed":"nl",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
+"text":"Automatentechnik ",
+"feed":"nl",
+"text":"Baumann GmbH",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -1,6 +1,6 @@
-{
-"title":"DC2C_pri04",
-"project":"TEST",
-"Version":"2024-05-16T09:05",
-"text":""
-}
+{
+"title":"DC2C_pri04",
+"project":"Schoenau",
+"Version":"15.11.2023 01.01",
+"text":"";
+}
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -1,34 +1,46 @@
-{
-"title":"DC2C_pri05",
-"Project":"TEST",
-"Version":"2024-05-16T09:05",
-"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"
-}
+{
+"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"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -1,19 +1,31 @@
-{
-"title":"DC2C_pri06",
-"Project":"TEST",
-"Version":"2024-05-16T09:05",
-"issued":"13.11.2023 01.01",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
-"feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"feed":"nl",
-"styl":"size 00",
-"text":"Gedruckt am: ",
-"vari":"wday deu short",
-"vari":"date ge",	
-"vari":"time long"
-}
+{
+"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",
+"feed":"nl",
+"styl":"size 00",
+"text":"Gedruckt am: ",
+"vari":"wday deu short",
+"vari":"date ge",	
+"vari":"time long"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -1,26 +1,38 @@
-{
-"title":"DC2C_pri07",
-"Project":"TEST",
-"Version":"2024-05-16T09:07",
-"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önigssee",
-"feed":"nl",
-"text":"Ticket-Nr. ",
-"vari":"TickCtr",
-"feed":"nl",
-"text":"Automatentechnik ",
-"feed":"nl",
-"text":"Baumann GmbH",
-"feed":"eject"
-}
+{
+"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önigssee",
+"feed":"nl",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
+"text":"Automatentechnik ",
+"feed":"nl",
+"text":"Baumann GmbH",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -1,6 +1,6 @@
-{
-"title":"DC2C_pri08",
-"Project":"TEST",
-"Version":"2024-05-16T09:07",
-"text":""
-}
+{
+"title":"DC2C_pri08",
+"project":"Schoenau",
+"Version":"15.11.2023 01.01",
+"text":"";
+}
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -1,38 +1,40 @@
-{
-"title":"DC2C_pri31",
-"Project":"TEST",
-"Version":"0.0.3-2024-05-16",
-"styl":"font 08",
-"styl":"size 10",
-"feed":"margin02",
-"feed":"rim02",
-"feed":"speed10",
-"styl":"size 11",
-"feed":"nl",
-"text":"Türöffnung um:",
-"feed":"nl",
-"styl":"size 00",
-"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"
-}
+{
+"title":"DC2C_pri31",
+"project":"door close print",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"feed":"nl",
+"text":"Türöffnung um:",
+"feed":"nl",
+"styl":"size 00",
+"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"
+}
+
+
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -1,40 +1,42 @@
-{
-"title":"DC2C_pri32",
-"Project":"TEST",
-"Version":"0.0.2-2024-05-16",
-"styl":"font 08",
-"styl":"size 10",
-"feed":"margin02",
-"feed":"rim02",
-"feed":"speed10",
-"styl":"size 11",
-"text":"Ersatzbeleg",
-"feed":"nl",
-"styl":"size 00",
-"text":"Erstattungsbetrag: ",
-"feed":"nl",
-"vari":"Dynamic07",
-"text":"€",
-"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",	
-"text":"Am: ",
-"vari":"date us",
-"text":"Um: ",
-"vari":"time long",
-"feed":"nl",
-"text":" * * * * * * * * ",
-"feed":"nl",
-"feed":"nl",
-"feed":"eject"
-}
+{
+"title":"DC2C_pri32",
+"project":"refund reciept",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"text":"Ersatzbeleg",
+"feed":"nl",
+"styl":"size 00",
+"text":"Erstattungsbetrag: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"text":"€",
+"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",	
+"text":"Am: ",
+"vari":"date us",
+"text":"Um: ",
+"vari":"time long",
+"feed":"nl",
+"text":" * * * * * * * * ",
+"feed":"nl",
+"feed":"nl",
+"feed":"eject"
+}
+
+
--- a/etc/psa_tariff/tariff.template.json
+++ b/etc/psa_tariff/tariff.template.json
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,7 +1,4 @@
 {
-  "Project":"ATB",
-  "Info": "Info",
-  "Version": "1.0.17",
  "Currency": [
    {
      "pcu_id": 2,
@@ -805,9 +802,6 @@
      "ped_year": 2024
    }
  ]
+
 }  

-
-
-
-
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -3,27 +3,31 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-# ######
-# # # # # # # # # # # # #
-opkg info apism 
-# opkg info atbqt
-# opkg info atbupdatetool
-# opkg update
-# opkg install prepare-update
-# opkg install atbupdatetool
+# #
+# # # # # # # # # # # #
+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 --verbosity=2
+opkg --cache /var/cache/opkg --download-only upgrade
+opkg --cache /var/cache/opkg upgrade --verbosity=2
 # opkg remove apism
 # opkg install apism
-
-
-
-
-
-
-#
+opkg info apism
+opkg info atbqt
+opkg info atbupdatetool
+opkg info apism
+opkg info atbqt
+opkg info atbupdatetool
+opkg info apism
+opkg info atbqt
+opkg info atbupdatetool
+opkg info apism
+opkg info atbqt
+opkg info atbupdatetool
 #
 #
 #
--- a/opt/app/ATBAPP/ATBQT.ini
+++ b/opt/app/ATBAPP/ATBQT.ini
@@ -8,13 +8,13 @@ serialPort=ttymxc2
 %23useProduct=[128+][64+][32+][16+][8]
 %23useVehicle=[128+][64+][32+][16+][8]
 CharacterSet=ISO 8859-2
-alternativeLogoFile=/opt/app/ATBAPP/logo
+alternativeLogoFile=
 com_baud_rate=9600
 com_port_name=/dev/ttyS1
-defaultLanguage=2
+defaultLanguage=1
 feature_DBusDisplayControl=on
 feature_DBusDisplayDimLow=off
-feature_DBusSuspendControl=off
+feature_DBusSuspendControl=on
 feature_DisplayControl=off
 feature_Log=off
 feature_ShowParkingTime=off
@@ -25,17 +25,13 @@ feature_selfOOO=off
 lang1=hu_HU
 lang2=en_GB
 lang3=de_DE
-lang4=ar_AR
+lang4=sr
 lang5=ro_RO
 logfile=/var/log/atbqt.log
 ooo_alternativeLocation=
 ooo_mode=otherMachine
 ooo_serviceEmail=
 ooo_serviceNumber=
-ooo_wallbox1=
-ooo_wallbox2=
-ooo_wallbox3=
-ooo_wallbox4=
 sellTimeout_time=60
 showHelpButton=false
 showInfoButton=false
@@ -49,7 +45,7 @@ touch_feedback_off_value=0
 touch_feedback_on_value=1
 useAppStates=1
 useLanguage=240
-usePayment=48
+usePayment=96
 useProduct=240
 useVehicle=240

@@ -67,16 +63,15 @@ useDebug=1

 [PAYMENT]
 cashVariant=CoinsOnly
-currencyISOCode=AED
-currencySymbol=AED
+currencyISOCode=HUF
+currencySymbol=Ft
 paymentPointInTime=poa
-useDecimal=no
 useHonestPayment=on

 [PLUGINS]
-CCPlugin=TCP_ZVT_CCPlugin
+CCPlugin=IngenicoISelf_CCPlugin
 CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
-DeviceControllerPlugin=
+DeviceControllerPlugin=ATBDeviceControllerPlugin

 [SCREENCONFIG]
 sc_31="1,1,0"
@@ -92,11 +87,5 @@ sc_53="1,0,0"
 [TCP_CONTROL]
 enable=1

-[TCP_ZVT_CCPlugin]
-CurrentyCode=AED
-IP=192.168.5.242
-NumberOfChars=37
-Password=000000
-Port=22000
-ZVT=DE
-sleep=1
+###
+###
Author	SHA1	Message	Date
Gerhard Hoffmann	c16c833c87	test	2024-04-10 12:44:33 +02:00
Gerhard Hoffmann	95079a52cd	removed	2024-04-10 12:29:41 +02:00