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

Compare commits

base: GerhardHoffmann:master
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:vorbereitung-sommer-tariffe
GerhardHoffmann:zg1/zone5
GerhardHoffmann:zg1/zone4
GerhardHoffmann:zg1/zone3
GerhardHoffmann:zg1/zone2
GerhardHoffmann:zg1/zone1
..
compare: GerhardHoffmann:vorbereitung-sommer-tariffe
Branches Tags
GerhardHoffmann:vorbereitung-sommer-tariffe
GerhardHoffmann:zg1/zone5
GerhardHoffmann:zg1/zone4
GerhardHoffmann:zg1/zone3
GerhardHoffmann:zg1/zone2
GerhardHoffmann:zg1/zone1
GerhardHoffmann:master

70 Commits
master ... vorbereitu

Author SHA1 Message Date
Gerhard Hoffmann
d3d3fc769b Set service time 20:00 -> 22:00. Holidays have to be paid for. 2025-04-23 14:04:00 +02:00
Gerhard Hoffmann
ee68ebeeb0 Settings are identical to tariff04-winter 2025-04-23 13:58:03 +02:00
Gerhard Hoffmann
1f862da800 Settings are identical to tariff01-sommer 2025-04-23 13:55:56 +02:00
Gerhard Hoffmann
f1834421b6 updated version 2025-04-23 13:37:15 +02:00
Gerhard Hoffmann
3ce04a9a50 Tariff file for Yellow Zone (Zone 2), summer term. Difference to winter: service time 18:00 -> 22:00 and different holidays. 2025-04-23 13:27:50 +02:00
Gerhard Hoffmann
1a9db481e5 Tariff file for Red Zone (Zone 1), summer term. Only difference to winter: service time 20:00 -> 22:00. 2025-04-23 13:07:36 +02:00
Gerhard Hoffmann
7082f7f2da Tariff files as used before 1st May 2025-04-23 13:06:29 +02:00
Siegfried Siegert
7b53ed3668
ATBAPP: Text: add screen OVERPAID (0xB1) 2025-03-05 10:59:54 +01:00
Siegfried Siegert
623155394d
ATBAPP: Text: common user messages (0xF3) 2025-03-05 10:46:52 +01:00
Gerhard Hoffmann
843ddb9679 free-time from 12:00-14:00 for mon-fri 2025-01-07 12:53:30 +01:00
Gerhard Hoffmann
49ef97ec96 Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone1 2025-01-07 11:26:38 +01:00
Gerhard Hoffmann
3f0b812e68 free of charge from 12:00-14:00 2025-01-07 11:25:56 +01:00
Siegfried Siegert
46aadbb3ec
set terminalPowerOnOffHours: 6:00-22:00 2024-12-18 15:44:47 +01:00
Siegfried Siegert
65f2ee2cf9
Revert "set terminalPowerOnOffHours: 6:00-22:00" 
This reverts commit d324449cc63e94029413110c4b5e084e4dbd276c.
 2024-12-18 15:43:51 +01:00
Gerhard Hoffmann
2c835d2906 fixed typo: cach -> cache 2024-12-18 11:58:17 +01:00
Gerhard Hoffmann
a2ed372bf4 Zone5 to be used as update-help: machines in zone5: 10, 11, 31 2024-12-16 13:31:35 +01:00
Gerhard Hoffmann
ae4605ebc8 Add special handling for 2025-01-01: 2 hours are free of charge. 2024-12-13 12:56:52 +01:00
Gerhard Hoffmann
d324449cc6 set terminalPowerOnOffHours: 6:00-22:00 2024-12-13 12:51:50 +01:00
Siegfried Siegert
456a3807d9
opkg upgrade ptu5-sysconfig 2024-12-11 07:47:39 +01:00
Siegfried Siegert
1a18749793
opkg: install ptu-package-versions ... 
... upgrade does not work for packages which are not installed
 2024-12-09 17:36:01 +01:00
