newline after kirchdorf

Sync tariff file with master
2024-02-26 15:11:09 +01:00 · 2024-02-26 15:10:46 +01:00 · 2024-02-26 14:53:15 +01:00 · 2024-02-26 14:46:07 +01:00 · 2024-02-21 11:19:53 +01:00 · 2024-02-20 12:17:56 +01:00
15 changed files with 493 additions and 5 deletions
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -0,0 +1,18 @@
+{	     
+"title":"DC2C_cash  ",
+"project":"Galltuer",
+"version":"15.10.2023 14:55 02.00.06",
+"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
+"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
+"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
+"ExchangeRate":1,
+"TokenChannel":6,
+"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":19,
+"ForeignTaxRate":0,
+"Surcharge":0,	
+"Discount":0
+}
+#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
+
--- a/etc/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Kirchdorf",
+"version":"22.01.2024 00001",
+"custNum":743,
+"machNum":1000,
+"borough":1,
+"zone":1,
+"alias":0,
+"location":""
+}
+
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -0,0 +1,27 @@
+{
+"title":"DC2C_device",
+"project":"Galltuer",
+"Version":"22.01.2024 00103",
+"printer":1,
+"coinChk":1,
+"mifRd":1,
+"solarPwr":0,
+"modem":0,
+"creditCard":1,
+"escrow":1,
+"RejMotor":0,
+"shutter":1,
+"billRd":0,
+"vaultLock":0,
+"autoAlarm":1,
+"autoOpen":1,
+"AccPrint":1,
+"DorPrint":1,
+"TokPrint":1,
+"CBwarnLev":1600,
+"CBerrLev":1900,
+"BattWarn":11800,
+"BattErr":11200,
+"foreign":1,
+"refPrint":0
+}
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -0,0 +1,45 @@
+{
+"title":"DC2C_pri01",
+"project":"Kirchdorf",
+"Version":"22.01.2024 00001",
+"styl":"font 08",
+"feed":"margin05",
+"feed":"rim02",
+"styl":"size 00",
+"graf":"logo1",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Kirchdorf",
+"feed":"nl"
+"text":"28 Hauptpl.",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 00",
+"styl":"align l",
+"styl":"size 00",
+"text":"Parkzeit bezahlt bis: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -0,0 +1,25 @@
+{
+"title":"DC2C_pri02",
+"project":"Galtuer",
+"Version":"22.01.2024 00001",
+"issued":"22.01.2024 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"text":"",
+"feed":"nl",
+"styl":"size 00"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -0,0 +1,33 @@
+{
+"title":"DC2C_pri03",
+"project":"Galtuer",
+"Version":"15.11.2023 00001",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"feed":"nl",
+"text":"Ticket Nr.: ",
+"vari":"TickCtr",
+"feed":"nl",
+"styl":"align c",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri04",
+"project":"Galtuer",
+"Version":"15.11.2023 01.01",
+"text":"";
+}
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -0,0 +1,45 @@
+{
+"title":"DC2C_pri05",
+"project":"Kirchdorf",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"feed":"margin05",
+"feed":"rim02",
+"styl":"size 00",
+"graf":"logo1",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Kirchdorf",
+"feed":"nl"
+"text":"28 Hauptpl.",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 00",
+"styl":"align l",
+"styl":"size 00",
+"text":"Parkzeit bezahlt bis: ",
+"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,26 @@
+{
+"title":"DC2C_pri06",
+"project":"Galtuer",
+"Version":"15.11.2023 00001",
+"issued":"13.11.2023 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"text":"",
+"feed":"nl",
+"styl":"size 00"
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -0,0 +1,33 @@
+{
+"title":"DC2C_pri07",
+"project":"Galtuer",
+"Version":"15.11.2023 00001",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"feed":"nl",
+"text":"Ticket Nr.: ",
+"vari":"TickCtr",
+"feed":"nl",
+"styl":"align c",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri08",
+"project":"Galtuer",
+"Version":"15.11.2023 01.01",
+"text":"";
+}
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -0,0 +1,21 @@
+{
+"title":"DC2C_pri31",
+"project":"door close print",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"feed":"nl",
+"text":"Türöffnung um:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"feed":"eject"
+}
+
+
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -0,0 +1,42 @@
+{
+"title":"DC2C_pri32",
+"project":"refund reciept",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"text":"Ersatzbeleg",
+"feed":"nl",
+"styl":"size 00",
+"text":"Erstattungsbetrag: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"text":"€",
+"feed":"nl",
+"text":"KuNu: ",
+"vari":"cunu",	
+"text":"MaNu: ",
+"vari":"manu",	
+"text":"Ort: ",
+"vari":"location",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"text":"Am: ",
+"vari":"date us",
+"text":"Um: ",
+"vari":"time long",
+"feed":"nl",
+"text":" * * * * * * * * ",
+"feed":"nl",
+"feed":"nl",
+"feed":"eject"
+}
+
+
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,6 +1,6 @@
 {
  "Project" :   "Kirchdorf",
-  "Version" :   "1.0.0",
+  "Version" :   "1.1.0",
  "Info"    :   "",
  "Currency": [
    {
@@ -29,19 +29,153 @@
      "pme_label": "steps"
    }
  ],
+  "TimeBase": [
+    {
+      "tbase_id": 0,
+      "tbase_type": 0,
+      "tbase_type_comment": "time is given as starting from some wall-clock-time",
+      "tbase_label": "absolute time"
+    },
+    {
+      "tbase_id": 1,
+      "tbase_type": 1,
+      "tbase_type_comment": "time is given as starting from 0 minutes",
+      "tbase_label": "relative time"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 2,
+      "time_range_from": 0,
+      "time_range_to": 30,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 30,
+      "time_range_to": 35,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 35,
+      "time_range_to": 40,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 4,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 40,
+      "time_range_to": 45,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 5,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 45,
+      "time_range_to": 50,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 6,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 50,
+      "time_range_to": 55,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 7,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 55,
+      "time_range_to": 60,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 8,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 60,
+      "time_range_to": 65,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 9,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 65,
+      "time_range_to": 70,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 10,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 70,
+      "time_range_to": 75,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 11,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 75,
+      "time_range_to": 80,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 12,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 80,
+      "time_range_to": 85,
+      "time_range_comment": "[from, to[ in minutes"
+    },
+    {
+      "time_range_id": 13,
+      "time_range_tbase_id": 1,
+      "time_range_payment_rate_id": 1,
+      "time_range_from": 85,
+      "time_range_to": 90,
+      "time_range_comment": "[from, to[ in minutes"
+    }
+  ],
+  "TimeStepConfig" : [
+    {	
+      "tsconfig_id" : 1,
+      "tsconfig_label" : "static",
+      "tsconfig_comment" : "read time steps as given in jsonfiles"		
+    },
+    {
+      "tsconfig_id" : 2,
+      "tsconfig_label" : "dynamic",
+      "tsconfig_comment" : "determine timesteps at runtime"		
+    }
+  ],
  "PaymentOption": [
    {
      "pop_id": 1049,
      "pop_label": "Zone 1",
-      "pop_payment_method_id": 3,
+      "pop_payment_method_id": 1,
      "pop_day_end_time": "00:00:00",
      "pop_day_night_end_time": "00:00:00",
      "pop_price_night": 0,
      "pop_min_time": 30,
      "pop_max_time": 90,
      "pop_min_price": 30,
+      "pop_max_price": 150,
      "pop_carry_over": 0,
-      "pop_daily_card_price": 0
+      "pop_daily_card_price": 0,
+      "pop_time_step_config": 2
    }
  ],
  "PaymentRate": [
@@ -49,6 +183,11 @@
      "pra_payment_option_id": 1049,
      "pra_payment_unit_id": 1,
      "pra_price": 10
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 2,
+      "pra_price": 30 
    }
  ],
  "Duration": [
@@ -146,5 +285,15 @@
      "pwd_time_from": "08:00:00",
      "pwd_time_to": "12:00:00"
    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 8,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
  ]
 }
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -6,8 +6,8 @@
 # 
 opkg update
 opkg install prepare-update
-opkg install atbupdatetool
-opkg install mxt-touch-reset
+# opkg install atbupdatetool
+# opkg install mxt-touch-reset
 # opkg remove atb-accountingtool
 # opkg install atb-accountingtool
 opkg --cache /var/cache/opkg --download-only upgrade
Author	SHA1	Message	Date
Gerhard Hoffmann	56df6fdafe	newline after kirchdorf	2024-02-26 15:11:09 +01:00
Gerhard Hoffmann	340ec04e3b	newline after kirchdorf	2024-02-26 15:10:46 +01:00
Gerhard Hoffmann	594c6365de	Sync tariff file with master	2024-02-26 14:53:15 +01:00
Gerhard Hoffmann	3af68e30e5	Add files from 26.02.2024 as provided by thomas	2024-02-26 14:46:07 +01:00
Gerhard Hoffmann	e441d62f4d	Define explicit time range for the first 30 minutes of the tariff. Add tariff-config to define the tariff as dynamic, meaning that it can start at any minute (modulo operation times).	2024-02-21 11:19:53 +01:00
Gerhard Hoffmann	a813ea48bc	remove installing atbupdatetool and mxt-touch-reset	2024-02-20 12:17:56 +01:00
Gerhard Hoffmann	f5e8909c91	Add tariff file for Kirchdorf.	2024-02-16 13:39:58 +01:00