Adapt format needed by new tariff library

PSA-config: trigger reinstall DC-json files
This is for machines which supposedly lost there device-controller configurations.
2025-02-03 12:36:02 +01:00 · 2025-01-27 09:58:39 +01:00 · 2025-01-27 09:55:47 +01:00 · 2024-12-02 10:13:38 +01:00 · 2024-12-02 10:13:14 +01:00 · 2024-11-27 09:46:24 +01:00
11 changed files with 85 additions and 227 deletions
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ATB_APP_STATES version="1.1">
    <APP_STATE name="IDLE">
-        <EVENT name="BUTTON_START" resultingState="LICENSEPLATE_INPUT"/>
+        <!-- <EVENT name="BUTTON_START" resultingState="PRODUCT_SELECTION"/> -->
+        <EVENT name="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
        <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
        <SCREEN name="START"/>
        <MODE name="IDLE"/>
@@ -12,18 +13,33 @@
        <MODE name="IDLE"/>
    </APP_STATE>
    
-    <APP_STATE name="LICENSEPLATE_INPUT">
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="ShortTimeParking"/>
-        <SCREEN name="LICENSEPLATE_INPUT"/>
+    <APP_STATE name="SETUP_SELL_STATE">
+        <ENTRY_TASK name="TIMER" timeout="500"/>
+        <EVENT name="TIMEOUT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
    </APP_STATE>   
+    
    <APP_STATE name="PRODUCT_SELECTION">
        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-       <EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP"   setProduct="ShortTimeParking"/>
-       <EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DayTicket"/>
+        <EVENT name="BUTTON_VEHICLE_1" resultingState="LICENSEPLATE_INPUT" setProduct="SHORT_TERM_PARKING" setCheckFeature="SKIP_TICKET_PRINT"/>
+        <EVENT name="BUTTON_VEHICLE_2" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
        <SCREEN name="PRODUCT_SELECTION"/>
    </APP_STATE>
    
+    <!--
+    <APP_STATE name="SKIP_TICKET_PRINT_TEST">
+        <ENTRY_TASK name="PRINT_LOG" text="APP_STATE name=SKIP_TICKET_PRINT_TEST"/>
+        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
+        <EVENT name="CHECK_TRUE"  resultingState="LICENSEPLATE_INPUT"/>
+        <EVENT name="CHECK_FALSE" resultingState="PARKTIME_SELECTION"/>
+    </APP_STATE>
+    -->
+    
+    <APP_STATE name="LICENSEPLATE_INPUT">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
+        <SCREEN name="LICENSEPLATE_INPUT"/>
+    </APP_STATE>
+   
   <APP_STATE name="PAYMENT_SELECTION">
       <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
       <EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
@@ -62,7 +78,7 @@
    <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_SUCCESS" resultingState="CHECK_PAPERLESS_CARD"/>
        <EVENT name="RECEIVED_CARD_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
        <EVENT name="BUTTON_CANCEL" resultingState="USER_CC_ABORT"/>
        <SCREEN name="CC_PAYMENT"/>
@@ -71,8 +87,8 @@
    <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_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
-        <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_FINISHED"  resultingState="CHECK_PAPERLESS_CASH"/>
 	<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
 	<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
        <SCREEN name="COIN_PAYMENT"/>
@@ -80,8 +96,8 @@
    <APP_STATE name="CASH_PAYMENT_INPUT">
        <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
        <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
-        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
-        <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_FINISHED"  resultingState="CHECK_PAPERLESS_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"/>
@@ -94,7 +110,7 @@
        <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
    </APP_STATE>
    <APP_STATE name="CASH_OVERPAYED">
-        <ENTRY_TASK name="REQUEST_ISAMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
        <ENTRY_TASK name="CASH_ABORT"/>
        <ENTRY_TASK name="TIMER" timeout="3000"/>
        <EVENT name="TIMEOUT" resultingState="IDLE"/>
@@ -114,6 +130,19 @@
        <SCREEN name="BUSY"/>
    </APP_STATE>
    -->
