Tariff: fix holiday

DC_device: add paramter "housing" ...
... this is for enabling door switches on 1256 DC
2024-08-12 09:35:48 +02:00 · 2024-06-24 15:13:33 +02:00 · 2024-04-24 15:37:06 +02:00 · 2024-04-24 12:51:06 +02:00 · 2024-04-09 16:23:52 +02:00 · 2024-04-03 14:01:08 +02:00
12 changed files with 103 additions and 273 deletions
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@ -2,13 +2,13 @@
 "title":"DC2C_cash  ",
 "project":"Korneuburg",
 "version":"15.10.2023 14:55 02.00.06",
-"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,255,200,100,50,20,10,5],
-"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,3,200,100,50,20,10,5],
-"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,1,1,1,1,1,0],
+"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,1,1,1],
+"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,	
--- a/etc/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
@ -7,6 +7,6 @@
 "borough":1,
 "zone":1,
 "alias":0,
-"location":"Vorplatz 1"
+"location":"Lebzeltergasse 4-12"
 }

--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@ -23,5 +23,8 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refPrint":0
+"refundPrint":1,
+"billWarnLev":400,
+"billFullLev":500,
+"housing":1
 }
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@ -7,24 +7,19 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"PARKTICKET",
+"graf":"logo1",
+"text":"Korneuburg",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
 "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: ",
+"text":"Parkzeit bezahlt bis: ",
 "feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic04",
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@ -3,20 +3,13 @@
 "project":"Korneuburg",
 "Version":"15.11.2023 00001",
 "issued":"13.11.2023 01.01",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
 "feed":"nl",
 "text":"Bezahlt: ",
 "styl":"size 11",
 "vari":"Dynamic07",
 "text":"",
 "feed":"nl",
-"styl":"size 00",
-"text":"Gedruckt am: ",
-"vari":"wday deu short",
-"vari":"date ge",	
-"vari":"time long"
+"styl":"size 00"
 }


--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@ -4,21 +4,19 @@
 "Version":"15.11.2023 00001",
 "feed":"nl",
 "styl":"size 00",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
 "text":"Automat: ",
 "vari":"manu",	
-"text":"Gruppe: ",
-"vari":"group",	
-"text":"Zone: ",
-"vari":"zone",	
 "feed":"nl",
-"text":"Ort: ",
-"vari":"location",	
 "styl":"align c",
-"text":"Korneuburg",
+"text":"Bitte gut sichtbar",
 "feed":"nl",
-"text":"Automatentechnik ",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
 "feed":"nl",
-"text":"Baumann GmbH",
 "feed":"eject"
 }

--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@ -7,24 +7,19 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"PARKTICKET",
+"graf":"logo1",
+"text":"Korneuburg",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
 "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: ",
+"text":"Parkzeit bezahlt bis: ",
 "feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic04",
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@ -3,20 +3,14 @@
 "project":"Korneuburg",
 "Version":"15.11.2023 00001",
 "issued":"13.11.2023 01.01",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
 "feed":"nl",
 "text":"Bezahlt: ",
 "styl":"size 11",
 "vari":"Dynamic07",
-"text":"€",
+"text":"",
 "feed":"nl",
-"styl":"size 00",
-"text":"Gedruckt am: ",
-"vari":"wday deu short",
-"vari":"date ge",	
-"vari":"time long"
+"styl":"size 00"
+
 }


--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@ -4,21 +4,19 @@
 "Version":"15.11.2023 00001",
 "feed":"nl",
 "styl":"size 00",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
 "text":"Automat: ",
 "vari":"manu",	
-"text":"Gruppe: ",
-"vari":"group",	
-"text":"Zone: ",
-"vari":"zone",	
 "feed":"nl",
-"text":"Ort: ",
-"vari":"location",	
 "styl":"align c",
-"text":"Korneuburg",
+"text":"Bitte gut sichtbar",
 "feed":"nl",
-"text":"Automatentechnik ",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
 "feed":"nl",
-"text":"Baumann GmbH",
 "feed":"eject"
 }

--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@ -15,25 +15,6 @@
 "vari":"date ge",
 "vari":"time long",
 "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",	
-"feed":"nl",
-"text":"**Automatentechnik ",
-"feed":"nl",
-"text":"   Baumann GmbH ***",
-"feed":"nl",
-"text":" * * * * * * * * * ",
-"feed":"nl",
 "feed":"eject"
 }

