fixed typo: cach -> cache

... upgrade does not work for packages which are not installed

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

etc/atbapp/ATBAPP.ini

@@ -1,115 +1,7 @@
-[COMMON]
-com_port_name=/dev/ttyS1
-com_baud_rate=9600
-lang1=lt_LT
-lang2=en_GB
-lang3=de_DE
-lang4=ru_RU
-lang5=
-
-defaultLanguage=1
-CharacterSet="ISO 8859-13"
-
-showInfoButton=false
-showHelpButton=false
-
-#useLanguage=[128+][64+][32+][16]
-useLanguage=240
-#usePayment=[128+][64+][32+][16]
-usePayment=96
-#useVehicle=[128+][64+][32+][16+][8]
-useVehicle=192
-#useProduct=[128+][64+][32+][16+][8]
-useProduct=192
-
-textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
-logfile=/var/log/atbqt.log
-alternativeLogoFile=/opt/app/ATBAPP/logo/logo_klaipeda2.png
-
-feature_Log=off
-feature_TouchFeedback=off
-feature_StartButton=on
-feature_selfOOO=off
-feature_ShowParkingTime=off
-
-suspend_methode=sysfs
-suspend_program=
-suspend_time=8
-
-touch_feedback_gpio=121
-touch_feedback_on_value=1
-touch_feedback_off_value=0
-
-#ooo_mode={useDisk|otherMachine}
-ooo_mode=otherMachine
-sellTimeout_time=60
-
-showInfoButton=false
-showHelpButton=false
-
-useAppStates=1
-statefile=/opt/app/ATBAPP/states/APP_States.xml
-
-[SCREENCONFIG]
-sc_31="1,1,0"
-sc_33="1,0,1"
-sc_3F="1,0,0"
-sc_40="1,0,1"
-sc_41="1,0,0"
-sc_35="0,0,0"
-sc_51="1,0,1"
-sc_52="1,0,0"
-sc_53="1,0,0"
-
-
-[PLUGINS]
-CCPlugin=AsyncPOS_CCPlugin
-CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
-DeviceControllerPlugin=ATBDeviceControllerPlugin
-
-
-[IngenicoISelf_CCPlugin]
-debug=1
-PortName=/dev/ttymxc0
-ZVT=DE
-sleep=1
-sleepExtended=1
-Currency=HUF
-
-
-[TCP_CONTROL]
-enable=1
-
-
-[PAYMENT]
-currencySymbol=€
-currencyISOCode=EUR
-cashVariant=CoinsAndNotes
-paymentPointInTime=poa
-useDecimal=yes
-
-
-[MOBILISIS_CalculatePricePlugin]
-useDebug=1
-tariffFileName=/etc/psa_tariff/tariff01.json
-
 [ATBDeviceControllerPlugin]
+printerEncoding=Windows-1257
+printerLocale=lt_LT
 serialPort=ttymxc2
-printerEncoding="Windows-1257"
-printerLocale="lt_LT"
-
-[TCP_ZVT_CCPlugin]
-CurrencyCode=EUR
-debug=1
-IP=192.168.6.242
-Port=22000
-SSL=0
-ZVT=DE
-sleep=1
-printIntermediateStatus=1
-Password=277296
-NumberOfChars=37
-dcHours="0"
 
 [AsyncPOS_CCPlugin]
 APAK=8AC304380E0E476BA2558B75DB9E2516
@@ -122,3 +14,102 @@ debug=1
 parity=0
 sleep=0
 stopBits=1