Siegfried Siegert
928da6929c
Systemcontrol: switch on suspendcontroller 2024-12-09 12:44:43 +01:00
Siegfried Siegert
9c5c9c2c2f
SystemControl: inputBrightness = 30 2024-12-04 12:54:55 +01:00
Siegfried Siegert
c49185913d
opkg fix: install wbdw 2024-12-03 16:36:30 +01:00
Siegfried Siegert
0d3816ebef
opkg: install wbdw 2024-12-03 16:12:41 +01:00
Gerhard Hoffmann
d4222fead7 Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone1 2024-11-15 12:42:03 +01:00
Gerhard Hoffmann
ed85579f97 Copied from Palanga (336) 2024-11-15 12:41:25 +01:00
Siegfried Siegert
85e6068803
Text: screen 0x3c ASC_RECEIPT 2024-11-05 16:38:25 +01:00
Siegfried Siegert
36af7686a7
Text: Fix typo 2024-11-05 16:38:11 +01:00
Siegfried Siegert
16da59b1e1
Selling process / Card payment: ask for printing receipt 2024-11-05 16:37:57 +01:00
Gerhard Hoffmann
8ebe1e5781 Update files (provided by Thomas) 2024-10-31 12:10:26 +01:00
Gerhard Hoffmann
e4cc57b9ef Add libmobilisis for download/update 2024-10-08 12:51:37 +02:00
Gerhard Hoffmann
1aeb3e8c71 Update tariff-files for winter term 2024-10-02 16:00:58 +02:00
Gerhard Hoffmann
9ff14ffc00 First step for new tariffs: adapt carry-over-times 2024-09-13 10:20:41 +02:00
Gerhard Hoffmann
05ad2996bb Change tariff files according to new settings sent from Eugenijus 2024-09-12 15:40:33 +02:00
Gerhard Hoffmann
47f8a46f22 Update as provided by T.Sax. 2024-09-05 08:07:52 +02:00
Gerhard Hoffmann
42afac8760 Add atb-plugin-calculateprice-mobilisis 2024-08-30 11:28:43 +02:00
Gerhard Hoffmann
5a9b6ad5e8 Update jsons as provided by T.Sax 2024-08-27 16:16:54 +02:00
Gerhard Hoffmann
44767d6d55 Set DorPrint=0 2024-08-27 08:44:57 +02:00
Gerhard Hoffmann
6014f6eaf3 updated by th.sax 2024-08-22 15:30:38 +02:00
Gerhard Hoffmann
466ec590e3 new file provided by th.sax 2024-08-22 13:27:08 +02:00
Gerhard Hoffmann
807655e34b smd 08-20 only with CP1257 2024-08-22 08:23:11 +02:00
Gerhard Hoffmann
2759d66114 Add settinge time-step-config and pop-allow-overpay 2024-08-21 18:01:02 +02:00
Gerhard Hoffmann
3a49c00a37 Add settinge time-step-config and pop-allow-overpay 2024-08-21 17:56:12 +02:00
Siegfried Siegert
3475fb9eab
HMI: Textupdate 2024-08-09 14:01:22 +02:00
Siegfried Siegert
883f7a7612
Textupdate: screen Overpaid 2024-08-09 13:45:44 +02:00
Siegfried Siegert
5ae8634882
ATBAPP: states: request for overpayment 2024-08-09 11:49:02 +02:00
Siegfried Siegert
4030e7c5ea
Merge branch 'zg1/zone1' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone1 2024-08-08 17:01:47 +02:00
Siegfried Siegert
fd3124ef1b
Update text: "Wait for card terminal" 2024-08-08 16:59:21 +02:00
Gerhard Hoffmann
e186c2a168 Update jsons-files as provided by Thomas 2024-08-08 10:32:14 +02:00
Siegfried Siegert
b5f1b00587
Revert "ATBAPP: change printerLocale" 
This reverts commit 0e46dece2b44038b732053b61b1488d3ece1e269.
 2024-08-08 10:19:25 +02:00
