Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_741 into zg1/zone1

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

etc/atbapp/ATBAPP.ini

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

etc/atbapp/states/APP_States_741_Linsinger.xml

@@ -22,6 +22,7 @@
     </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"/>

etc/atbapp/text/HMI_Texte_741_Linsinger.xml

@@ -664,9 +664,9 @@
     </Screen>
 	<Screen name="CreditCard3" screennr="0x37">
         <Text textnr="0x30">
-			<de_DE>Ticket entnehmen.</de_DE>
-            <de_AT>Ticket entnehmen.</de_AT>
-			<en_GB>Take your ticket.</en_GB>
+			<de_DE>Marken entnehmen.</de_DE>
+            <de_AT>Marken entnehmen.</de_AT>
+			<en_GB>Take your stamps.</en_GB>
             <fr_FR>Prenez billet.</fr_FR>
             <it_IT>Prendere Biglietto.</it_IT>
 		</Text>

etc/psa_config/DC2C_print02.json

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

etc/psa_update/opkg_commands

@@ -8,13 +8,8 @@ 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
-# opkg remove apism
-# opkg install apism
 opkg info apism
 opkg info atbqt
 opkg info atbupdatetool