--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@ -49,6 +49,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": 120
    }
  ],
  "Duration": [
@ -211,6 +216,13 @@
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
+    {
+      "pedwt_id": 2177,
+      "pedwt_period_exc_day_id": 2023,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
    {
      "pedwt_id": 2178,
      "pedwt_period_exc_day_id": 2022,
@ -260,6 +272,13 @@
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
+    {
+      "pedwt_id": 2201,
+      "pedwt_period_exc_day_id": 2039,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
    {
      "pedwt_id": 2202,
      "pedwt_period_exc_day_id": 2038,
@ -367,61 +386,14 @@
    }
  ],
  "SpecialDays": [
-    {
-      "ped_id": 11,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2023-12-08",
-      "ped_date_end": "2023-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christtag",
-      "ped_date_start": "2023-12-25",
-      "ped_date_end": "2023-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 14,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2023-12-26",
-      "ped_date_end": "2023-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2016,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2024-01-06",
-      "ped_date_end": "2024-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2022,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2024-01-04",
-      "ped_date_end": "2024-01-04",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
    {
      "ped_id": 2024,
      "ped_label": "Staatsfeiertag",
      "ped_date_start": "2024-05-01",
      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    },
    {
      "ped_id": 2025,
@ -429,7 +401,17 @@
      "ped_date_start": "2024-05-09",
      "ped_date_end": "2024-05-09",
      "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Pfingst Sonntag",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    },
    {
      "ped_id": 2026,
@ -437,7 +419,8 @@
      "ped_date_start": "2024-05-20",
      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    },
    {
      "ped_id": 2027,
@ -445,7 +428,8 @@
      "ped_date_start": "2024-05-30",
      "ped_date_end": "2024-05-30",
      "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    },
    {
      "ped_id": 2028,
@ -453,7 +437,8 @@
      "ped_date_start": "2024-08-15",
      "ped_date_end": "2024-08-15",
      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    },
    {
      "ped_id": 2029,
@ -461,7 +446,8 @@
      "ped_date_start": "2024-10-26",
      "ped_date_end": "2024-10-26",
      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    },
    {
      "ped_id": 2030,
@ -469,15 +455,17 @@
      "ped_date_start": "2024-11-01",
      "ped_date_end": "2024-11-01",
      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    },
    {
      "ped_id": 2031,
      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2024-08-12",
-      "ped_date_end": "2024-08-12",
+      "ped_date_start": "2024-12-08",
+      "ped_date_end": "2024-12-08",
      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    },
    {
      "ped_id": 2032,
@ -485,7 +473,8 @@
      "ped_date_start": "2024-12-25",
      "ped_date_end": "2024-12-25",
      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    },
    {
      "ped_id": 2034,
@ -493,127 +482,8 @@
      "ped_date_start": "2024-12-26",
      "ped_date_end": "2024-12-26",
      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0 
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2025-06-01",
-      "ped_date_end": "2025-06-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2050,
-      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2025-05-29",
-      "ped_date_end": "2025-05-29",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2051,
-      "ped_label": "Pfingstmontag",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2052,
-      "ped_label": "Fronlaeichnam",
-      "ped_date_start": "2025-06-19",
-      "ped_date_end": "2025-06-19",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2053,
-      "ped_label": "Mariae Himmelfahrt",
-      "ped_date_start": "2025-08-15",
-      "ped_date_end": "2025-08-15",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2054,
-      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2025-10-26",
-      "ped_date_end": "2025-10-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Allerheiligen",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2025-12-08",
-      "ped_date_end": "2025-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christtag",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2026-01-01",
-      "ped_date_end": "2026-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Heilige Drei Koenige",
-      "ped_date_start": "2026-01-06",
-      "ped_date_end": "2026-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 0,
+      "comment_ped_year": "check year if 0"
    }
  ],
  "PeriodYear": [
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@ -4,17 +4,20 @@
 # 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 install mxt-touch-reset
+opkg install atb-dc-libraries
+opkg install ptu5-systemcontroller
+opkg install atb-modemtools
+opkg upgrade ptu5-systemcontroller
 # opkg remove atb-accountingtool
 # opkg install atb-accountingtool
-opkg --cache /var/cache/opkg --download-only upgrade
-opkg --cache /var/cache/opkg upgrade
+#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 info apism
+# opkg info atbqt
+# opkg info atbupdatetool
Author	SHA1	Message	Date
Siegfried Siegert	1a5b644fab	Tariff: fix holiday	2024-08-12 09:35:48 +02:00
Siegfried Siegert	cb78c4eada	DC_device: add paramter "housing" ... ... this is for enabling door switches on 1256 DC	2024-06-24 15:13:33 +02:00
Gerhard Hoffmann	0fa2116748	Sync with branch zg1/zone1.	2024-04-24 15:37:06 +02:00
Gerhard Hoffmann	305482d0c7	Removed any holiday not in 2024	2024-04-24 12:51:06 +02:00
Gerhard Hoffmann	38dd230c8b	Added: opkg upgrade ptu5-systemcontroller	2024-04-09 16:23:52 +02:00
Gerhard Hoffmann	3a8494bf0a	Updated (Thomas)	2024-04-03 14:01:08 +02:00
Gerhard Hoffmann	aecbb68a58	Updated to use logo	2024-04-02 15:50:57 +02:00
Gerhard Hoffmann	7f5d8fd0e0	Turn off 5-cent coin	2024-03-13 10:25:27 +01:00
Gerhard Hoffmann	f525653241	Add price per hour (to be compatible with Kirchdorf)	2024-03-07 08:14:42 +01:00
Gerhard Hoffmann	8bb8d9a66b	machNum=8, location: Hauptplatz 39 Gericht	2024-01-17 17:44:11 +01:00
Gerhard Hoffmann	30b5de36e3	Change dc-json-files for testing	2024-01-17 17:25:36 +01:00
Gerhard Hoffmann	a3a31e4925	base jsonfiles for korneuburg (added line for git)	2024-01-16 08:53:41 +01:00
Gerhard Hoffmann	34b9a7589c	Added installation of mxt-touch-reset	2024-01-16 08:32:50 +01:00
Gerhard Hoffmann	70f229e826	Fix: 2024-01-04 -> 2024-04-01 (1.April) Add: Ostersonntag (2x): 2024-03-31 + 2025-04-20.	2024-01-04 17:00:38 +01:00