Siegfried Siegert
0e46dece2b
ATBAPP: change printerLocale 2024-08-08 08:16:28 +02:00
Siegfried Siegert
09f7322dd0
Setup opkg-commands 2024-08-07 17:17:08 +02:00
Siegfried Siegert
0fe2a973fe
ATBAPP: states: skip printing bank receipt 2024-08-07 16:45:25 +02:00
Siegfried Siegert
1b611462de
ATBAPP: add current states 2024-08-07 16:45:18 +02:00
Siegfried Siegert
40ffa76f49
ATBAPP: setPrinterEncoding and printerLocale 2024-08-07 16:40:01 +02:00
Siegfried Siegert
17c66fcb2d
Merge branch 'zg1/zone1' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone1 2024-08-07 16:36:34 +02:00
Gerhard Hoffmann
8915803583 Tariff for Zone 2 (Yellow) in Kleipeda 2024-08-01 17:21:18 +02:00
Gerhard Hoffmann
4a0111ce74 Tariff for Zone 1 (Red) in Kleipeda 2024-08-01 17:09:15 +02:00
Gerhard Hoffmann
b268100e34 Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone1 2024-07-19 10:31:36 +02:00
Gerhard Hoffmann
23eb6ca07b Add JSON files as saved on ATB server 2024-07-19 10:30:43 +02:00
Siegfried Siegert
5674fd9165
Merge branch 'zg1/zone1' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone1 2024-07-19 09:59:02 +02:00
Siegfried Siegert
42b26ee0ca
Merge branch 'master' into zg1/zone1 2024-07-19 09:58:49 +02:00
Gerhard Hoffmann
109ce63b71 Add tariff for Yellow Zone 2024-07-18 15:38:17 +02:00
Gerhard Hoffmann
f3d04ab718 Provide empty file as start 2024-07-17 14:46:04 +02:00
Gerhard Hoffmann
7b912cea2c Removed for Kleipeda (too many machines, each one needs maybe own conf-file) 2024-06-28 12:45:39 +02:00
Gerhard Hoffmann
ed92e95e87 Changed to UNIX format (test) and set version info. 2024-06-28 12:45:11 +02:00
Gerhard Hoffmann
7dd4874870 removed empty line after testing 2024-06-28 12:39:33 +02:00
Gerhard Hoffmann
0474b7e649 Add empty line for testing 2024-06-28 12:10:33 +02:00
Siegfried Siegert
120cdc0220
Merge branch 'master' into zg1/zone1 2024-06-27 12:15:55 +02:00
Gerhard Hoffmann
135d93adf1 first draft of tariff for kleipeda 2024-06-06 17:16:29 +02:00
21 changed files with 24867 additions and 203 deletions
Show Stats Expand all files Collapse all files

126
etc/atbapp/text/HMI_Texte.xml
View File

