sync with brancht zg1/zone101

add tariff101.json for zone101 (solar)
remove separate solar/net.jsons
2024-04-12 09:11:01 +02:00 · 2024-04-10 10:27:41 +02:00 · 2024-04-10 10:17:11 +02:00 · 2024-04-10 10:12:09 +02:00 · 2024-04-09 17:00:35 +02:00 · 2024-04-09 15:09:40 +02:00
18 changed files with 661 additions and 41 deletions
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ATB_APP_STATES version="1.1">
+    <APP_STATE name="IDLE">
+        <EVENT name="BUTTON_START" resultingState="LICENSEPLATE_INPUT"/>
+        <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
+        <SCREEN name="START"/>
+        <MODE name="IDLE"/>
+    </APP_STATE>
+    <APP_STATE name="FREE_PARK">
+        <EVENT name="SELL_ENABLE" resultingState="IDLE"/>
+        <SCREEN name="START"/>
+        <MODE name="IDLE"/>
+    </APP_STATE>
+    
+    <APP_STATE name="LICENSEPLATE_INPUT">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="ShortTimeParking"/>
+        <SCREEN name="LICENSEPLATE_INPUT"/>
+    </APP_STATE>
+   <APP_STATE name="PRODUCT_SELECTION">
+       <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+       <EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP"   setProduct="ShortTimeParking"/>
+       <EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DayTicket"/>
+       <SCREEN name="PRODUCT_SELECTION"/>
+   </APP_STATE>
+   
+   <APP_STATE name="PAYMENT_SELECTION">
+       <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+       <EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
+       <EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setPaymentType="CASH" setCashInputMode="PAY_DOWN"/>
+       <EVENT name="BUTTON_PAYMETHOD_3" resultingState="CARD_PAYMENT" setPaymentType="CARD"/>
+       <EVENT name="BUTTON_PAYMETHOD_4" resultingState="IDLE"/>
+       <SCREEN name="PAYMENT_SELECTION"/>
+   </APP_STATE>  
+
+    <APP_STATE name="PARKTIME_SELECTION">
+        <ENTRY_TASK name="REQUEST_INITIAL_PRICE"/>
+        <EVENT name="BUTTON_PLUS_STEP"  resultingState="PARKTIME_SELECTION_PLUS"/>
+        <EVENT name="BUTTON_MINUS_STEP" resultingState="PARKTIME_SELECTION_MINUS"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_BACK" resultingState="LICENSEPLATE_INPUT"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PAYMENT_SELECTION"/>
+        <SCREEN name="PARKTIME_SELECTION"/>
+    </APP_STATE>
+    <APP_STATE name="PARKTIME_SELECTION_PLUS">
+        <ENTRY_TASK name="REQUEST_STEP_UP_PRICE"/>
+        <EVENT name="BUTTON_PLUS_STEP"  resultingState="PARKTIME_SELECTION_PLUS"/>
+        <EVENT name="BUTTON_MINUS_STEP" resultingState="PARKTIME_SELECTION_MINUS"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_BACK" resultingState="LICENSEPLATE_INPUT"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PAYMENT_SELECTION"/>
+    </APP_STATE>
+    <APP_STATE name="PARKTIME_SELECTION_MINUS">
+        <ENTRY_TASK name="REQUEST_STEP_DOWN_PRICE"/>
+        <EVENT name="BUTTON_PLUS_STEP"  resultingState="PARKTIME_SELECTION_PLUS"/>
+        <EVENT name="BUTTON_MINUS_STEP" resultingState="PARKTIME_SELECTION_MINUS"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_BACK" resultingState="LICENSEPLATE_INPUT"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PAYMENT_SELECTION"/>
+    </APP_STATE>
+
+    <APP_STATE name="CARD_PAYMENT">
+        <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
+        <ENTRY_TASK name="REQUEST_CC_START_TRANSACTION"/>
+        <EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="PRINT_TICKET_CARD"/>
+        <EVENT name="RECEIVED_CARD_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="USER_CC_ABORT"/>
+        <SCREEN name="CC_PAYMENT"/>
+    </APP_STATE>
+    
+    <APP_STATE name="CASH_PAYMENT">
+        <ENTRY_TASK name="REQUEST_CASH_INPUT"/>
+        <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
+	<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
+	<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
+        <SCREEN name="COIN_PAYMENT"/>
+    </APP_STATE>
+    <APP_STATE name="CASH_PAYMENT_INPUT">
+        <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
+        <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
+        <EVENT name="BUTTON_NEXT" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
+    </APP_STATE>
+    <APP_STATE name="CASH_PAYMENT_ERROR">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
+    </APP_STATE>
+    <APP_STATE name="CASH_OVERPAYED">
+        <ENTRY_TASK name="REQUEST_ISAMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="CASH_CHANGE_OVERPAID" note="screennumber 0x8a"/>
+    </APP_STATE>
+    <APP_STATE name="CASH_PAYMENT_ABORT">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+    </APP_STATE>
+
+    <!--
+    <APP_STATE name="PRINT_TICKET_WAIT">
+        <ENTRY_TASK name="TIMER" timeout="2000"/>
+        <EVENT name="TIMEOUT" resultingState="PRINT_TICKET"/>
+        <SCREEN name="BUSY"/>
+    </APP_STATE>
+    -->
+    <APP_STATE name="PRINT_TICKET_CASH">
+        <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
+        <EVENT name="PRINT_TICKET_FINISHED" resultingState="FINALISE_CASH_PAYMENT"/>
+        <EVENT name="PRINT_TICKET_ERROR" resultingState="PRINT_TICKET_FAILED"/>
+        <SCREEN name="SCREEN_WAITFOR"/>
+    </APP_STATE>
+    <APP_STATE name="PRINT_TICKET_CARD">
+        <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
+        <EVENT name="PRINT_TICKET_FINISHED" resultingState="CARD_PAYMENT_CONFIRM"/>
+        <EVENT name="PRINT_TICKET_ERROR" resultingState="PRINT_TICKET_FAILED"/>
+        <SCREEN name="SCREEN_WAITFOR"/>
+    </APP_STATE>     
+    <APP_STATE name="PRINT_TICKET_FAILED">
+        <ENTRY_TASK name="REQUEST_CC_CANCEL_TRANSACTION"/>
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="PRINT_TICKET_FAILED"/>
+    </APP_STATE>
+
+    <APP_STATE name="CARD_PAYMENT_CONFIRM">
+        <ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
+        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="PRINT_RECEIPT"/>
+        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR"   resultingState="CC_PAYMENT_ERROR"/>
+    </APP_STATE>      
+    <APP_STATE name="PRINT_RECEIPT">
+        <ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
+        <EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
+        <EVENT name="PRINT_RECEIPT_ERROR" resultingState="PRINT_TICKET_FAILED"/>
+    </APP_STATE>   
+    
+    <APP_STATE name="FINALISE_CASH_PAYMENT">
+        <ENTRY_TASK name="CASH_COLLECT"/>
+        <EVENT name="RECEIVED_CASH_CHANGE_BACK" resultingState="GIVE_CHANGE"/>
+        <EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
+        <!-- TODO: hangle changer Error -->
+        <!-- no screen change here -->
+    </APP_STATE>   
+    <APP_STATE name="GIVE_CHANGE">
+        <EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
+        <SCREEN name="SCREEN_CHANGE"/>
+    </APP_STATE>   
+    <APP_STATE name="GOODBYE_PAYMENT_OK">
+        <ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="2000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="GOODBYE_PAYMENT_OK"/>
+    </APP_STATE>
+    
+    <APP_STATE name="CC_PAYMENT_ERROR">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="CC_PAYMENT_ERROR"/>
+    </APP_STATE>
+    <APP_STATE name="USER_CC_ABORT">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="REQUEST_CC_CANCEL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="USER_ABORT"/>
+    </APP_STATE>    
+    
+ 
+    <!-- ************** ABORT STATES ************** -->  
+    
+    <APP_STATE name="ABORT_NOCONNECTION">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_2"/>
+    </APP_STATE>   
+    <APP_STATE name="ABORT_NOCARD">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_4"/>
+    </APP_STATE>    
+    <APP_STATE name="ABORT_CARD_DENIED">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_5"/>
+    </APP_STATE>     
+    <APP_STATE name="ABORT_NOT_ALLOWED">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_6"/>
+    </APP_STATE>
+    
+    
+</ATB_APP_STATES>
--- a/etc/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
@@ -3,9 +3,9 @@
 "project":"Schoenau",
 "version":"15.11.2023 00001",
 "custNum":332,
-"machNum":1004,
+"machNum":1000,
 "borough":0,
-"zone":1,
+"zone":0,
 "alias":0,
 "location":"Vorplatz 1"
 }
--- a/etc/psa_config/DC2C_conf21.json
+++ b/etc/psa_config/DC2C_conf21.json
@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Schoenau",
+"version":"15.11.2023 00001",
+"custNum":332,
+"machNum":21,
+"borough":0,
+"zone":0,
+"alias":0,
+"location":"Vorplatz 1"
+}
+
--- a/etc/psa_config/DC2C_conf25.json
+++ b/etc/psa_config/DC2C_conf25.json
@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Schoenau",
+"version":"15.11.2023 00001",
+"custNum":332,
+"machNum":25,
+"borough":0,
+"zone":0,
+"alias":0,
+"location":"Vorplatz 1"
+}
+
--- a/etc/psa_config/DC2C_conf26.json
+++ b/etc/psa_config/DC2C_conf26.json
@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Schoenau",
+"version":"15.11.2023 00001",
+"custNum":332,
+"machNum":26,
+"borough":0,
+"zone":0,
+"alias":0,
+"location":"Vorplatz 1"
+}
+
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri01",
 "project":"Schoenau",
-"Version":"15.11.2023 00003",
+"Version":"15.11.2023 00001",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri02",
 "project":"Schoenau",
