Merge branch 'master' of https://git.mimbach49.de/GerhardHoffmann/customer_741

etc/atb/SystemControl.ini

@@ -1,85 +0,0 @@
-[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

etc/atbapp/ATBAPP.ini

@@ -68,7 +68,7 @@ enable=0
 [PAYMENT]
 currencySymbol=€
 currencyISOCode=EUR
-cashVariant=NoCash
+cashVariant=Coins
 paymentPointInTime=poa
 useDecimal=yes
 

etc/atbapp/states/APP_States_741_Linsinger.xml

@@ -15,19 +15,12 @@
     <APP_STATE name="PRODUCT_SELECTION">
         <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
         <!-- no coin payment -->
-        <EVENT name="BUTTON_VEHICLE_1" resultingState="ENTER_EMP_NR" setPaymentType="CARD" setProduct="FOOD_STAMP:3"/>
-        <EVENT name="BUTTON_VEHICLE_2" resultingState="ENTER_EMP_NR" setPaymentType="CARD" setProduct="FOOD_STAMP:5"/>
-        <EVENT name="BUTTON_VEHICLE_3" resultingState="ENTER_EMP_NR" setPaymentType="CARD" setProduct="FOOD_STAMP:10"/>
+        <EVENT name="BUTTON_VEHICLE_1" resultingState="CARD_PAYMENT" setPaymentType="CARD" setProduct="DAY_TICKET_ADULT"/>
+        <EVENT name="BUTTON_VEHICLE_2" resultingState="CARD_PAYMENT" setPaymentType="CARD" setProduct="DAY_TICKET_TEEN"/>
+        <EVENT name="BUTTON_VEHICLE_3" resultingState="CARD_PAYMENT" setPaymentType="CARD" setProduct="DAY_TICKET_TEEN"/>
         <SCREEN name="PRODUCT_SELECTION"/>
     </APP_STATE>
     
-    <APP_STATE name="ENTER_EMP_NR">
-        <ENTRY_TASK name="REQUEST_INITIAL_PRICE"/>
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="NEW_PIN" resultingState="CARD_PAYMENT"/>
-        <SCREEN name="RESIDENT"/>
-    </APP_STATE>
-    
     <APP_STATE name="CARD_PAYMENT">
         <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
         <ENTRY_TASK name="REQUEST_CC_START_TRANSACTION"/>

etc/atbapp/text/HMI_Texte_741_Linsinger.xml

@@ -664,9 +664,9 @@
     </Screen>
 	<Screen name="CreditCard3" screennr="0x37">
         <Text textnr="0x30">
-			<de_DE>Marken entnehmen.</de_DE>
-            <de_AT>Marken entnehmen.</de_AT>
-			<en_GB>Take your stamps.</en_GB>
+			<de_DE>Ticket entnehmen.</de_DE>
+            <de_AT>Ticket entnehmen.</de_AT>
+			<en_GB>Take your ticket.</en_GB>
             <fr_FR>Prenez billet.</fr_FR>
             <it_IT>Prendere Biglietto.</it_IT>
 		</Text>
@@ -832,34 +832,6 @@
         </Text>
     </Screen>
 	<Screen name="Residents" screennr="0x3a">
-        <Text textnr="0x30">
-            <de_AT>Mitarbeiternummer:</de_AT>
-            <en_GB>Employee number:</en_GB>
-            <fr_FR> </fr_FR>
-            <de_DE>Mitarbeiternummer:</de_DE>
-            <it_IT> </it_IT>
-        </Text>
-        <Text textnr="0x35">
-            <de_DE>ABBRUCH</de_DE>
-            <de_AT>ABBRUCH</de_AT>
-            <en_GB>CANCEL</en_GB>
-            <fr_FR>ANNULER</fr_FR>
-            <it_IT>ANNULLA</it_IT>	
-        </Text>
-        <Text textnr="0x36">
-            <de_DE>ZURÜCK</de_DE>
-            <de_AT>ZURÜCK</de_AT>
-            <en_GB>BACK</en_GB>
-            <fr_FR>ARRIÈRE</fr_FR>
-            <it_IT> </it_IT>
-        </Text>
-        <Text textnr="0x37">
-            <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>
 	</Screen>
 	<Screen name="Goodbye2" screennr="0x3b">
         <Text textnr="0x31">
@@ -1230,33 +1202,33 @@
 	</Screen>
 	<Screen name="DefButtons2" screennr="0x84">
         <Text textnr="0x30">
-			<de_AT>Bitte wählen Sie…</de_AT>
-			<en_GB>Please, choose…</en_GB>
+			<de_AT>Bitte wählen sie den Tarif…</de_AT>
+			<en_GB>Please, choose tariff…</en_GB>
             <fr_FR>Sélectionnez le tarif…</fr_FR>
-            <de_DE>Bitte wählen Sie…</de_DE>
+            <de_DE>Bitte wählen sie den Tarif…</de_DE>
             <it_IT>Prego selezionare la tariffa…</it_IT>
         </Text>
         <Text textnr="0x31">
-            <de_AT>3 MARKEN</de_AT>
-            <en_GB>3 FOOD STAMPS</en_GB>
+            <de_AT>ERWACHSENE</de_AT>
+            <en_GB>ADULT</en_GB>
             <fr_FR> </fr_FR>
-            <de_DE>3 MARKEN</de_DE>
+            <de_DE>ERWACHSENE</de_DE>
             <it_IT> </it_IT>
         </Text>
         <Text textnr="0x32">
-            <de_AT>5 MARKEN</de_AT>
-            <en_GB>5 FOOD STAMPS</en_GB>
+            <de_AT>JUGENDLICHE (11-16J)</de_AT>
+            <en_GB>Teenagers (11-16Y)</en_GB>
             <fr_FR> </fr_FR>
-            <de_DE>5 MARKEN</de_DE>
+            <de_DE>JUGENDLICHE (11-16J)</de_DE>
             <it_IT> </it_IT>
         </Text>
         <Text textnr="0x33">
-            <de_AT>10 MARKEN</de_AT>
-            <en_GB>10 FOOD STAMPS</en_GB>
+            <de_AT> </de_AT>
+            <en_GB> </en_GB>
             <fr_FR> </fr_FR>
-            <de_DE>10 MARKEN</de_DE>
+            <de_DE> </de_DE>
             <it_IT> </it_IT>
-        </Text>
+		</Text>
         <Text textnr="0x34">
             <de_AT> </de_AT>
             <en_GB> </en_GB>

etc/psa_config/DC2C_conf.json

@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"NVT Linsinger",
+"issued":"18.10.2023 15:00",
+"custNum":741,
+"machNum":1,
+"borough":1,
+"zone":1,
+"alias":0,
+"location":"Kantine"
+}
+