@ -940,6 +940,74 @@
<ru_RU>Минимальная плата за парковку</ru_RU>
</Text>
</Screen>
<Screen name="OVERPAID" screennr="0xB1">
<Text textnr="0x30">
<lt_LT>Stovėjimo laiko pabaiga:</lt_LT>
<en_GB>End of Parking time:</en_GB>
<de_DE>Parkende:</de_DE>
<ru_RU>Окончание времени парковки:</ru_RU>
</Text>
<Text textnr="0x31">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text textnr="0x32">
<lt_LT>Suma:</lt_LT>
<en_GB>Amount:</en_GB>
<de_DE>Betrag:</de_DE>
<ru_RU>Сумма:</ru_RU>
</Text>
<Text textnr="0x33">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text textnr="0x34">
<lt_LT>Spausdinti kvitą?</lt_LT>
<en_GB>Print receipt?</en_GB>
<de_DE>Quittung drucken?</de_DE>
<ru_RU>Распечатать квитанцию?</ru_RU>
</Text>
<Text textnr="0x35">
<lt_LT>ATŠAUKTI</lt_LT>
<en_GB>NO</en_GB>
<de_DE>NEIN</de_DE>
<ru_RU>НЕТ</ru_RU>
</Text>
<Text textnr="0x36">
<lt_LT>TĘSTI</lt_LT>
<en_GB>YES</en_GB>
<de_DE>JA</de_DE>
<ru_RU>ДА</ru_RU>
</Text>
<Text textnr="0x37">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="user_message_01" textnr="0x81">
<lt_LT>Permoka!</lt_LT>
<en_GB>Overpaid</en_GB>
<de_DE>Überbezahlt</de_DE>
<ru_RU>Переплата!</ru_RU>
</Text>
<Text name="user_message_02" textnr="0x82">
<lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT>
<en_GB>Reached maximum number of coins.!</en_GB>
<de_DE>Maximalanzahl der Münzen erreicht!</de_DE>
<ru_RU>Достигнуто максимальное количество монет!</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<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>
</Text>
</Screen>
<Screen name="Welcome2" screennr="0x3d">
<Text textnr="0x30">
<lt_LT>Sveiki!</lt_LT>
@ -2500,5 +2568,61 @@
<de_DE>880012344</de_DE>
<ru_RU>880012344</ru_RU>
</Text>
</Screen>
</Screen>
<Screen name="COMMON_USER_MESSAGES" screennr="0xF3">
<Text name="PAY_MORE" textnr="0x30">
<lt_LT>Mokėti daugiau</lt_LT>
<en_GB>pay more…</en_GB>
<de_DE>mehr zahlen…</de_DE>
<ru_RU>платить больше</ru_RU>
</Text>
<Text name="PAY_APPROPRIATELY" textnr="0x31">
<lt_LT>suteikite tikslią sumą…</lt_LT>
<en_GB>give the exact money…</en_GB>
<de_DE>passend zahlen…</de_DE>
<ru_RU>предоставьте точную сумму…</ru_RU>
</Text>
<Text name="NO_CANGE" textnr="0x32">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="MINIMUM_PRICE" textnr="0x33">
<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>
</Text>
<Text name="MAXIMUM_PRICE" textnr="0x34">
<lt_LT>Maksimali bilieto suma</lt_LT>
<en_GB>Max. Ticket amount</en_GB>
<de_DE>Höchstparkdauer erreicht</de_DE>
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<Text name="CARDPAYMENT_ONLY" textnr="0x35">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="CASHPAYMENT_ONLY" textnr="0x36">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
<Text name="OVERPAID" textnr="0x37">
<lt_LT>Permoka!</lt_LT>
<en_GB>Overpaid</en_GB>
<de_DE>Überbezahlt</de_DE>
<ru_RU>Переплата!</ru_RU>
</Text>
<Text name="MAXIMUM_NUM_OF_COINS" textnr="0x38">
<lt_LT> </lt_LT>
<en_GB> </en_GB>
<de_DE> </de_DE>
<ru_RU> </ru_RU>
</Text>
</Screen>
</ATB_Text>

8
etc/psa_config/DC2C_print03.json Executable file → Normal file
View File

@ -2,8 +2,14 @@
"title":"DC2C_pri03",
"Project":"Klaipeda",
"Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00",
"text":"Sumokėta:",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"styl":"size 00",
"text":"Sumokėta grynais:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Raudonoji zona",

40
etc/psa_config/DC2C_print03_red.json
View File

@ -1,40 +0,0 @@
{
"title":"DC2C_pri03",
"Project":"Klaipeda",
"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 grynais:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Raudonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 1,50Eur/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",
"text":"Bilieto nr.:",
"vari":"Dynamic08",
"feed":"nl",
"text":"Automato nr.:",
"vari":"manu",
"feed":"nl"
}

39
etc/psa_config/DC2C_print03_yellow.json
View File