+    
+    <APP_STATE name="CHECK_PAPERLESS_CASH">
+        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
+        <EVENT name="CHECK_TRUE"  resultingState="FINALISE_CASH_PAYMENT" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
+        <EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CASH"/>
+    </APP_STATE>
+    <APP_STATE name="CHECK_PAPERLESS_CARD">
+        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
+        <EVENT name="CHECK_TRUE"  resultingState="CARD_PAYMENT_CONFIRM" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
+        <EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CARD"/>
+    </APP_STATE>
+    
+    
    <APP_STATE name="PRINT_TICKET_CASH">
        <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
        <EVENT name="PRINT_TICKET_FINISHED" resultingState="FINALISE_CASH_PAYMENT"/>
@@ -137,20 +166,28 @@

    <APP_STATE name="CARD_PAYMENT_CONFIRM">
        <ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
-        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="PRINT_RECEIPT"/>
+        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="ASK_RECEIPT"/>
        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR"   resultingState="CC_PAYMENT_ERROR"/>
    </APP_STATE>
+    <APP_STATE name="ASK_RECEIPT">
+        <ENTRY_TASK name="TIMER" timeout="6000"/>
+        <EVENT name="TIMEOUT" resultingState="GOODBYE_PAYMENT_OK"/>
+        <EVENT name="BUTTON_YES" resultingState="PRINT_RECEIPT"/>
+        <EVENT name="BUTTON_NO"  resultingState="GOODBYE_PAYMENT_OK"/>
+        <SCREEN name="ASK_RECEIPT"/>
+    </APP_STATE>
    <APP_STATE name="PRINT_RECEIPT">
        <ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
        <EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
        <EVENT name="PRINT_RECEIPT_ERROR" resultingState="PRINT_TICKET_FAILED"/>
+        <SCREEN name="PRINT_RECEIPT"/>
    </APP_STATE>
    
    <APP_STATE name="FINALISE_CASH_PAYMENT">
        <ENTRY_TASK name="CASH_COLLECT"/>
        <EVENT name="RECEIVED_CASH_CHANGE_BACK" resultingState="GIVE_CHANGE"/>
        <EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
-        <!-- TODO: hangle changer Error -->
+        <!-- TODO: handle changer Error -->
        <!-- no screen change here -->
    </APP_STATE>   
    <APP_STATE name="GIVE_CHANGE">
@@ -161,7 +198,7 @@
        <ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
        <ENTRY_TASK name="TIMER" timeout="2000"/>
        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="GOODBYE_PAYMENT_OK"/>
+        <SCREEN name="GOODBYE_3" note="green_hook"/>
    </APP_STATE>   
    
    <APP_STATE name="CC_PAYMENT_ERROR">
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
@@ -1000,14 +1000,14 @@
      <en_GB>PLATE ENTRY\n(not required for display in the vehicle)</en_GB>
      <fr_FR>D'IDENTIFICATION\n(pas nécessaire de l'afficher dans le véhicule)</fr_FR>
      <nl_NL> </nl_NL>
-      <es_ES>ENTRADA DE PLACA\n(no necesaria para exhibir en el vehículo)</es_ES>
+      <es_ES>ENTRADA DE PLACA (no necesaria para exhibir en el vehículo)</es_ES>
    </Text>
    <Text textnr="0x32">
      <de_DE>PAPIERTICKET\n(zur Auslage im Fahrzeug)</de_DE>
      <en_GB>PAPER TICKET\n(for display in the vehicle)</en_GB>
      <fr_FR>BILLET PAPIER\n(à présenter dans le véhicule)</fr_FR>
      <nl_NL> </nl_NL>
-      <es_ES>BILLETE DE PAPEL\n(para exponer en el vehículo)</es_ES>
+      <es_ES>BILLETE DE PAPEL (para exponer en el vehículo)</es_ES>
    </Text>
    <Text textnr="0x33">
      <de_DE> </de_DE>