-"Version":"15.11.2023 00001",
+"Version":"01.12.2023 00008",
 "issued":"13.11.2023 01.01",
 "text":"Standort: ",
 "feed":"nl",
@@ -10,7 +10,6 @@
 "text":"Bezahlt: ",
 "styl":"size 11",
 "vari":"Dynamic07",
-"text":"€",
 "feed":"nl",
 "styl":"size 00",
 "text":"Gedruckt am: ",
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri03",
 "project":"Schoenau",
-"Version":"15.11.2023 00001",
+"Version":"05.04.2024 00001",
 "feed":"nl",
 "styl":"size 00",
 "text":"Automat: ",
@@ -14,7 +14,7 @@
 "text":"Ort: ",
 "vari":"location",	
 "styl":"align c",
-"text":"Schönau am Königsee",
+"text":"Schönau am Königssee",
 "feed":"nl",
 "text":"Automatentechnik ",
 "feed":"nl",
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -0,0 +1,46 @@
+{
+"title":"DC2C_pri05",
+"project":"Schoenau",
+"Version":"15.11.2023 00001",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKTICKET",
+"styl":"size 00",
+"feed":"nl",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"nl",
+"styl":"align l",
+"text":"Ihr Kennzeichen: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic01",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkende: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -0,0 +1,31 @@
+{
+"title":"DC2C_pri06",
+"project":"Schoenau",
+"Version":"15.11.2023 00002",
+"issued":"13.11.2023 01.01",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"feed":"nl",
+"styl":"size 00",
+"text":"Gedruckt am: ",
+"vari":"wday deu short",
+"vari":"date ge",	
+"vari":"time long"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -0,0 +1,35 @@
+{
+"title":"DC2C_pri07",
+"project":"Schoenau",
+"Version":"05.04.2024 00001",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"feed":"nl",
+"text":"Ort: ",
+"vari":"location",	
+"styl":"align c",
+"text":"Schönau am Königssee",
+"feed":"nl",
+"text":"Automatentechnik ",
+"feed":"nl",
+"text":"Baumann GmbH",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri08",
+"project":"Schoenau",
+"Version":"15.11.2023 01.01",
+"text":"";
+}
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri32",
 "project":"refund reciept",
-"Version":"15.11.2023 00001",
+"Version":"15.11.2023 00002",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
@@ -14,7 +14,6 @@
 "text":"Erstattungsbetrag: ",
 "feed":"nl",
 "vari":"Dynamic07",
-"text":"€",
 "feed":"nl",
 "text":"KuNu: ",
 "vari":"cunu",	
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,7 +1,7 @@
 {
  "Project" :   "Schoenau",
-  "Version" :   "1.0.0",
-  "Info"    :   "",
+  "Version" :   "1.2.0",
+  "Info"    :   "<<Tariff for Zone 1>>",
  "Currency": [
    {
      "pcu_id": 1,
@@ -38,7 +38,7 @@
      "pop_day_night_end_time": "15:20:00",
      "pop_price_night": 0,
      "pop_min_time": 60,
-      "pop_max_time": 10080,
+      "pop_max_time": 14400,
      "pop_min_price": 300,
      "pop_carry_over": 1,
      "pop_daily_card_price": 0,
@@ -59,37 +59,52 @@
    {
      "pra_payment_option_id": 1099,
      "pra_payment_unit_id": 5,
-      "pra_price": 800
+      "pra_price": 900
    },
    {
      "pra_payment_option_id": 1099,
      "pra_payment_unit_id": 7,
-      "pra_price": 1600
+      "pra_price": 1800
    },
    {
      "pra_payment_option_id": 1099,
      "pra_payment_unit_id": 8,
-      "pra_price": 2400
+      "pra_price": 2700
    },
    {
      "pra_payment_option_id": 1099,
      "pra_payment_unit_id": 9,
-      "pra_price": 3200
+      "pra_price": 3600
    },
    {
      "pra_payment_option_id": 1099,
      "pra_payment_unit_id": 10,
-      "pra_price": 4000
+      "pra_price": 4500
    },
    {
      "pra_payment_option_id": 1099,
      "pra_payment_unit_id": 11,
-      "pra_price": 4800
+      "pra_price": 5400
    },
    {
      "pra_payment_option_id": 1099,
      "pra_payment_unit_id": 12,
-      "pra_price": 5600
+      "pra_price": 6300
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 13,
+      "pra_price": 7200
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 14,
+      "pra_price": 8100
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 15,
+      "pra_price": 9000
    }
  ],
  "Duration": [
@@ -126,7 +141,7 @@
    {
      "pun_id": 9,
      "pun_label": "96h",
-      "pun_duration": 5670
+      "pun_duration": 5760
    },
    {
      "pun_id": 10,
@@ -142,6 +157,21 @@
      "pun_id": 12,
      "pun_label": "168h",
      "pun_duration": 10080
+    },
+    {
+      "pun_id": 13,
+      "pun_label": "192h",
+      "pun_duration": 11520
+    },
+    {
+      "pun_id": 14,
+      "pun_label": "216h",
+      "pun_duration": 12960
+    },
+    {
+      "pun_id": 15,
+      "pun_label": "240h",
+      "pun_duration": 14400
    }
  ]
 }
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -1,7 +1,7 @@
 {
  "Project" :   "Schoenau",
-  "Version" :   "1.0.0",
-  "Info"    :   "",
+  "Version" :   "1.2.0",
+  "Info"    :   "<<<Tariff for zone 2>>>",
  "Currency": [
    {
      "pcu_id": 1,
@@ -38,28 +38,73 @@
      "pop_day_night_end_time": "15:07:00",
      "pop_price_night": 0,
      "pop_min_time": 60,
-      "pop_max_time": 1440,
-      "pop_min_price": 200,
+      "pop_max_time": 14400,
+      "pop_min_price": 300,
      "pop_carry_over": 1,
      "pop_daily_card_price": 0,
-      "pop_multi_hour_price": 5
+      "pop_multi_hour_price": 8
    }
  ],
  "PaymentRate": [
    {
      "pra_payment_option_id": 1100,
      "pra_payment_unit_id": 1,
-      "pra_price": 200
+      "pra_price": 300
    },
    {
      "pra_payment_option_id": 1100,
      "pra_payment_unit_id": 6,
-      "pra_price": 400
+      "pra_price": 500
    },
    {
      "pra_payment_option_id": 1100,
      "pra_payment_unit_id": 5,
-      "pra_price": 500
+      "pra_price": 600
+    },
+    {
+      "pra_payment_option_id": 1100,
+      "pra_payment_unit_id": 7,
+      "pra_price": 1200 
+    },
+    {
+      "pra_payment_option_id": 1100,
+      "pra_payment_unit_id": 8,
+      "pra_price": 1800
+    },
+    {
+      "pra_payment_option_id": 1100,
+      "pra_payment_unit_id": 9,
+      "pra_price": 2400
+    },
+    {
+      "pra_payment_option_id": 1100,
+      "pra_payment_unit_id": 10,
+      "pra_price": 3000
+    },
+    {
+      "pra_payment_option_id": 1100,
+      "pra_payment_unit_id": 11,
+      "pra_price": 3600
+    },
+    {
+      "pra_payment_option_id": 1100,
+      "pra_payment_unit_id": 12,
+      "pra_price": 4200
+    },
+    {
+      "pra_payment_option_id": 1100,
+      "pra_payment_unit_id": 13,
+      "pra_price": 4800
+    },
+    {
+      "pra_payment_option_id": 1100,
+      "pra_payment_unit_id": 14,
+      "pra_price": 5400
+    },
+    {
+      "pra_payment_option_id": 1100,
+      "pra_payment_unit_id": 15,
+      "pra_price": 6000
    }
  ],
  "Duration": [
@@ -96,7 +141,7 @@
    {
      "pun_id": 9,
      "pun_label": "96h",
-      "pun_duration": 5670
+      "pun_duration": 5760
    },
    {
      "pun_id": 10,
@@ -112,6 +157,21 @@
      "pun_id": 12,
      "pun_label": "168h",
      "pun_duration": 10080
+    },
+    {
+      "pun_id": 13,
+      "pun_label": "192h",
+      "pun_duration": 11520
+    },
+    {
+      "pun_id": 14,
+      "pun_label": "216h",
+      "pun_duration": 12960
+    },
+    {
+      "pun_id": 15,
+      "pun_label": "240h",
+      "pun_duration": 14400
    }
  ]
 }
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -96,7 +96,7 @@
    {
      "pun_id": 9,
      "pun_label": "96h",
-      "pun_duration": 5670
+      "pun_duration": 5760
    },
    {
      "pun_id": 10,
--- a/etc/psa_tariff/tariff101.json
+++ b/etc/psa_tariff/tariff101.json
@@ -0,0 +1,177 @@
+{
+  "Project" :   "Schoenau",
+  "Version" :   "1.2.1",
+  "Info"    :   "<<Tariff for Zone 1>>",
+  "Currency": [
+    {
+      "pcu_id": 1,
+      "pcu_sign": "€",
+      "pcu_major": "Euro",
+      "pcu_minor": "Cent",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1099,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "15:20:00",
+      "pop_day_night_end_time": "15:20:00",
+      "pop_price_night": 0,
+      "pop_min_time": 60,
+      "pop_max_time": 14400,
+      "pop_min_price": 300,
+      "pop_carry_over": 1,
+      "pop_daily_card_price": 0,
+      "pop_multi_hour_price": 8
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 1,
+      "pra_price": 300
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 6,
+      "pra_price": 700
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 5,
+      "pra_price": 900
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 7,
+      "pra_price": 1800
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 8,
+      "pra_price": 2700
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 9,
+      "pra_price": 3600
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 10,
+      "pra_price": 4500
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 11,
+      "pra_price": 5400
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 12,
+      "pra_price": 6300
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 13,
+      "pra_price": 7200
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 14,
+      "pra_price": 8100
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 15,
+      "pra_price": 9000
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "1h",
+      "pun_duration": 60
+    },
+    {
+      "pun_id": 3,
+      "pun_label": "15 min",
+      "pun_duration": 15
+    },
+    {
+      "pun_id": 5,
+      "pun_label": "24h",
+      "pun_duration": 1440
+    },
+    {
+      "pun_id": 6,
+      "pun_label": "3h",
+      "pun_duration": 180
+    },
+    {
+      "pun_id": 7,
+      "pun_label": "48h",
+      "pun_duration": 2880
+    },
+    {
+      "pun_id": 8,
+      "pun_label": "72h",
+      "pun_duration": 4320
+    },
+    {
+      "pun_id": 9,
+      "pun_label": "96h",
+      "pun_duration": 5760
+    },
+    {
+      "pun_id": 10,
+      "pun_label": "120h",
+      "pun_duration": 7200
+    },
+    {
+      "pun_id": 11,
+      "pun_label": "144h",
+      "pun_duration": 8640
+    },
+    {
+      "pun_id": 12,
+      "pun_label": "168h",
+      "pun_duration": 10080
+    },
+    {
+      "pun_id": 13,
+      "pun_label": "192h",
+      "pun_duration": 11520
+    },
+    {
+      "pun_id": 14,
+      "pun_label": "216h",
+      "pun_duration": 12960
+    },
+    {
+      "pun_id": 15,
+      "pun_label": "240h",
+      "pun_duration": 14400
+    }
+  ]
+}
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -4,17 +4,11 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
-opkg info atbqt
-opkg info atbupdatetool
 opkg update
 opkg install prepare-update
 opkg install atbupdatetool
-# opkg remove atb-accountingtool
-# opkg install atb-accountingtool
-opkg --cache /var/cache/opkg --download-only upgrade
-opkg --cache /var/cache/opkg upgrade
-# opkg remove apism
-# opkg install apism
-opkg info apism
-opkg info atbqt
-opkg info atbupdatetool
+opkg install mxt-touch-reset
+opkg install apism
+opkg install tariff-config-332
+opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
+opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
Author	SHA1	Message	Date
Gerhard Hoffmann	1362c61ae4	sync with brancht zg1/zone101	2024-04-12 09:11:01 +02:00
Gerhard Hoffmann	d9c98d5748	add tariff101.json for zone101 (solar)	2024-04-10 10:27:41 +02:00
Gerhard Hoffmann	c767849c2c	remove separate solar/net.jsons	2024-04-10 10:17:11 +02:00
Gerhard Hoffmann	74dad410bb	Add ptu5-systemcontroller using upgrade	2024-04-10 10:12:09 +02:00
Gerhard Hoffmann	0e6272602c	Added opkg install tariff-config-332	2024-04-09 17:00:35 +02:00
Gerhard Hoffmann	c537095c46	Update tariff-info to trigger new download	2024-04-09 15:09:40 +02:00
Gerhard Hoffmann	038bc004a8	Update tariffs for zone1 and zone2	2024-04-09 10:27:52 +02:00
Gerhard Hoffmann	db10f7fcf8	update version to 05.04.2024	2024-04-05 13:50:23 +02:00
Gerhard Hoffmann	3a51bebd82	Fix typo: Koenigssee	2024-03-28 09:15:24 +01:00
Gerhard Hoffmann	491624619a	Set version to 1.1.1 for testing.	2024-03-15 11:33:18 +01:00
Gerhard Hoffmann	03d1a113a8	Set pop_max_time: 10080, pop_multi_hour_price: 8	2024-03-15 10:39:32 +01:00
Siegfried Siegert	a49807484b	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_332	2024-03-13 13:52:42 +01:00
Siegfried Siegert	983d54d838	ATBAPP: Add customer vending process description (states)	2024-03-13 13:28:43 +01:00
Gerhard Hoffmann	f1e7dc9e0f	set min-price to 300	2024-03-13 13:10:57 +01:00
Siegfried Siegert	9dc0e02105	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_332	2024-03-13 12:44:28 +01:00
Gerhard Hoffmann	a5835dddae	Change tariff for zone2 (Hinterbrand)	2024-02-26 09:39:10 +01:00
Gerhard Hoffmann	9569c90ddc	sync with tariff01.json in zg1/zone1 -> Minor: version from 1.0.0 to 1.0.15	2024-01-25 11:39:26 +01:00
Gerhard Hoffmann	5036717517	On not upgrade, but install packages only with direct commands. opkg update opkg install prepare-update opkg install atbupdatetool opkg install mxt-touch-reset opkg install apism opkg info apism opkg info atbupdatetool	2024-01-24 14:50:14 +01:00
Gerhard Hoffmann	f0180cbe30	Add opkg install mxt-touch-reset to fix touch-screen issues	2024-01-24 12:42:37 +01:00
Gerhard Hoffmann	9480f75479	sync with branch zg1/zone1	2024-01-24 12:31:38 +01:00
Gerhard Hoffmann	a3868cea1b	Sync with branch zg1/zone1	2023-11-29 09:33:53 +01:00
Gerhard Hoffmann	eff3c6351d	Fix typo: 5670 -> 5760.	2023-11-28 10:26:06 +01:00
Gerhard Hoffmann	909c124fb8	Add new files (used for new templates)	2023-11-24 13:42:42 +01:00
Gerhard Hoffmann	5f755bd800	Revert version to original 00001.	2023-11-24 09:39:53 +01:00
Gerhard Hoffmann	fd3ef4d79f	Remove euro sign.	2023-11-24 09:30:36 +01:00
Gerhard Hoffmann	cd7db15372	Remove euro sign.	2023-11-24 09:30:16 +01:00
Gerhard Hoffmann	3ac760eb9b	Switch back to machine-id 1000 and zone = 0 (original setting)	2023-11-24 09:29:38 +01:00
Gerhard Hoffmann	01166c2644	witch back to machine-id 1000 and zone=0.	2023-11-24 09:28:34 +01:00
Siegfried Siegert	0fe79592ee	Merge branch 'zg1/zone1'	2023-11-22 17:14:36 +01:00
Gerhard Hoffmann	938bcc0144	Add json-config files for schoenau.	2023-11-20 13:10:20 +01:00
Gerhard Hoffmann	1f9c20f774	Add opkg_commands file.	2023-11-16 09:47:27 +01:00