@ -1,39 +0,0 @@
{
"title":"DC2C_pri03",
"Project":"Klaipeda",
"Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"text":"Sumokėta grynais:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Geltonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 60 ct/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",
"text":"Bilieto nr.:",
"vari":"Dynamic08",
"feed":"nl",
"text":"Automato nr.:",
"vari":"manu",
"feed":"nl"
}

7
etc/psa_config/DC2C_print07.json Executable file → Normal file
View File

@ -2,8 +2,13 @@
"title":"DC2C_pri07",
"Project":"Klaipeda",
"Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00",
"text":"Sumokėta:",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"text":"Sumokėta kortele:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Raudonoji zona",

39
etc/psa_config/DC2C_print07_red.json
View File

@ -1,39 +0,0 @@
{
"title":"DC2C_pri07",
"Project":"Klaipeda",
"Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"size 00",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"text":"Sumokėta kortele:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Raudonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 1,50Eur/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",
"text":"Bilieto nr.:",
"vari":"Dynamic08",
"feed":"nl",
"text":"Automato nr.:",
"vari":"manu",
"feed":"nl"
}

39
etc/psa_config/DC2C_print07_yellow.json
View File

@ -1,39 +0,0 @@
{
"title":"DC2C_pri07",
"Project":"Klaipeda",
"Version":"1.1.3-2024-08-08",
"styl":"font 24",
"styl":"csiz 08",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"styl":"size 00",
"text":"Sumokėta kortele:",
"vari":"Dynamic02",
"styl":"size 21",
"text":"Geltonoji zona",
"feed":"nl",
"styl":"size 10",
"text":"tarifas 60 ct/h",
"feed":"nl",
"styl":"size 00",
"feed":"nl",
"text":"Bilieto nr.:",
"vari":"Dynamic08",
"feed":"nl",
"text":"Automato nr.:",
"vari":"manu",
"feed":"nl"
}

147
etc/psa_tariff/tariff01.json
View File

@ -2206,6 +2206,12 @@
},
{
"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"
@ -2226,6 +2232,13 @@
{
"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"
@ -2238,8 +2251,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"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"
}
]
@ -2270,6 +2289,12 @@
},
{
"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"
@ -2290,6 +2315,13 @@
{
"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"
@ -2302,8 +2334,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"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"
}
]
@ -2415,6 +2453,12 @@
},
{
"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"
@ -2435,6 +2479,13 @@
{
"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"
@ -2447,8 +2498,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"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"
}
]
@ -2479,6 +2536,12 @@
},
{
"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"
@ -2499,6 +2562,13 @@
{
"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"
@ -2511,8 +2581,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"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"
}
]
@ -2543,6 +2619,12 @@
},
{
"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"
@ -2563,6 +2645,13 @@
{
"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"
@ -2575,8 +2664,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"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"
}
]
@ -2607,6 +2702,12 @@
},
{
"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"
@ -2627,6 +2728,13 @@
{
"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"
@ -2639,8 +2747,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"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"
}
]
@ -2671,6 +2785,12 @@
},
{
"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"
@ -2691,6 +2811,13 @@
{
"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"
@ -2703,8 +2830,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"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"
}
]

2850
etc/psa_tariff/tariff01_sommer.json Normal file
View File

File diff suppressed because it is too large Load Diff

2850
etc/psa_tariff/tariff01_winter.json Normal file
View File

File diff suppressed because it is too large Load Diff

105
etc/psa_tariff/tariff02.json
View File

