Update JSON files as provided by Dennis. Changed version info in cash and device.

Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_748 into zg1/zone1
removed space for testing
2024-07-01 16:39:56 +02:00 · 2024-06-20 10:56:48 +02:00 · 2024-06-20 10:55:38 +02:00 · 2024-06-20 10:27:51 +02:00 · 2024-06-20 08:31:50 +02:00 · 2024-06-12 08:18:23 +02:00
14 changed files with 3140 additions and 5 deletions
--- a/etc/atb/SystemControl.ini
+++ 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
--- a/etc/atbapp/ATBAPP.ini
+++ 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=otherMachine
+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"
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ATB_APP_STATES version="1.1">
+    <APP_STATE name="IDLE">
+        <EVENT name="BUTTON_START" resultingState="SETUP_DIRECT_COIN_INPUT"/>
+        <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
+        <EVENT name="RECEIVED_DC_COIN_ATTACHED" resultingState="SETUP_DIRECT_COIN_INPUT"/>
+        <SCREEN name="START"/>
+        <MODE name="IDLE"/>
+    </APP_STATE>
+    <APP_STATE name="FREE_PARK">
+        <EVENT name="SELL_ENABLE" resultingState="IDLE"/>
+        <SCREEN name="START"/>
+        <MODE name="IDLE"/>
+    </APP_STATE>
+    
+    <APP_STATE name="SETUP_DIRECT_COIN_INPUT">
+        <ENTRY_TASK name="TIMER" timeout="500"/>
+        <EVENT name="TIMEOUT" resultingState="CASH_PAYMENT" 
+               setCashInputMode="PAY_UP" 
+               setProduct="SHORT_TERM_PARKING"
+               setPaymentType="CASH"/>
+    </APP_STATE>
+    
+    <APP_STATE name="CASH_PAYMENT">
+        <ENTRY_TASK name="REQUEST_CASH_INPUT"/>
+        <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
+        <EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
+        <SCREEN name="COIN_PAYMENT"/>
+    </APP_STATE>
+    <APP_STATE name="CASH_PAYMENT_INPUT">
+        <ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/>
+        <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CASH_ABORT_OVERPAID"/>
+        <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
+        <EVENT name="BUTTON_NEXT" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
+    </APP_STATE>
+    <APP_STATE name="CASH_PAYMENT_ERROR">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
+    </APP_STATE>
+    
+    <APP_STATE name="CASH_ABORT_OVERPAID">
+        <ENTRY_TASK name="REQUEST_ISAMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="CASH_CHANGE_OVERPAID" note="screennumber 0x8a"/>
+    </APP_STATE>
+    
+    <APP_STATE name="CASH_PAYMENT_ABORT">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+    </APP_STATE>
+
+    <!--
+    <APP_STATE name="PRINT_TICKET_WAIT">
+        <ENTRY_TASK name="TIMER" timeout="2000"/>
+        <EVENT name="TIMEOUT" resultingState="PRINT_TICKET"/>
+        <SCREEN name="BUSY"/>
+    </APP_STATE>
+    -->
+    <APP_STATE name="PRINT_TICKET_CASH">
+        <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
+        <EVENT name="PRINT_TICKET_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
+        <EVENT name="PRINT_TICKET_ERROR" resultingState="PRINT_TICKET_FAILED"/>
+        <SCREEN name="SCREEN_WAITFOR"/>
+    </APP_STATE>
+  
+    <APP_STATE name="PRINT_TICKET_FAILED">
+        <ENTRY_TASK name="REQUEST_CC_CANCEL_TRANSACTION"/>
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="PRINT_TICKET_FAILED"/>
+    </APP_STATE>
+
+    
+    <APP_STATE name="GOODBYE_PAYMENT_OK">
+        <ENTRY_TASK name="CASH_COLLECT"/>
+        <ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="5000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="GOODBYE_PAYMENT_OK"/>
+    </APP_STATE>
+    
+ 
+    <!-- ************** ABORT STATES ************** -->  
+    
+    <APP_STATE name="ABORT_NOCONNECTION">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_2"/>
+    </APP_STATE>   
+    <APP_STATE name="ABORT_NOCARD">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_4"/>
+    </APP_STATE>    
+    <APP_STATE name="ABORT_CARD_DENIED">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_5"/>
+    </APP_STATE>
+    <APP_STATE name="ABORT_NOT_ALLOWED">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_6"/>
+    </APP_STATE>
+    
+    
+</ATB_APP_STATES>
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@ -0,0 +1,17 @@
+{	     
+"title":"DC2C_cash  ",
+"Project":"Stockerau",
+"Version":"1.0.0-2024-07-01",
+"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,0,0,0,0,0,0,0,0,0,0],
+"ExchangeRate":1,
+"TokenChannel":0,
+"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,0,0,0],
+"LocalTaxRate":19,
+"ForeignTaxRate":0,
+"Surcharge":0,	
+"Discount":0
+}
+
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@ -0,0 +1,31 @@
+{
+"title":"DC2C_device",
+"Project":"Stockerau",
+"Version":"1.0.0-2024-07-01",
+"printer":1,
+"coinChk":1,
+"mifRd":2,
+"solarPwr":0,
+"modem":1,
+"creditCard":0,
+"escrow":1,
+"RejMotor":0,
+"shutter":1,
+"billRd":0,
+"vaultLock":0,
+"autoAlarm":1,
+"autoOpen":1,
+"AccPrint":1,
+"DorPrint":1,
+"TokPrint":0,
+"CBwarnLev":1600,
+"CBerrLev":1900,
+"BattWarn":11800,
+"BattErr":11200,
+"foreign":1,
+"refundPrint":0,
+"billWarnLev":300,
+"billFullLev":380,
+"housing":1
+
+}
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@ -0,0 +1,44 @@
+{
+"title":"DC2C_pri01",
+"Project":"Stockerau",
+"Version":"25.06.2024 00001",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Parkschein",
+"styl":"size 00",
+"feed":"nl",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"text":"STADTGEM. STOCKERAU",
+"feed":"nl",
+"styl":"align l",
+"styl":"size 11",
+"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
@ -0,0 +1,30 @@
+{
+"title":"DC2C_pri02",
+"Project":"Stockerau",
+"Version":"25.06.2024 00001",
+"issued":"13.11.2023 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"feed":"nl",
+"styl":"size 00",
+"text":"inkl. 20% MwST."
+"feed":"nl",
+"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
@ -0,0 +1,34 @@
+{
+"title":"DC2C_pri03",
+"Project":"Stockerau",
+"Version":"19.06.2024 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",
+"feed":"nl",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri04",
+"Project":"Stockerau",
+"Version":"19.06.2024 00001",
+"text":""
+}
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@ -0,0 +1,40 @@
+{
+"title":"DC2C_pri31",
+"Project":"Stockerau",
+"Version":"19.06.2024 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
@ -0,0 +1,42 @@
+{
+"title":"DC2C_pri32",
+"Project":"Stockerau",
+"Version":"19.06.2024 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/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@ -64,11 +64,11 @@
      "pop_day_end_time": "00:00:00",
      "pop_day_night_end_time": "00:00:00",
      "pop_price_night": 0,
-      "pop_min_time": 4,
+      "pop_min_time": 30,
      "comment_pop_min_time": "(30/0,7) * 1 : 30mins are 70 cent",
      "pop_max_time": 257,
      "comment_pop_max_time": "(30/0,7) * 60: 30mins are 70 cent",
-      "pop_min_price": 10,
+      "pop_min_price": 70,
      "pop_max_price": 600,
      "pop_carry_over": 1,
      "pop_carry_over_time_range": 1,
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@ -3,9 +3,7 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-# 
+#NEVER USE EMPTY LINES 
 opkg update
 #opkg install --force-downgrade  https://firmware.ptu5.atb-comm.de/testing/00700/atb-plugin-calculateprice-mobilisis_1.5.0+git0+034adf9096-r1-00700_cortexa9t2hf-neon.ipk
 #opkg install --force-downgrade https://firmware.ptu5.atb-comm.de/testing/00700/libmobilisis-calc2_2.1.99+git0+c7623429d9-r0-00700_cortexa9t2hf-neon.ipk
-
-
Author	SHA1	Message	Date
Gerhard Hoffmann	5d82128720	Update JSON files as provided by Dennis. Changed version info in cash and device.	2024-07-01 16:39:56 +02:00
Gerhard Hoffmann	a619b2a5ab	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_748 into zg1/zone1	2024-06-20 10:56:48 +02:00
Gerhard Hoffmann	b1536a5ce7	removed space for testing	2024-06-20 10:55:38 +02:00
Gerhard Hoffmann	0908514ae7	remove empty lines	2024-06-20 10:27:51 +02:00
Gerhard Hoffmann	db1757c8f0	Add Json-files for Stockerau	2024-06-20 08:31:50 +02:00
Siegfried Siegert	1156aa1eab	Add PTU configuration	2024-06-12 08:18:23 +02:00
Gerhard Hoffmann	b9bf79a8b3	Fix min_price and min_time	2024-06-06 13:58:09 +02:00