+terminalPowerOnOffHours="06:00:00,22:00:00"
+
+[COMMON]
+%23ooo_mode={useDisk|otherMachine}
+%23useLanguage=[128+][64+][32+][16]
+%23usePayment=[128+][64+][32+][16]
+%23useProduct=[128+][64+][32+][16+][8]
+%23useVehicle=[128+][64+][32+][16+][8]
+CharacterSet=ISO 8859-13
+alternativeLogoFile=/opt/app/ATBAPP/logo/logo_Palanga.png
+com_baud_rate=9600
+com_port_name=/dev/ttyS1
+defaultLanguage=1
+feature_DBusDisplayControl=on
+feature_DBusDisplayDimLow=off
+feature_DBusSuspendControl=off
+feature_Log=off
+feature_ShowParkingTime=off
+feature_StartButton=on
+feature_TouchFeedback=off
+feature_selfOOO=off
+lang1=lt_LT
+lang2=en_GB
+lang3=de_DE
+lang4=ru_RU
+lang5=
+logfile=/var/log/atbqt.log
+ooo_alternativeLocation=
+ooo_mode=otherMachine
+ooo_serviceEmail=
+ooo_serviceNumber=
+sellTimeout_time=60
+showHelpButton=false
+showInfoButton=false
+statefile=/etc/atbapp/states/APP_States.xml
+suspend_methode=sysfs
+suspend_program=
+suspend_time=8
+textfile=/etc/atbapp/text/HMI_Texte.xml
+touch_feedback_gpio=121
+touch_feedback_off_value=0
+touch_feedback_on_value=1
+useAppStates=1
+useLanguage=240
+usePayment=96
+useProduct=192
+useVehicle=192
+
+[IngenicoISelf_CCPlugin]
+Currency=HUF
+PortName=/dev/ttymxc0
+ZVT=DE
+debug=1
+sleep=1
+sleepExtended=1
+
+[MOBILISIS_CalculatePricePlugin]
+tariffFileName=/etc/psa_tariff/tariff01.json
+useDebug=1
+
+[PAYMENT]
+cashVariant=CoinsAndNotes
+currencyISOCode=EUR
+currencySymbol=€
+paymentPointInTime=poa
+useDecimal=yes
+useHonestPayment=on
+
+[PLUGINS]
+CCPlugin=AsyncPOS_CCPlugin
+CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
+DeviceControllerPlugin=ATBDeviceControllerPlugin
+
+[SCREENCONFIG]
+sc_31="1,1,0"
+sc_33="1,0,1"
+sc_35="0,0,0"
+sc_3F="1,0,0"
+sc_40="1,0,1"
+sc_41="1,0,0"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
+
+[TCP_CONTROL]
+enable=1
+
+[TCP_ZVT_CCPlugin]
+CurrencyCode=EUR
+IP=192.168.6.242
+NumberOfChars=37
+Password=277296
+Port=22000
+SSL=0
+ZVT=DE
+dcHours=0
+debug=1
+printIntermediateStatus=1
+sleep=1

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 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"/>

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>
+          <lt_LT>Spausdinti kvitą?</lt_LT>
-	      <en_GB>Request Ticket?</en_GB>
+          <en_GB>Print receipt?</en_GB>
-	      <de_DE>Parkschein anfordern?</de_DE>
+          <de_DE>Quittung drucken?</de_DE>
-	      <ru_RU>Заказ билета</ru_RU>
+          <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>
+          <lt_LT> </lt_LT>
-          <en_GB>Overpaid!</en_GB>
+          <en_GB> </en_GB>
-          <de_DE>Überbezahlt!</de_DE>
+          <de_DE> </de_DE>
-          <ru_RU>Переплата!</ru_RU>
+          <ru_RU> </ru_RU>
 	  </Text>
 	  <Text name="user_message_01" textnr="0x81">	      
 	      <lt_LT>Permoka!</lt_LT>
@@ -934,7 +934,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>
@@ -2219,7 +2219,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 +2425,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>

etc/psa_config/DC2C_cash.json

@@ -1,12 +1,12 @@
 {	     
 "title":"DC2C_cash  ",
-"Project":"Klaipeda",
+"Project":"Klaipeda, Palanga",
-"Version":"6.7.1-2024-06-24",
+"Version":"1.0.0-2024-10-11",
-"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,0],
+"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,5,0,0,0,0,0,0,0,0,0,0],
+"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,0],
+"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,

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,

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",

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",

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

etc/psa_tariff/tariff01.json

@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
+  "Version" : "2.1.0-2024-12-13T12:36:12+02:00",
-  "Info"    : "Red Zone",
+  "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_payment_method_id": 5,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
       "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_business_hours": 0
-      "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"
     }
   ],
   "PaymentRate": [
@@ -2346,73 +2185,533 @@
 	"pun_label": "840 min"
     }
   ],
-  "WeekDaysWorktime": [
+    "Monday" : [{
+        "default" : {
+            "payment_settings" : [
                 {
-      "pwd_id": 621,
+                    "min_time" : 12,
-      "pwd_period_week_day_id": 36,
+                    "max_time" : 840,
-      "pwd_period_day_in_week_id": 1,
+                    "max_price": 2100,
-      "pwd_time_from": "08:00:00",
+                    "min_price": 30
-      "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": [
+            "prepaid_settings" : [
                 {
-      "pye_id": 1,
+                    "prepaid_ranges" : [
-      "pye_label": "May - September",
+                        {
-      "pye_start_month": 5,
+                            "prepaid_id" : 1,
-      "pye_start_day": 1,
+                            "prepaid_duration": 480,
-      "pye_end_month": 9,
+                            "prepaid_start" : "00:00:00",
-      "pye_end_day": 15
+                            "prepaid_end": "08:00:00"
                         },
                         {
-      "pye_id": 2,
+                            "prepaid_id" : 2,
-      "pye_label": "September - April",
+                            "prepaid_duration": 240,
-      "pye_start_month": 9,
+                            "prepaid_start" : "20:00:00",
-      "pye_start_day": 16,
+                            "prepaid_end": "24:00:00"
-      "pye_end_month": 4,
-      "pye_end_day": 30
                         }
                     ]
+                }
+            ],
+            "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": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08: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": 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": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08: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": 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": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08: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": 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": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08: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": 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": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08: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": 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": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08: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": 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": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }]
 }

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