@ -1045,6 +1045,12 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
@ -1065,6 +1071,13 @@
{
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
@ -1077,8 +1090,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 600,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
@ -1187,6 +1206,12 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
@ -1207,6 +1232,13 @@
{
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
@ -1219,8 +1251,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 600,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
@ -1329,6 +1367,12 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
@ -1349,6 +1393,13 @@
{
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
@ -1361,8 +1412,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 600,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
@ -1471,6 +1528,12 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
@ -1491,6 +1554,13 @@
{
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
@ -1503,8 +1573,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 600,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
@ -1574,6 +1650,12 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
@ -1594,6 +1676,13 @@
{
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
@ -1606,8 +1695,14 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 600,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]

1719
etc/psa_tariff/tariff02_sommer.json Normal file
View File

File diff suppressed because it is too large Load Diff

1953
etc/psa_tariff/tariff02_winter.json Normal file
View File

File diff suppressed because it is too large Load Diff

155
etc/psa_tariff/tariff03.json
View File

@ -2245,8 +2245,14 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 240,
"prepaid_start" : "20:00:00",
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
}
]
@ -2265,8 +2271,15 @@
{
"carry_over_id" : 2,
"carry_over_if": "always",
"carry_over_duration": 240,
"carry_over_start" : "20:00:00",
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
}
]
@ -2277,9 +2290,15 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "20:00:00"
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}
@ -2387,8 +2406,14 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 240,
"prepaid_start" : "20:00:00",
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
}
]
@ -2407,8 +2432,15 @@
{
"carry_over_id" : 2,
"carry_over_if": "always",
"carry_over_duration": 240,
"carry_over_start" : "20:00:00",
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
}
]
@ -2419,9 +2451,15 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "20:00:00"
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}
@ -2529,8 +2567,14 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 240,
"prepaid_start" : "20:00:00",
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
}
]
@ -2549,8 +2593,15 @@
{
"carry_over_id" : 2,
"carry_over_if": "always",
"carry_over_duration": 240,
"carry_over_start" : "20:00:00",
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
}
]
@ -2561,9 +2612,15 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "20:00:00"
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}
@ -2671,8 +2728,14 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 240,
"prepaid_start" : "20:00:00",
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
}
]
@ -2691,8 +2754,15 @@
{
"carry_over_id" : 2,
"carry_over_if": "always",
"carry_over_duration": 240,
"carry_over_start" : "20:00:00",
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
}
]
@ -2703,9 +2773,15 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "20:00:00"
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}
@ -2774,8 +2850,14 @@
},
{
"prepaid_id" : 2,
"prepaid_duration": 240,
"prepaid_start" : "20:00:00",
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 360,
"prepaid_start" : "18:00:00",
"prepaid_end": "24:00:00"
}
]
@ -2794,8 +2876,15 @@
{
"carry_over_id" : 2,
"carry_over_if": "always",
"carry_over_duration": 240,
"carry_over_start" : "20:00:00",
"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": 360,
"carry_over_start" : "18:00:00",
"carry_over_end": "24:00:00"
}
]
@ -2806,9 +2895,15 @@
"service_ranges" : [
{
"service_id" : 1,
"service_duration": 720,
"service_duration": 240,
"service_start" : "08:00:00",
"service_end": "20:00:00"
"service_end": "12:00:00"
},
{
"service_id" : 2,
"service_duration": 240,
"service_start" : "14:00:00",
"service_end": "18:00:00"
}
]
}

2850
etc/psa_tariff/tariff03_sommer.json Normal file
View File

File diff suppressed because it is too large Load Diff

3153
etc/psa_tariff/tariff03_winter.json Normal file
View File

File diff suppressed because it is too large Load Diff

1858
etc/psa_tariff/tariff04_sommer.json Normal file
View File

File diff suppressed because it is too large Load Diff

1858
etc/psa_tariff/tariff04_winter.json Normal file
View File

File diff suppressed because it is too large Load Diff

2636
etc/psa_tariff/tariff05_sommer.json Normal file
View File

File diff suppressed because it is too large Load Diff

2636
etc/psa_tariff/tariff05_winter.json Normal file
View File

File diff suppressed because it is too large Load Diff

2
etc/psa_update/opkg_commands
View File

@ -16,7 +16,7 @@ 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 --cach /var/cache/opkg --download-only upgrade ptu5-sysconfig
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