etc/psa_config/DC2C_device.json

@@ -1,10 +1,10 @@
 {
 "title":"DC2C_device",
 "project":"NVT Linsinger",
-"issued":"02.07.2024 15:00",
+"issued":"18.10.2023 15:00",
 "printer":1,
 "coinChk":3,
-"mifRd":2,
+"mifRd":1,
 "solarPwr":0,
 "modem":0,
 "creditCard":1,
@@ -23,13 +23,5 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refundPrint":1,
-"billWarnLev":300,
-"billFullLev":380,
-"housing":1,
-"changeCoins":1,
-"dev_aux1":0,
-"dev_aux2":0,
-"dev_aux3":0,
-"dev_aux4":0
+"refPrint":1
 }

etc/psa_config/DC2C_print2.json

@@ -22,14 +22,14 @@
 "vari":"Dynamic01",
 "feed":"nl",
 "text":"Lauf. Nr. ",
-"vari":"Dynamic02",
+"vari":"Dynamic03",
 "feed":"nl",
 "vari":"date ge",
 "feed":"nl",
 "feed":"nl",
 "feed":"nl",
 "feed":"nl",
-"feed":"cut"
+"feed":"part"
 
 
 }

etc/psa_update/opkg_commands

@@ -4,13 +4,17 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
+opkg info atbqt
+opkg info atbupdatetool
 opkg update
 opkg install prepare-update
-#
-opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
-opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
-opkg --cache /var/cache/opkg --download-only upgrade atbqt
-#
-opkg --cache /var/cache/opkg upgrade atb-dc-libraries
-opkg --cache /var/cache/opkg upgrade atb-plugin-dc
-opkg --cache /var/cache/opkg upgrade atbqt
+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