remove/update holidays

usual saturday/sunday has to be paid for
Set service time 20:00 -> 22:00. Holidays have to be paid for.
2025-04-25 11:51:05 +02:00 · 2025-04-25 11:48:52 +02:00 · 2025-04-23 14:04:00 +02:00 · 2025-04-23 13:58:03 +02:00 · 2025-04-23 13:55:56 +02:00 · 2025-04-23 13:37:15 +02:00
25 changed files with 33861 additions and 519 deletions
--- a/etc/atb/SystemControl.ini
+++ b/etc/atb/SystemControl.ini
@@ -0,0 +1,66 @@
+[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
+size=3
+
+[BACKLIGHT]
+SensorMax=3500
+SensorMin=0
+curve=1
+dimLowValue=499
+dimMax=100
+dimMin=20
+inputBrightness=30
+
+[COMMON]
+startBacklightController=true
+startMQTTController=false
+startMonitoringController=false
+startSuspendController=true
+
+[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
--- a/etc/atbapp/ATBAPP.ini
+++ b/etc/atbapp/ATBAPP.ini
@@ -122,3 +122,4 @@ debug=1
 parity=0
 sleep=0
 stopBits=1
+terminalPowerOnOffHours="06:00:00,22:00:00"
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@@ -228,9 +228,18 @@
    
    <APP_STATE name="CARD_PAYMENT_CONFIRM">
        <ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
-        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="GOODBYE_PAYMENT_OK"/>
+        <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>
+    
+    <APP_STATE name="ASK_RECEIPT">
+        <ENTRY_TASK name="TIMER" timeout="8000"/>
+        <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"/>
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
@@ -490,7 +490,7 @@
                        <ru_RU>Максимальная сумма билета</ru_RU>
                </Text>
 		<Text name="user_message_04" textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                        <en_GB>Minimum parking fee</en_GB>
                        <de_DE>Mindestparkgebühr</de_DE>
                        <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -600,7 +600,7 @@
                        <ru_RU>Максимальная сумма билета</ru_RU>
                </Text>
 		<Text name="user_message_04" textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                        <en_GB>Minimum parking fee</en_GB>
                        <de_DE>Mindestparkgebühr</de_DE>
                        <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -782,7 +782,7 @@
                        <ru_RU>Максимальная сумма билета</ru_RU>
                </Text>
 		<Text name="user_message_04"  textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                        <en_GB>Minimum parking fee</en_GB>
                        <de_DE>Mindestparkgebühr</de_DE>
                        <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -846,7 +846,7 @@
            <ru_RU>Максимальная сумма билета</ru_RU>
        </Text>
 		<Text name="user_message_04"  textnr="0x84">
-            <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+            <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
            <en_GB>Minimum parking fee</en_GB>
            <de_DE>Mindestparkgebühr</de_DE>
            <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -898,10 +898,10 @@
 	      <ru_RU> </ru_RU>
 	  </Text>
 	  <Text textnr="0x34">
-	      <lt_LT>Spausdinti bilietą</lt_LT>
-	      <en_GB>Request Ticket?</en_GB>
-	      <de_DE>Parkschein anfordern?</de_DE>
-	      <ru_RU>Заказ билета</ru_RU>
+          <lt_LT>Spausdinti kvitą?</lt_LT>
+          <en_GB>Print receipt?</en_GB>
+          <de_DE>Quittung drucken?</de_DE>
+          <ru_RU>Распечатать квитанцию?</ru_RU>
 	  </Text>
 	  <Text textnr="0x35">
 	      <lt_LT>ATŠAUKTI</lt_LT>
@@ -916,10 +916,10 @@
 	      <ru_RU>ДА</ru_RU>
 	  </Text>
 	  <Text textnr="0x37">
-          <lt_LT>Permoka!</lt_LT>
-          <en_GB>Overpaid!</en_GB>
-          <de_DE>Überbezahlt!</de_DE>
-          <ru_RU>Переплата!</ru_RU>
+          <lt_LT> </lt_LT>
+          <en_GB> </en_GB>
+          <de_DE> </de_DE>
+          <ru_RU> </ru_RU>
 	  </Text>
 	  <Text name="user_message_01" textnr="0x81">	      
 	      <lt_LT>Permoka!</lt_LT>
@@ -934,12 +934,80 @@
 	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
 	  </Text>
 	  <Text name="user_message_04"  textnr="0x84">
-	      <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+	      <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
 	      <en_GB>Minimum parking fee</en_GB>
 	      <de_DE>Mindestparkgebühr</de_DE>
 	      <ru_RU>Минимальная плата за парковку</ru_RU>
 	  </Text>
 	</Screen>
+    <Screen name="OVERPAID" screennr="0xB1">
+        <Text textnr="0x30">
+            <lt_LT>Stovėjimo laiko pabaiga:</lt_LT>
+            <en_GB>End of Parking time:</en_GB>
+            <de_DE>Parkende:</de_DE>
+            <ru_RU>Окончание времени парковки:</ru_RU>
+        </Text>
+        <Text textnr="0x31">
+            <lt_LT> </lt_LT>
+            <en_GB> </en_GB>
+            <de_DE> </de_DE>
+            <ru_RU> </ru_RU>
+        </Text>
+        <Text textnr="0x32">
+            <lt_LT>Suma:</lt_LT>
+            <en_GB>Amount:</en_GB>
+            <de_DE>Betrag:</de_DE>
+            <ru_RU>Сумма:</ru_RU>
+        </Text>	
+        <Text textnr="0x33">
+            <lt_LT> </lt_LT>
+            <en_GB> </en_GB>
+            <de_DE> </de_DE>
+            <ru_RU> </ru_RU>
+        </Text>
+        <Text textnr="0x34">
+            <lt_LT>Spausdinti kvitą?</lt_LT>
+            <en_GB>Print receipt?</en_GB>
+            <de_DE>Quittung drucken?</de_DE>
+            <ru_RU>Распечатать квитанцию?</ru_RU>
+        </Text>
+        <Text textnr="0x35">
+            <lt_LT>ATŠAUKTI</lt_LT>
+            <en_GB>NO</en_GB>
+            <de_DE>NEIN</de_DE>
+            <ru_RU>НЕТ</ru_RU>
+        </Text>	  
+        <Text textnr="0x36">
+            <lt_LT>TĘSTI</lt_LT>
+            <en_GB>YES</en_GB>
+            <de_DE>JA</de_DE>
+            <ru_RU>ДА</ru_RU>
+        </Text>
+        <Text textnr="0x37">
+            <lt_LT> </lt_LT>
+            <en_GB> </en_GB>
+            <de_DE> </de_DE>
+            <ru_RU> </ru_RU>
+        </Text>
+        <Text name="user_message_01" textnr="0x81">	      
+            <lt_LT>Permoka!</lt_LT>
+            <en_GB>Overpaid</en_GB>
+            <de_DE>Überbezahlt</de_DE>
+            <ru_RU>Переплата!</ru_RU>
+        </Text>
+        <Text name="user_message_02"  textnr="0x82">
+            <lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT>
+            <en_GB>Reached maximum number of coins.!</en_GB>
+            <de_DE>Maximalanzahl der Münzen erreicht!</de_DE>
+            <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
+        </Text>
+        <Text name="user_message_04"  textnr="0x84">
+            <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
+            <en_GB>Minimum parking fee</en_GB>
+            <de_DE>Mindestparkgebühr</de_DE>
+            <ru_RU>Минимальная плата за парковку</ru_RU>
+        </Text>
+    </Screen>
 	<Screen name="Welcome2" screennr="0x3d">
                <Text textnr="0x30">
 			<lt_LT>Sveiki!</lt_LT>
@@ -2219,7 +2287,7 @@
                        <ru_RU>Принимаются только платежные карточки…</ru_RU>
                </Text>
 		<Text name="user_message_04"  textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                        <en_GB>Minimum parking fee</en_GB>
                        <de_DE>Mindestparkgebühr</de_DE>
                        <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2425,7 +2493,7 @@
 	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
 	  </Text>
 	  <Text name="user_message_04"  textnr="0x84">
-	      <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+	      <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
 	      <en_GB>Minimum parking fee</en_GB>
 	      <de_DE>Mindestparkgebühr</de_DE>
 	      <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2500,5 +2568,61 @@
            <de_DE>880012344</de_DE>
            <ru_RU>880012344</ru_RU>
        </Text>
-    </Screen>	
+    </Screen>
+    <Screen name="COMMON_USER_MESSAGES" screennr="0xF3">
+        <Text  name="PAY_MORE" textnr="0x30">
+            <lt_LT>Mokėti daugiau</lt_LT>
+            <en_GB>pay more…</en_GB>
+            <de_DE>mehr zahlen…</de_DE>
+            <ru_RU>платить больше</ru_RU>
+        </Text>
+        <Text  name="PAY_APPROPRIATELY" textnr="0x31">
+            <lt_LT>suteikite tikslią sumą…</lt_LT>
+            <en_GB>give the exact money…</en_GB>
+            <de_DE>passend zahlen…</de_DE>
+            <ru_RU>предоставьте точную сумму…</ru_RU>
+        </Text>
+        <Text  name="NO_CANGE" textnr="0x32">
+            <lt_LT> </lt_LT>
+            <en_GB> </en_GB>
+            <de_DE> </de_DE>
+            <ru_RU> </ru_RU>
+        </Text>
+        <Text  name="MINIMUM_PRICE" textnr="0x33">
+            <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
+            <en_GB>Minimum parking fee</en_GB>
+            <de_DE>Mindestparkgebühr</de_DE>
+            <ru_RU>Минимальная плата за парковку</ru_RU>
+        </Text>
+        <Text  name="MAXIMUM_PRICE" textnr="0x34">
+            <lt_LT>Maksimali bilieto suma</lt_LT>
+            <en_GB>Max. Ticket amount</en_GB>
+            <de_DE>Höchstparkdauer erreicht</de_DE>
+            <ru_RU>Максимальная сумма билета</ru_RU>
+        </Text>
+        <Text  name="CARDPAYMENT_ONLY" textnr="0x35">
+            <lt_LT> </lt_LT>
+            <en_GB> </en_GB>
+            <de_DE> </de_DE>
+            <ru_RU> </ru_RU>
+        </Text>
+        <Text  name="CASHPAYMENT_ONLY" textnr="0x36">
+            <lt_LT> </lt_LT>
+            <en_GB> </en_GB>
+            <de_DE> </de_DE>
+            <ru_RU> </ru_RU>
+        </Text>
+        <Text  name="OVERPAID" textnr="0x37">
+            <lt_LT>Permoka!</lt_LT>
+            <en_GB>Overpaid</en_GB>
+            <de_DE>Überbezahlt</de_DE>
+            <ru_RU>Переплата!</ru_RU>
+        </Text>
+        <Text  name="MAXIMUM_NUM_OF_COINS" textnr="0x38">
+            <lt_LT> </lt_LT>
+            <en_GB> </en_GB>
+            <de_DE> </de_DE>
+            <ru_RU> </ru_RU>
+        </Text>
+    </Screen>
 </ATB_Text>
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,12 +1,12 @@
 {	     
 "title":"DC2C_cash  ",
-"Project":"Klaipeda",
-"Version":"6.7.1-2024-06-24",
-"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,0],
-"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,0],
-"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],
+"Project":"Klaipeda, Palanga",
+"Version":"1.0.0-2024-10-11",
+"CoinDenom(15..0)":[200,100,50,20,10,0,0,0,0,0,0,0,0,0,0,3],
+"CoinValue(15..0)":[200,100,50,20,10,0,0,0,0,0,0,0,0,0,0,3],
+"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1],
 "ExchangeRate":1,
-"TokenChannel":6,
+"TokenChannel":1,
 "BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "LocalTaxRate":21,
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -17,7 +17,7 @@
 "autoOpen":1,
 "AccPrint":1,
 "DorPrint":0,
-"TokPrint":0,
+"TokPrint":2,
 "CBwarnLev":1600,
 "CBerrLev":1900,
 "BattWarn":11800,
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -8,13 +8,14 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
+"styl":"size 00",
 "text":"Sumokėta grynais:", 
 "vari":"Dynamic02",
 "styl":"size 21",
-"text":"Geltonoji zona",
+"text":"Raudonoji zona",
 "feed":"nl",
 "styl":"size 10",
-"text":"tarifas 60 ct/h",
+"text":"tarifas 1,50Eur/h",
 "feed":"nl",
 "styl":"size 00",
 "feed":"nl",
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -4,17 +4,17 @@
 "Version":"1.1.3-2024-08-08",
 "styl":"font 24",
 "styl":"csiz 08",
+"styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"styl":"size 00",
 "text":"Sumokėta kortele:", 
 "vari":"Dynamic02",
 "styl":"size 21",
-"text":"Geltonoji zona",
+"text":"Raudonoji zona",
 "feed":"nl",
 "styl":"size 10",
-"text":"tarifas 60 ct/h",
+"text":"tarifas 1,50Eur/h",
 "feed":"nl",
 "styl":"size 00",
 "feed":"nl",
--- a/etc/psa_config/DC2C_print30.json
+++ b/etc/psa_config/DC2C_print30.json
@@ -0,0 +1,44 @@
+{
+"title":"DC2C_pri30",
+"Project":"Klaipeda",
+"Version":"1.0.0-2024-10-11",
+"text":"",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"styl":"size 11",
+"feed":"nl",
+"text":"TestTicket:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"text":"CustomerNr.: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
+"vari":"manu",	
+"text":"Adresas: ",
+"vari":"location",	
+"feed":"nl",
+"text":"**Klaipėdos keleivinis transportas ",
+"feed":"nl",
+"text":" * * * * * * * * * ",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,7 +1,7 @@
 {
  "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
-  "Info"    : "Red Zone",
+  "Version" : "2.1.0-2024-12-13T12:36:12+02:00",
+  "Info"    : "Red Zone (center)",
  "Currency": [
    {
      "pcu_id": 2,
@@ -27,18 +27,23 @@
    {
      "pme_id": 4,
      "pme_label": "steps"
+    },
+    {
+      "pme_id": 5,
+      "pme_label": "unified",
+      "comment": "deprecated"
    }
  ],
  "TimeRange" : [
    {
      "time_range_id": 1,
-      "time_range_from": "22:00:00",
+      "time_range_from": "20:00:00",
      "time_range_to": "08:00:00"
    },
    {
      "time_range_id": 2,
      "time_range_from": "08:00:00",
-      "time_range_to": "22:00:00"
+      "time_range_to": "20:00:00"
    },
    {
      "time_range_id": 3,
@@ -46,171 +51,11 @@
      "time_range_to": "08:00:00"
    }
  ],
-  "Prepaid": [
-    {
-        "prepaid_id": 1,
-        "prepaid_anytime": true,
-        "prepaid_never": false
-    },
-    {
-        "prepaid_id": 2,
-        "prepaid_anytime": false,
-        "prepaid_never": true
-    },
-    {
-        "prepaid_id": 3,
-        "prepaid_anytime": false,
-        "prepaid_never": false,
-        "prepaid_static_start": "22:00:00",
-        "prepaid_static_end": "08:00:00"
-    }
-  ],
-  "CarryOver": [
-    {
-      "carry_over_id" : 1,
-      "carry_over_week" : [
-          {
-            "carry_over_day" : 1,
-            "carry_over_day_comment" : "Monday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 2,
-            "carry_over_day_comment" : "Tuesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 3,
-            "carry_over_day_comment" : "Wednesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 4,
-            "carry_over_day_comment" : "Thursday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 5,
-            "carry_over_day_comment" : "Friday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 6,
-            "carry_over_day_comment" : "Saturday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 7,
-            "carry_over_day_comment" : "Sunday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          }
-      ]
-    },
-    {
-      "carry_over_id" : 2,
-      "carry_over_week" : [
-          {
-            "carry_over_day" : 1,
-            "carry_over_day_comment" : "Monday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 2,
-            "carry_over_day_comment" : "Tuesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 3,
-            "carry_over_day_comment" : "Wednesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 4,
-            "carry_over_day_comment" : "Thursday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 5,
-            "carry_over_day_comment" : "Friday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 6,
-            "carry_over_day_comment" : "Saturday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 7,
-            "carry_over_day_comment" : "Sunday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          }
-      ]
-    }
-  ],
  "PaymentOption": [
    {
      "pop_id": 1049,
      "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
+      "pop_payment_method_id": 5,
      "pop_min_time": 12,
      "comment_pop_min_time": "12mins -> 30 cent",
      "pop_max_time": 840,
@@ -221,15 +66,9 @@
      "pop_minus_steps": 1,
      "pop_time_step_config": 1,
      "pop_time_step_config_comment": "STATIC",
-      "pop_allow_overpay": false,
+      "pop_allow_overpay": true,
      "pop_carry_over": 1,
-      "pop_carry_over_option_id": 1,
-      "pop_prepaid_option_id" : 3,
-      "pop_carry_over_time_range": 1,
-      "pop_carry_over_start_time_range": 2,
-      "pop_carry_over_end_time_range": 3,
-      "pop_business_hours": 163584,
-      "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
+      "pop_business_hours": 0
    }
  ],
  "PaymentRate": [
@@ -2346,73 +2185,666 @@
 	"pun_label": "840 min"
    }
  ],
-  "WeekDaysWorktime": [
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 627,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 7,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 1,
-      "pye_label": "May - September",
-      "pye_start_month": 5,
-      "pye_start_day": 1,
-      "pye_end_month": 9,
-      "pye_end_day": 15
-    },
-    {
-      "pye_id": 2,
-      "pye_label": "September - April",
-      "pye_start_month": 9,
-      "pye_start_day": 16,
-      "pye_end_month": 4,
-      "pye_end_day": 30
-    }
-  ]
+    "Monday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Tuesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Wednesday" : [{
+        "2025-01-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Thursday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Friday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Saturday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Sunday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 360,
+                            "service_start" : "14:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }]
 }
--- a/etc/psa_tariff/tariff01_sommer.json
+++ b/etc/psa_tariff/tariff01_sommer.json
--- a/etc/psa_tariff/tariff01_winter.json
+++ b/etc/psa_tariff/tariff01_winter.json
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
--- a/etc/psa_tariff/tariff02_sommer.json
+++ b/etc/psa_tariff/tariff02_sommer.json
--- a/etc/psa_tariff/tariff02_winter.json
+++ b/etc/psa_tariff/tariff02_winter.json
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
--- a/etc/psa_tariff/tariff03_sommer.json
+++ b/etc/psa_tariff/tariff03_sommer.json
--- a/etc/psa_tariff/tariff03_winter.json
+++ b/etc/psa_tariff/tariff03_winter.json
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
--- a/etc/psa_tariff/tariff04_sommer.json
+++ b/etc/psa_tariff/tariff04_sommer.json
--- a/etc/psa_tariff/tariff04_winter.json
+++ b/etc/psa_tariff/tariff04_winter.json
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
--- a/etc/psa_tariff/tariff05_sommer.json
+++ b/etc/psa_tariff/tariff05_sommer.json
--- a/etc/psa_tariff/tariff05_winter.json
+++ b/etc/psa_tariff/tariff05_winter.json
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -8,13 +8,23 @@ opkg update
 opkg install prepare-update
 #
 opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc
 opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-cc-asyncpos
 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 ptu5-systemcontroller
+opkg --cache /var/cache/opkg --download-only install ptu-package-versions
+opkg --cache /var/cache/opkg --download-only install wbdw
+opkg --cache /var/cache/opkg --download-only upgrade ptu5-sysconfig
 #
 opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg upgrade libmobilisis-calc
 opkg --cache /var/cache/opkg upgrade atb-plugin-cc-asyncpos
 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 ptu5-systemcontroller
+opkg --cache /var/cache/opkg install ptu-package-versions
+opkg --cache /var/cache/opkg install wbdw
+opkg --cache /var/cache/opkg upgrade ptu5-sysconfig
Author	SHA1	Message	Date
Gerhard Hoffmann	430d68b113	remove/update holidays	2025-04-25 11:51:05 +02:00
Gerhard Hoffmann	0debdcab84	usual saturday/sunday has to be paid for	2025-04-25 11:48:52 +02:00
Gerhard Hoffmann	d3d3fc769b	Set service time 20:00 -> 22:00. Holidays have to be paid for.	2025-04-23 14:04:00 +02:00
Gerhard Hoffmann	ee68ebeeb0	Settings are identical to tariff04-winter	2025-04-23 13:58:03 +02:00
Gerhard Hoffmann	1f862da800	Settings are identical to tariff01-sommer	2025-04-23 13:55:56 +02:00
Gerhard Hoffmann	f1834421b6	updated version	2025-04-23 13:37:15 +02:00
Gerhard Hoffmann	3ce04a9a50	Tariff file for Yellow Zone (Zone 2), summer term. Difference to winter: service time 18:00 -> 22:00 and different holidays.	2025-04-23 13:27:50 +02:00
Gerhard Hoffmann	1a9db481e5	Tariff file for Red Zone (Zone 1), summer term. Only difference to winter: service time 20:00 -> 22:00.	2025-04-23 13:07:36 +02:00
Gerhard Hoffmann	7082f7f2da	Tariff files as used before 1st May	2025-04-23 13:06:29 +02:00
Siegfried Siegert	7b53ed3668	ATBAPP: Text: add screen OVERPAID (0xB1)	2025-03-05 10:59:54 +01:00
Siegfried Siegert	623155394d	ATBAPP: Text: common user messages (0xF3)	2025-03-05 10:46:52 +01:00
Gerhard Hoffmann	843ddb9679	free-time from 12:00-14:00 for mon-fri	2025-01-07 12:53:30 +01:00
Gerhard Hoffmann	49ef97ec96	Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone1	2025-01-07 11:26:38 +01:00
Gerhard Hoffmann	3f0b812e68	free of charge from 12:00-14:00	2025-01-07 11:25:56 +01:00
Siegfried Siegert	46aadbb3ec	set terminalPowerOnOffHours: 6:00-22:00	2024-12-18 15:44:47 +01:00
Siegfried Siegert	65f2ee2cf9	Revert "set terminalPowerOnOffHours: 6:00-22:00" This reverts commit `d324449cc6`.	2024-12-18 15:43:51 +01:00
Gerhard Hoffmann	2c835d2906	fixed typo: cach -> cache	2024-12-18 11:58:17 +01:00
Gerhard Hoffmann	a2ed372bf4	Zone5 to be used as update-help: machines in zone5: 10, 11, 31	2024-12-16 13:31:35 +01:00
Gerhard Hoffmann	ae4605ebc8	Add special handling for 2025-01-01: 2 hours are free of charge.	2024-12-13 12:56:52 +01:00
Gerhard Hoffmann	d324449cc6	set terminalPowerOnOffHours: 6:00-22:00	2024-12-13 12:51:50 +01:00
Siegfried Siegert	456a3807d9	opkg upgrade ptu5-sysconfig	2024-12-11 07:47:39 +01:00
Siegfried Siegert	1a18749793	opkg: install ptu-package-versions ... ... upgrade does not work for packages which are not installed	2024-12-09 17:36:01 +01:00
Siegfried Siegert	928da6929c	Systemcontrol: switch on suspendcontroller	2024-12-09 12:44:43 +01:00
Siegfried Siegert	9c5c9c2c2f	SystemControl: inputBrightness = 30	2024-12-04 12:54:55 +01:00
Siegfried Siegert	c49185913d	opkg fix: install wbdw	2024-12-03 16:36:30 +01:00
Siegfried Siegert	0d3816ebef	opkg: install wbdw	2024-12-03 16:12:41 +01:00
Gerhard Hoffmann	d4222fead7	Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone1	2024-11-15 12:42:03 +01:00
Gerhard Hoffmann	ed85579f97	Copied from Palanga (336)	2024-11-15 12:41:25 +01:00
Siegfried Siegert	85e6068803	Text: screen 0x3c ASC_RECEIPT	2024-11-05 16:38:25 +01:00
Siegfried Siegert	36af7686a7	Text: Fix typo	2024-11-05 16:38:11 +01:00
Siegfried Siegert	16da59b1e1	Selling process / Card payment: ask for printing receipt	2024-11-05 16:37:57 +01:00
Gerhard Hoffmann	8ebe1e5781	Update files (provided by Thomas)	2024-10-31 12:10:26 +01:00
Gerhard Hoffmann	e4cc57b9ef	Add libmobilisis for download/update	2024-10-08 12:51:37 +02:00
Gerhard Hoffmann	1aeb3e8c71	Update tariff-files for winter term	2024-10-02 16:00:58 +02:00
Gerhard Hoffmann	9ff14ffc00	First step for new tariffs: adapt carry-over-times	2024-09-13 10:20:41 +02:00
Gerhard Hoffmann	05ad2996bb	Change tariff files according to new settings sent from Eugenijus	2024-09-12 15:40:33 +02:00
Gerhard Hoffmann	47f8a46f22	Update as provided by T.Sax.	2024-09-05 08:07:52 +02:00
Gerhard Hoffmann	42afac8760	Add atb-plugin-calculateprice-mobilisis	2024-08-30 11:28:43 +02:00
Gerhard Hoffmann	5a9b6ad5e8	Update jsons as provided by T.Sax	2024-08-27 16:16:54 +02:00
Gerhard Hoffmann	44767d6d55	Set DorPrint=0	2024-08-27 08:44:57 +02:00
Gerhard Hoffmann	6014f6eaf3	updated by th.sax	2024-08-22 15:30:38 +02:00
Gerhard Hoffmann	466ec590e3	new file provided by th.sax	2024-08-22 13:27:08 +02:00
Gerhard Hoffmann	807655e34b	smd 08-20 only with CP1257	2024-08-22 08:23:11 +02:00
Gerhard Hoffmann	2759d66114	Add settinge time-step-config and pop-allow-overpay	2024-08-21 18:01:02 +02:00
Gerhard Hoffmann	3a49c00a37	Add settinge time-step-config and pop-allow-overpay	2024-08-21 17:56:12 +02:00
Siegfried Siegert	3475fb9eab	HMI: Textupdate	2024-08-09 14:01:22 +02:00
Siegfried Siegert	883f7a7612	Textupdate: screen Overpaid	2024-08-09 13:45:44 +02:00
Siegfried Siegert	5ae8634882	ATBAPP: states: request for overpayment	2024-08-09 11:49:02 +02:00
Siegfried Siegert	4030e7c5ea	Merge branch 'zg1/zone1' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone1	2024-08-08 17:01:47 +02:00
Siegfried Siegert	fd3124ef1b	Update text: "Wait for card terminal"	2024-08-08 16:59:21 +02:00
Gerhard Hoffmann	e186c2a168	Update jsons-files as provided by Thomas	2024-08-08 10:32:14 +02:00
Siegfried Siegert	b5f1b00587	Revert "ATBAPP: change printerLocale" This reverts commit `0e46dece2b`.	2024-08-08 10:19:25 +02:00
Siegfried Siegert	0e46dece2b	ATBAPP: change printerLocale	2024-08-08 08:16:28 +02:00
Siegfried Siegert	09f7322dd0	Setup opkg-commands	2024-08-07 17:17:08 +02:00
Siegfried Siegert	0fe2a973fe	ATBAPP: states: skip printing bank receipt	2024-08-07 16:45:25 +02:00
Siegfried Siegert	1b611462de	ATBAPP: add current states	2024-08-07 16:45:18 +02:00
Siegfried Siegert	40ffa76f49	ATBAPP: setPrinterEncoding and printerLocale	2024-08-07 16:40:01 +02:00
Siegfried Siegert	17c66fcb2d	Merge branch 'zg1/zone1' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone1	2024-08-07 16:36:34 +02:00
Gerhard Hoffmann	8915803583	Tariff for Zone 2 (Yellow) in Kleipeda	2024-08-01 17:21:18 +02:00
Gerhard Hoffmann	4a0111ce74	Tariff for Zone 1 (Red) in Kleipeda	2024-08-01 17:09:15 +02:00
Gerhard Hoffmann	b268100e34	Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone1	2024-07-19 10:31:36 +02:00
Gerhard Hoffmann	23eb6ca07b	Add JSON files as saved on ATB server	2024-07-19 10:30:43 +02:00
Siegfried Siegert	5674fd9165	Merge branch 'zg1/zone1' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone1	2024-07-19 09:59:02 +02:00
Siegfried Siegert	42b26ee0ca	Merge branch 'master' into zg1/zone1	2024-07-19 09:58:49 +02:00
Siegfried Siegert	518817f400	Merge branch 'master' of ptu-config.atb-comm.de:ATB/customer_335	2024-07-19 09:58:23 +02:00
Siegfried Siegert	5c0fb02903	Add PTU5 configuration	2024-07-19 09:57:47 +02:00
Gerhard Hoffmann	251ef75027	Add tariff for Yellow Zone	2024-07-18 15:36:42 +02:00
Gerhard Hoffmann	6475afa172	Provide empty file as start	2024-07-17 14:47:32 +02:00
Gerhard Hoffmann	2808d340bc	Merge branch 'master' of https://ptu-config.atb-comm.de/ATB/customer_335	2024-07-03 13:08:51 +02:00
Gerhard Hoffmann	17357ab472	Sync with zg1/zone1	2024-07-03 13:07:31 +02:00