Update ATBAPP config (states, texts)

2024-05-15 18:01:03 +02:00 · 2024-05-15 18:01:03 +02:00 · a9bece9248
commit a9bece9248
parent dd5f3c1c74
3 changed files with 94 additions and 84 deletions
--- a/etc/atbapp/ATBAPP.ini
+++ b/etc/atbapp/ATBAPP.ini
@ -1,102 +1,99 @@
+[ATBDeviceControllerPlugin]
+printerEncoding=Windows-1252
+serialPort=ttymxc2
+
 [COMMON]
-com_port_name=/dev/ttyS2
+%23alternativeLogoFile=
+%23ooo_mode={useDisk|otherMachine}
+%23useLanguage=[128+][64+][32+][16]
+%23usePayment=[128+][64+][32+][16]
+%23useVehicle=[128+][64+][32+][16]
+CharacterSet=ISO 8859-15
+alternativeLogoFile=/opt/app/ATBAPP/logo
 com_baud_rate=9600
+com_port_name=/dev/ttyS2
+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=de_AT
 lang2=en_GB
 lang3=it_IT
-lang4=cs_CZ
-
-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=224
-useProduct=224
-
-showInfoButton=false
-showHelpButton=false
-
-textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
+lang4=de_DE
+lang5=
 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=useDisk
+ooo_alternativeLocation=
+ooo_mode=otherMachine
+ooo_serviceEmail=
+ooo_serviceNumber=
 sellTimeout_time=60
-
-
+showHelpButton=false
+showInfoButton=false
+statefile=/etc/atbapp/states/APP_States.xml
+textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
+touch_feedback_gpio=121
+touch_feedback_off_value=0
+touch_feedback_on_value=1
 useAppStates=1
-statefile=/opt/app/ATBAPP/states/APP_States.xml
+useLanguage=192
+usePayment=96
+useProduct=192
+useVehicle=192

-[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"
+[IngenicoZVT_CCPlugin]
+CurrencyCode=EUR
+PortName=/dev/ttyS3
+ZVT=AT
+dcHours=0
+debug=1
+sleep=0

+[MOBILISIS_CalculatePricePlugin]
+tariffFileName=/etc/psa_tariff/tariff01.json
+useDebug=1
+
+[PAYMENT]
+cashVariant=Coins
+currencyISOCode=EUR
+currencySymbol=€
+paymentPointInTime=poa
+useDecimal=yes
+useHonestPayment=on

 [PLUGINS]
 CCPlugin=TCP_ZVT_CCPlugin
 CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
 DeviceControllerPlugin=ATBDeviceControllerPlugin

+[SCREENCONFIG]
+sc_31="0,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,1"
+sc_44="1,0,1"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
+
 [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
+NumberOfChars=37
+Password=835322
 Port=22000
 SSL=0
 ZVT=DE
-sleep=1
+dcHours=0
+debug=1
 printIntermediateStatus=1
-Password=749729
-NumberOfChars=37
-dcHours="0"
+sleep=1
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@ -14,12 +14,18 @@

    <APP_STATE name="SETUP_SELL_STATE">
        <ENTRY_TASK name="TIMER" timeout="500"/>
-        <EVENT name="TIMEOUT" resultingState="CARD_PAYMENT" setPaymentType="CARD" setProduct="DAY_TICKET"/>
+        <EVENT name="TIMEOUT" resultingState="SHOW_PAYMENT_INFO" setPaymentType="CARD" setProduct="DAY_TICKET"/>
        <EXIT_TASK name="REQUEST_INITIAL_PRICE"/>
    </APP_STATE>

+    <APP_STATE name="SHOW_PAYMENT_INFO">
+	    <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
+	    <EVENT name="BUTTON_NEXT"   resultingState="CARD_PAYMENT"/>
+	    <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+            <SCREEN name="PAYMENT_INFO"/>
+    </APP_STATE>	    
+
    <APP_STATE name="CARD_PAYMENT">
-        <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
        <ENTRY_TASK name="REQUEST_CC_START_TRANSACTION"/>
        <EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="PRINT_TICKET_CARD"/>
        <EVENT name="RECEIVED_CARD_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
@ -2183,11 +2183,11 @@
 	</Screen>
 	<Screen name="PayMethod8" screennr="0x48">
        <Text textnr="0x30">
-			<de_AT>Bitte Münzen einwerfen</de_AT>
-            <en_GB>Please insert coins</en_GB>
-			<fr_FR>Insérer des pièces</fr_FR>
-            <de_DE>Bitte Münzen einwerfen</de_DE>
-            <it_IT>Inserire le monete</it_IT>
+			<de_AT>Bitte Bezahlen:</de_AT>
+            <en_GB>Please pay:</en_GB>
+            <fr_FR>Veuillez payer :</fr_FR>
+            <de_DE>Bitte Bezahlen:</de_DE>
+            <it_IT>Si prega di pagare:</it_IT>
 		</Text>
        <Text textnr="0x31">
            <de_AT>Parkende: </de_AT>
@ -2300,7 +2300,14 @@
            <en_GB>BACK</en_GB>
            <fr_FR>ARRIÈRE</fr_FR>
            <it_IT> </it_IT>
-		</Text>
+        </Text>
+        <Text textnr="0x48">
+            <de_DE>WEITER</de_DE>
+            <de_AT>WEITER</de_AT>
+            <en_GB>NEXT</en_GB>
+            <fr_FR>PLUS</fr_FR>
+            <it_IT>AVANTI</it_IT>
+        </Text>
 		<Text name="user_message_01" textnr="0x81"> 
 			<de_AT>Falsche Karte!</de_AT>
            <en_GB>Wrong card!</en_GB>