--- a/etc/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
--- a/etc/psa_config/DC2C_conf21.json
+++ b/etc/psa_config/DC2C_conf21.json
@@ -1,12 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"Schoenau",
-"version":"15.11.2023 00001",
-"custNum":332,
-"machNum":21,
-"borough":0,
-"zone":0,
-"alias":0,
-"location":"Vorplatz 1"
-}
-
--- a/etc/psa_config/DC2C_conf25.json
+++ b/etc/psa_config/DC2C_conf25.json
@@ -1,12 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"Schoenau",
-"version":"15.11.2023 00001",
-"custNum":332,
-"machNum":25,
-"borough":0,
-"zone":0,
-"alias":0,
-"location":"Vorplatz 1"
-}
-
--- a/etc/psa_config/DC2C_conf26.json
+++ b/etc/psa_config/DC2C_conf26.json
@@ -1,12 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"Schoenau",
-"version":"15.11.2023 00001",
-"custNum":332,
-"machNum":26,
-"borough":0,
-"zone":0,
-"alias":0,
-"location":"Vorplatz 1"
-}
-
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,7 +1,7 @@
 {
-"Title":"DC2C_device",
+"title":"DC2C_device",
 "Project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"6.7.1-2025-01-27",
 "printer":1,
 "coinChk":3,
 "mifRd":1,
--- a/etc/psa_config/DC2C_device_json.netz
+++ b/etc/psa_config/DC2C_device_json.netz
@@ -1,31 +0,0 @@
-{
-"title":"DC2C_device",
-"Project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
-"printer":1,
-"coinChk":3,
-"mifRd":1,
-"solarPwr":0,
-"modem":1,
-"creditCard":1,
-"escrow":0,
-"RejMotor":0,
-"shutter":1,
-"billRd":1,
-"vaultLock":0,
-"autoAlarm":1,
-"autoOpen":1,
-"AccPrint":1,
-"DorPrint":1,
-"TokPrint":1,
-"CBwarnLev":1600,
-"CBerrLev":1900,
-"BattWarn":11800,
-"BattErr":11200,
-"foreign":1,
-"refundPrint":1,
-"billWarnLev":300,
-"billFullLev":380,
-"housing":1
-
-}
--- a/etc/psa_config/DC2C_device_json.solar
+++ b/etc/psa_config/DC2C_device_json.solar
@@ -1,31 +0,0 @@
-{
-"title":"DC2C_device",
-"Project":"Schoenau",
-"Version":"6.7.2-2024-06-17",
-"printer":1,
-"coinChk":3,
-"mifRd":1,
-"solarPwr":1,
-"modem":1,
-"creditCard":1,
-"escrow":0,
-"RejMotor":0,
-"shutter":1,
-"billRd":1,
-"vaultLock":0,
-"autoAlarm":1,
-"autoOpen":1,
-"AccPrint":1,
-"DorPrint":1,
-"TokPrint":1,
-"CBwarnLev":1600,
-"CBerrLev":1900,
-"BattWarn":11800,
-"BattErr":11200,
-"foreign":1,
-"refundPrint":1,
-"billWarnLev":300,
-"billFullLev":380,
-"housing":1
-
-}
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -58,10 +58,10 @@
      "pop_payment_method_id": 5,
      "pop_min_time": 60,
      "comment_pop_min_time": "60mins -> 200 cent",
-      "pop_max_time": 14400,
+      "pop_max_time": 1440,
      "comment_pop_max_time": "1440mins = 24h -> 5 euros",
      "pop_min_price": 200,
-      "pop_max_price": 5000,
+      "pop_max_price": 500,
      "pop_plus_steps": 1,
      "pop_minus_steps": 1,
      "pop_time_step_config": 1,
@@ -86,51 +86,6 @@
        "pra_payment_option_id": 1049,
        "pra_payment_unit_id": 2,
        "pra_price": 500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 3,
-        "pra_price": 1000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 4,
-        "pra_price": 1500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 5,
-        "pra_price": 2000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 6,
-        "pra_price": 2500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 7,
-        "pra_price": 3000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 8,
-        "pra_price": 3500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 9,
-        "pra_price": 4000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 10,
-        "pra_price": 4500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 11,
-        "pra_price": 5000
    }
  ],
  "Duration": [
@@ -145,42 +100,6 @@
    {
 	"pun_duration": 1440,
 	"pun_id": 2
-    },
-    {
-	"pun_duration": 2880,
-	"pun_id": 3
-    },
-    {
-	"pun_duration": 4320,
-	"pun_id": 4
-    },
-    {
-	"pun_duration": 5760,
-	"pun_id": 5
-    },
-    {
-	"pun_duration": 7200,
-	"pun_id": 6
-    },
-    {
-	"pun_duration": 8640,
-	"pun_id": 7
-    },
-    {
-	"pun_duration": 10080,
-	"pun_id": 8
-    },
-    {
-	"pun_duration": 11520,
-	"pun_id": 9
-    },
-    {
-	"pun_duration": 12960,
-	"pun_id": 10
-    },
-    {
-	"pun_duration": 14400,
-	"pun_id": 11
    }
  ],
    "Monday" : [{
@@ -188,8 +107,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -218,8 +137,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -248,8 +167,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -278,8 +197,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -308,8 +227,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -338,8 +257,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -368,8 +287,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -4,13 +4,13 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
-# opkg update
-# opkg install prepare-update
+#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 --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 --cache /var/cache/opkg upgrade atb-dc-libraries
+#opkg --cache /var/cache/opkg upgrade atb-plugin-dc
+#opkg --cache /var/cache/opkg upgrade atbqt
Author	SHA1	Message	Date
Gerhard Hoffmann	165db10ed8	Adapt format needed by new tariff library	2025-02-03 12:36:02 +01:00
Siegfried Siegert	f13f3b5bf2	PSA-config: trigger reinstall DC-json files This is for machines which supposedly lost there device-controller configurations.	2025-01-27 09:58:39 +01:00
Siegfried Siegert	77b1a77a4d	Deaktivate sofware-update	2025-01-27 09:55:47 +01:00
Siegfried Siegert	466f3d6db5	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone1	2024-12-02 10:13:38 +01:00
Siegfried Siegert	430fb7eef9	Add /etc/atb/SystemControl.ini	2024-12-02 10:13:14 +01:00
Gerhard Hoffmann	b22fdf9e4a	Change price for 1st hour: 5 Euro -> 10 Euro	2024-11-27 09:46:24 +01:00
Gerhard Hoffmann	342e58cbb1	Improve cut for ticket	2024-11-22 11:49:18 +01:00
Gerhard Hoffmann	a1755d305c	Add tariff for BUS	2024-11-06 10:39:42 +01:00
Siegfried Siegert	04c549baa9	Textupdate: "Wait for Terminal"	2024-08-02 10:30:51 +02:00
Gerhard Hoffmann	15c4bbd8a0	Fix (Thomas): Title -> title	2024-06-17 15:43:36 +02:00
Gerhard Hoffmann	2486d71c34	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_332 into zg1/zone1	2024-06-17 11:48:20 +02:00
Gerhard Hoffmann	7551b6b969	Update Jsons for Schoenau as provided by Thomas	2024-06-17 11:46:52 +02:00
Siegfried Siegert	2184c40256	Update release 2024-06-17	2024-06-17 09:57:33 +02:00
Siegfried Siegert	b8a4b41818	Update release 2024-06-10	2024-06-10 12:52:25 +02:00
Siegfried Siegert	0d24a80cb1	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone1	2024-05-28 08:24:28 +02:00
Siegfried Siegert	06a92a8330	Update release 20240521	2024-05-27 16:33:23 +02:00
Gerhard Hoffmann	0722fd1f13	Use cent-values: 5000,2000,1000,500 instead of euro-values.	2024-05-07 13:18:21 +02:00
Siegfried Siegert	c019713572	Fix: remove unused DC json files	2024-05-07 12:34:38 +02:00
Siegfried Siegert	128e4d9d14	Fix: opkg commands	2024-05-07 11:43:20 +02:00
Siegfried Siegert	db907417ef	OPKG: release 20240506	2024-05-07 11:29:10 +02:00
Siegfried Siegert	5fe227185c	Update ATBQT/States: skip LicencePlate input	2024-05-06 15:35:55 +02:00
Siegfried Siegert	ee29bb5c44	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone1	2024-05-06 12:40:11 +02:00
Siegfried Siegert	05845b16da	Update ATBQT/States: - product selection: with licenscplate results in paperless ticket - ask for printing bank receipt	2024-05-06 12:28:32 +02:00
Gerhard Hoffmann	2667955a41	keep only 'opkg update'	2024-05-06 12:23:06 +02:00
Gerhard Hoffmann	f56fd7f8f8	Update DC2C_cash/device.json as provided by Thomas	2024-05-06 11:08:16 +02:00
Gerhard Hoffmann	b7d1bebdb8	Set version date (23/04) -> trigger git	2024-04-23 12:36:17 +02:00
Siegfried Siegert	03fd98d6e7	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone1	2024-04-17 16:40:47 +02:00
Gerhard Hoffmann	d07207b659	sync with master	2024-04-12 09:13:00 +02:00
Gerhard Hoffmann	c86624c2ac	add tariff101.json for zone101 (solar)	2024-04-10 10:28:39 +02:00
Gerhard Hoffmann	2218b83896	Add ptu5-systemcontroller using upgrade	2024-04-10 10:12:38 +02:00
Gerhard Hoffmann	7a327382bb	Added opkg install tariff-config-332	2024-04-09 17:01:25 +02:00
Gerhard Hoffmann	1f809d6027	testing info	2024-04-09 14:27:24 +02:00
Gerhard Hoffmann	4c1f8240eb	set info for testing	2024-04-09 14:09:18 +02:00
Gerhard Hoffmann	f6e3774ea8	Set version to 09.04.2024	2024-04-09 13:23:46 +02:00
Gerhard Hoffmann	e694ef3567	set info for testing	2024-04-09 13:20:05 +02:00
Gerhard Hoffmann	2ec9dad2ae	set info for testing	2024-04-09 13:12:31 +02:00
Gerhard Hoffmann	5136871a12	set info for testing	2024-04-09 12:58:48 +02:00
Gerhard Hoffmann	8dc4985df9	set info for testing	2024-04-09 12:54:09 +02:00
Gerhard Hoffmann	1f50d2aa0e	set info for testing	2024-04-09 12:47:45 +02:00
Gerhard Hoffmann	5712939d06	set info for testing	2024-04-09 12:41:14 +02:00
Gerhard Hoffmann	722f503952	set version for testing	2024-04-09 12:32:42 +02:00
Gerhard Hoffmann	3be4de01f4	update tariff for zone1 and zone2: new prices and extension of parking times	2024-04-08 16:24:19 +02:00
Gerhard Hoffmann	ad111e3edf	update version to 05.04.2024	2024-04-05 13:51:04 +02:00
Gerhard Hoffmann	3f7e79a4eb	Fix typo: Koenigssee	2024-03-28 09:16:16 +01:00
Siegfried Siegert	3b52491e7b	ATBAPP: vending process: set product names	2024-03-19 11:09:22 +01:00
Siegfried Siegert	6f1017e995	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone1	2024-03-19 11:02:50 +01:00
Gerhard Hoffmann	45a94370d6	Set version to 1.1.1 for testing.	2024-03-15 11:36:42 +01:00
Gerhard Hoffmann	89ea76ee73	Set pop_max_time: 10080, pop_multi_hour_price: 8	2024-03-15 10:40:13 +01:00
Siegfried Siegert	3f3cba534b	ATBAPP: Add customer vending process description (states)	2024-03-13 14:04:01 +01:00
Gerhard Hoffmann	533973bf30	sync with master-branch	2024-03-13 13:11:54 +01:00
Gerhard Hoffmann	4f033fec1e	Install without upgrade, only direct installs: opkg update opkg install prepare-update opkg install atbupdatetool opkg install mxt-touch-reset opkg install apism opkg info apism opkg info atbupdatetool	2024-01-24 14:48:52 +01:00
Gerhard Hoffmann	80ee7e4d0f	Add opkg install mxt-touch-reset to fix touch-screen issues.	2024-01-24 12:40:54 +01:00
Gerhard Hoffmann	52f8368a50	remove euro-sign -> atbapp sends it. set version to 00002	2024-01-24 10:58:05 +01:00
Gerhard Hoffmann	7d656d5379	Set version to 00008 for testing	2024-01-24 10:56:32 +01:00
Gerhard Hoffmann	d8dbcdba66	Set version to 00006 for testing	2023-12-01 11:06:16 +01:00
Gerhard Hoffmann	732e32d83e	Set version to 00006 for testing	2023-12-01 10:44:03 +01:00
Gerhard Hoffmann	24dfc249ec	Set version to 00005 for testing	2023-12-01 10:12:42 +01:00
Gerhard Hoffmann	1c6eea1873	Set version to 00004 for testing	2023-12-01 09:52:54 +01:00
Gerhard Hoffmann	d7bbf482c4	Set version to 1.0.15 for testing	2023-11-29 14:21:16 +01:00
Gerhard Hoffmann	e3e161d08d	Set version to 1.0.14 for testing	2023-11-29 13:59:38 +01:00
Gerhard Hoffmann	1cde14926b	Set version to 1.0.12 for testing	2023-11-29 13:52:47 +01:00
Gerhard Hoffmann	85bdd001fa	Set version to 1.0.11 for testing	2023-11-29 13:48:41 +01:00
Gerhard Hoffmann	b909ff0205	Set version to 1.0.10 for testing	2023-11-29 13:44:44 +01:00
Gerhard Hoffmann	c10741325a	Set version to 1.0.9 for testing	2023-11-29 13:41:18 +01:00
Gerhard Hoffmann	6c49b90bf7	Set version to 1.0.8 for testing	2023-11-29 13:26:30 +01:00
Gerhard Hoffmann	76c3a0b336	Set version to 1.0.7 for testing	2023-11-29 13:14:19 +01:00
Gerhard Hoffmann	93bf67135f	Set version to 1.0.6 for testing	2023-11-29 13:09:47 +01:00
Gerhard Hoffmann	8b5586f600	Set version to 1.0.5 for testing	2023-11-29 13:03:31 +01:00
Gerhard Hoffmann	5ce3f483a2	Set version to 1.0.4 for testing	2023-11-29 12:55:26 +01:00
Gerhard Hoffmann	b37a620e00	Set version to 1.0.3 for testing	2023-11-29 12:48:19 +01:00
Gerhard Hoffmann	48000c8010	Set version to 1.0.2 fot testing	2023-11-29 12:04:01 +01:00
Gerhard Hoffmann	f3c8cda2f8	Set version to 1.0.1 fot testing	2023-11-29 11:39:21 +01:00
Gerhard Hoffmann	40f1468f67	set version to 00003	2023-11-29 10:23:07 +01:00
Gerhard Hoffmann	d7ac519c90	Set version to 00002	2023-11-29 09:21:09 +01:00
Gerhard Hoffmann	6d43d1255f	Fix typo: 5670 -> 5760.	2023-11-28 10:26:57 +01:00
Gerhard Hoffmann	c09b626b80	Add new files (used for new templates)	2023-11-24 13:40:34 +01:00
Gerhard Hoffmann	423c7637d3	Revert version to original state: 0001	2023-11-24 09:40:38 +01:00
Gerhard Hoffmann	6ef8c3006e	Remove euro sign	2023-11-24 09:34:25 +01:00
Gerhard Hoffmann	2dec7ec263	Switch back to original setting (machine-id 1000, zone 0)	2023-11-24 09:32:40 +01:00