GerhardHoffmann/customer_332
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone1

Browse Source
This commit is contained in:
Siegfried Siegert 2024-04-17 16:40:47 +02:00
commit 03fd98d6e7
Signed by untrusted user: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
6 changed files with 257 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/psa_config/DC2C_print03.json
View File

@ -1,7 +1,7 @@
{
"title":"DC2C_pri03",
"project":"Schoenau",
"Version":"15.11.2023 00001",
"Version":"09.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",

4
etc/psa_config/DC2C_print07.json
View File

@ -1,7 +1,7 @@
{
"title":"DC2C_pri07",
"project":"Schoenau",
"Version":"15.11.2023 00001",
"Version":"09.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",

50
etc/psa_tariff/tariff01.json
View File

@ -1,7 +1,7 @@
{
"Project" : "Schoenau",
"Version" : "1.0.15",
"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": [
@ -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
}
]
}

36
etc/psa_tariff/tariff02.json
View File

@ -1,7 +1,7 @@
{
"Project" : "Schoenau",
"Version" : "1.1.1",
"Info" : "",
"Version" : "1.2.0",
"Info" : "<<<Tariff for zone 2>>>",
"Currency": [
{
"pcu_id": 1,
@ -38,7 +38,7 @@
"pop_day_night_end_time": "15:07: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,
@ -90,6 +90,21 @@
"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": [
@ -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
}
]
}

177
etc/psa_tariff/tariff101.json Normal file
View File

@ -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
}
]
}

5
etc/psa_update/opkg_commands
View File

@ -9,5 +9,6 @@ opkg install prepare-update
opkg install atbupdatetool
opkg install mxt-touch-reset
opkg install apism
opkg info apism
opkg info atbupdatetool
opkg install tariff-config-332
opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller