Compare commits

..

22 Commits

Author SHA1 Message Date
59fb165384
opkg install release 2024-06-18 2024-07-03 09:04:04 +02:00
76263d4e49
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_741 into zg1/zone1 2024-07-03 09:03:16 +02:00
8e96898e08 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_741 into zg1/zone1 2024-07-02 17:15:38 +02:00
09a34ce310 Updated as provided by Dennis 2024-07-02 17:12:05 +02:00
a0cf7cd40f
Update release 20240517-1 2024-05-21 08:53:29 +02:00
a4e7889790
Add SystemControl.ini (monitoring switched on) 2024-03-11 16:36:32 +01:00
9f539603db
DC2C_devices: mifare-reader is allways on 2024-03-11 16:32:38 +01:00
374e8b5e89
Update text 2024-03-11 13:59:44 +01:00
593c4f219c
CashVariant is "NoCash" 2024-03-11 12:58:31 +01:00
d790627731
Update print template 2 2024-03-11 12:16:45 +01:00
f7c9bdeb11
Rename printer json files 2024-03-08 11:59:37 +01:00
8bbbd49181
DC: no coin checker 2024-03-08 11:56:53 +01:00
424213f0ab
Add 'cut' to template 2 2024-03-08 11:07:25 +01:00
6f2fd8cdec
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_741 into zg1/zone1 2024-03-08 11:05:30 +01:00
ce50052c0f
ATBAPP: update states 2024-03-08 11:04:17 +01:00
b05bb72461 Update files as provided by Thomas 2024-03-01 08:44:49 +01:00
264be7b126
ATBAPP: states add enter employee number 2024-02-28 18:33:33 +01:00
d8a45ad9bc
ATBAPP: Textupdate 2024-02-28 18:31:19 +01:00
3553497b21
Merge branch 'master' into zg1/zone1 2024-02-28 17:23:11 +01:00
319ae2464e add json files for linsinger 2024-02-28 13:39:16 +01:00
bdf040f423 Use FOOD_STAMP product 2024-02-28 12:01:24 +01:00
6dc9eef518 First draft of tariff for Linsinger Maschinenbau. 2023-12-11 09:53:27 +01:00
15 changed files with 161 additions and 49 deletions

85
etc/atb/SystemControl.ini Normal file
View File

@ -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

View File

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

View File

@ -15,12 +15,19 @@
<APP_STATE name="PRODUCT_SELECTION">
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
<!-- no coin payment -->
<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"/>
<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"/>
<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"/>

View File

@ -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>
@ -832,6 +832,34 @@
</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">
@ -1202,33 +1230,33 @@
</Screen>
<Screen name="DefButtons2" screennr="0x84">
<Text textnr="0x30">
<de_AT>Bitte wählen sie den Tarif</de_AT>
<en_GB>Please, choose tariff</en_GB>
<de_AT>Bitte wählen Sie</de_AT>
<en_GB>Please, choose…</en_GB>
<fr_FR>Sélectionnez le tarif…</fr_FR>
<de_DE>Bitte wählen sie den Tarif</de_DE>
<de_DE>Bitte wählen Sie</de_DE>
<it_IT>Prego selezionare la tariffa…</it_IT>
</Text>
<Text textnr="0x31">
<de_AT>ERWACHSENE</de_AT>
<en_GB>ADULT</en_GB>
<de_AT>3 MARKEN</de_AT>
<en_GB>3 FOOD STAMPS</en_GB>
<fr_FR> </fr_FR>
<de_DE>ERWACHSENE</de_DE>
<de_DE>3 MARKEN</de_DE>
<it_IT> </it_IT>
</Text>
<Text textnr="0x32">
<de_AT>JUGENDLICHE (11-16J)</de_AT>
<en_GB>Teenagers (11-16Y)</en_GB>
<de_AT>5 MARKEN</de_AT>
<en_GB>5 FOOD STAMPS</en_GB>
<fr_FR> </fr_FR>
<de_DE>JUGENDLICHE (11-16J)</de_DE>
<de_DE>5 MARKEN</de_DE>
<it_IT> </it_IT>
</Text>
<Text textnr="0x33">
<de_AT> </de_AT>
<en_GB> </en_GB>
<de_AT>10 MARKEN</de_AT>
<en_GB>10 FOOD STAMPS</en_GB>
<fr_FR> </fr_FR>
<de_DE> </de_DE>
<de_DE>10 MARKEN</de_DE>
<it_IT> </it_IT>
</Text>
</Text>
<Text textnr="0x34">
<de_AT> </de_AT>
<en_GB> </en_GB>

View File

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

View File

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

View File

@ -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"
}

View File

@ -4,17 +4,13 @@
# opkg-commands added to this file will be executed by 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
# opkg remove apism
# opkg install apism
opkg info apism
opkg info atbqt
opkg info atbupdatetool
#
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