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

Compare commits

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

36 Commits
vorbereitu ... 33c756397b

Author SHA1 Message Date
Gerhard Hoffmann
33c756397b Copied from Palanga (336) 2024-11-15 12:45:31 +01:00
Siegfried Siegert
cfee96d7e4 Text: screen 0x3c ASC_RECEIPT 2024-11-05 16:41:01 +01:00
Siegfried Siegert
1748665893 Text: Fix typo 2024-11-05 16:40:56 +01:00
Siegfried Siegert
a8eac0df43 Selling process / Card payment: ask for printing receipt 2024-11-05 16:40:51 +01:00
Gerhard Hoffmann
e4d168ded9 Update files (provided by Thomas) 2024-10-31 12:11:40 +01:00
Gerhard Hoffmann
e39d72c7e7 Fix: switch to red-zone 2024-10-09 10:11:35 +02:00
Gerhard Hoffmann
ffb1b0dfd0 Add libmobilisis for download/update 2024-10-08 12:53:02 +02:00
Gerhard Hoffmann
7555aeb70b Update tariff-files for winter term 2024-10-02 16:02:33 +02:00
Gerhard Hoffmann
4ee59594df First step for new tariffs: adapt carry-over-times 2024-09-13 10:24:33 +02:00
Gerhard Hoffmann
a2c8e782d8 Change tariff files according to new settings sent from Eugenijus 2024-09-12 15:41:39 +02:00
Gerhard Hoffmann
771a01b8ae Update as provided by T.Sax. 2024-09-05 08:05:30 +02:00
Gerhard Hoffmann
454d665d94 Add atb-plugin-calculateprice-mobilisis 2024-08-30 11:29:27 +02:00
Gerhard Hoffmann
2d21e7c28b Update jsons as provided by T.Sax 2024-08-27 16:19:20 +02:00
Gerhard Hoffmann
84aa822885 Set DorPrint=0. 2024-08-27 08:42:45 +02:00
Gerhard Hoffmann
e12fb8c591 updated by th.sax 2024-08-22 15:28:17 +02:00
Gerhard Hoffmann
f91f50e7ff new file provided by th.sax 2024-08-22 13:28:16 +02:00
Gerhard Hoffmann
f887e12076 smd 08-20 only with CP1257 2024-08-22 08:20:31 +02:00
Gerhard Hoffmann
d677c12ad9 Add settinge time-step-config and pop-allow-overpay 2024-08-21 18:02:48 +02:00
Gerhard Hoffmann
ff78bf1411 Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2 2024-08-21 17:54:37 +02:00
Gerhard Hoffmann
21512f927e Add settings: 
+      "pop_time_step_config": 1	-> STATIC
+      "pop_allow_overpay": false
 2024-08-21 17:52:58 +02:00
Siegfried Siegert
1b85f4ac03 HMI: Textupdate 2024-08-09 14:00:32 +02:00
Siegfried Siegert
7e6f5e8283 Textupdate: screen Overpaid 2024-08-09 13:46:02 +02:00
Siegfried Siegert
4dbe681477 ATBAPP: states: request for overpayment 2024-08-09 11:47:50 +02:00
Siegfried Siegert
690f60b63d Update text: "Wait for card terminal" 2024-08-08 17:03:21 +02:00
Siegfried Siegert
ad23378439 Merge branch 'zg1/zone2' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone2 2024-08-08 17:03:09 +02:00
Gerhard Hoffmann
5d51847b24 Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2 2024-08-08 10:30:22 +02:00
Gerhard Hoffmann
f78e84624a Update jsons-files as provided by Thomas 2024-08-08 10:29:14 +02:00
Siegfried Siegert
88468a9d2a Setup opkg-commands 2024-08-07 17:16:46 +02:00
Siegfried Siegert
8a3ed1ff11 ATBAPP: states: skip printing bank receipt 2024-08-07 16:45:44 +02:00
Siegfried Siegert
59e020c60b ATBAPP: add current states 2024-08-07 16:45:40 +02:00
Siegfried Siegert
ce6053f435 ATBAPP: setPrinterEncoding and printerLocale 2024-08-07 16:40:28 +02:00
Gerhard Hoffmann
079d0f4e7e Tariff for Zone 2 (Yellow) in Kleipeda 2024-08-01 17:22:10 +02:00
Gerhard Hoffmann
f21099f036 Tariff for Zone 1 (Red) in Kleipeda 2024-08-01 17:08:12 +02:00
Gerhard Hoffmann
0085494514 Add atbapp to sync with zone1 branch 2024-07-19 10:36:01 +02:00
Gerhard Hoffmann
f050c5657e Add JSON files as saved on ATB server 2024-07-19 10:29:11 +02:00
Gerhard Hoffmann
a01f7b6647 Added Red-Zone as Info 2024-07-19 10:07:06 +02:00
18 changed files with 46 additions and 27494 deletions
Expand all files Collapse all files

66
etc/atb/SystemControl.ini
View File

@@ -1,66 +0,0 @@
[AT_TASKS]
1\arguments=restart, atbapp
1\envs=
1\hourOfDay=4
1\id=ATBAPP_RESTART
1\program=/bin/systemctl
2\arguments=restart, apism
2\envs=
2\hourOfDay=4
2\id=APISM_RESTART
2\program=/bin/systemctl
3\arguments=start, atbupdatetool
3\envs=
3\hourOfDay=1
3\id=PTU5UPDATE
3\program=/bin/systemctl
size=3
[BACKLIGHT]
SensorMax=3500
SensorMin=0
curve=1
dimLowValue=499
dimMax=100
dimMin=20
inputBrightness=30
[COMMON]
startBacklightController=true
startMQTTController=false
startMonitoringController=false
startSuspendController=true
[MONITORING]
http_dataFormat=HTTP
http_host=127.0.0.1
http_ignoreSslErrors=on
http_port=5000
http_protocol=http
http_service=
monitoring_heartbeatInterval=60
protocol=mqtt
useDeviceId=on
useRingbuffer=on
[MQTT]
mqtt_QoS=0
mqtt_TopicDeviceType=MP
mqtt_TopicPrefix=ATB
mqtt_TopicScheme=ATB_ISMAS
mqtt_debug=on
mqtt_host=mqtt2.atb-comm.de
mqtt_password=xyz123
mqtt_port=8883
mqtt_useSsl=on
mqtt_username=testuser
[NETWORKCHECK]
PingHost=google.com
networkRestart=/sbin/ifup -a
setOOO=off
useNetworkCheck=on
[SUSPEND]
program=/home/root/system_powerdown_wakeup.sh
suspendLoopTimerValue=8

1
etc/atbapp/ATBAPP.ini
View File

@@ -122,4 +122,3 @@ debug=1
parity=0 parity=0
sleep=0 sleep=0
stopBits=1 stopBits=1
terminalPowerOnOffHours="06:00:00,22:00:00"

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

@@ -940,74 +940,6 @@
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>Минимальная плата за парковку</ru_RU>
</Text> </Text>
</Screen> </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"> <Screen name="Welcome2" screennr="0x3d">
<Text textnr="0x30"> <Text textnr="0x30">
<lt_LT>Sveiki!</lt_LT> <lt_LT>Sveiki!</lt_LT>
@@ -2568,61 +2500,5 @@
<de_DE>880012344</de_DE> <de_DE>880012344</de_DE>
<ru_RU>880012344</ru_RU> <ru_RU>880012344</ru_RU>
</Text> </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> </ATB_Text>

230
etc/psa_tariff/tariff01.json
View File

@@ -1,6 +1,6 @@
{ {
"Project" : "Kleipeda", "Project" : "Kleipeda",
"Version" : "2.1.0-2024-12-13T12:36:12+02:00", "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
"Info" : "Red Zone (center)", "Info" : "Red Zone (center)",
"Currency": [ "Currency": [
{ {
@@ -2206,12 +2206,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2232,13 +2226,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "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_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2251,14 +2238,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "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" "service_end": "20:00:00"
} }
] ]
@@ -2289,12 +2270,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2315,13 +2290,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "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_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2334,14 +2302,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "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" "service_end": "20:00:00"
} }
] ]
@@ -2352,87 +2314,6 @@
} }
}], }],
"Wednesday" : [{ "Wednesday" : [{
"2025-01-01" : {
"payment_settings" : [
{
"min_time" : 12,
"max_time" : 840,
"max_price": 2100,
"min_price": 30
}
],
"prepaid_settings" : [
{
"prepaid_ranges" : [
{
"prepaid_id" : 1,
"prepaid_duration": 480,
"prepaid_start" : "00:00:00",
"prepaid_end": "08:00:00"
},
{
"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"
}
]
}
],
"carry_over_settings" : [
{
"carry_over_ranges" : [
{
"carry_over_id" : 1,
"carry_over_if": "always",
"carry_over_duration": 480,
"carry_over_start" : "00:00:00",
"carry_over_end": "08:00:00"
},
{
"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"
}
]
}
],
"service_settings" : [
{
"service_ranges" : [
{
"service_id" : 1,
"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"
}
]
}
],
"out_of_service_settings" : [
]
},
"default" : { "default" : {
"payment_settings" : [ "payment_settings" : [
{ {
@@ -2453,12 +2334,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2479,13 +2354,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "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_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2498,14 +2366,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "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" "service_end": "20:00:00"
} }
] ]
@@ -2536,12 +2398,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2562,13 +2418,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "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_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2581,14 +2430,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "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" "service_end": "20:00:00"
} }
] ]
@@ -2619,12 +2462,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2645,13 +2482,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "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_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2664,14 +2494,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "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" "service_end": "20:00:00"
} }
] ]
@@ -2702,12 +2526,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2728,13 +2546,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "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_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2747,14 +2558,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "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" "service_end": "20:00:00"
} }
] ]
@@ -2785,12 +2590,6 @@
}, },
{ {
"prepaid_id" : 2, "prepaid_id" : 2,
"prepaid_duration": 120,
"prepaid_start" : "12:00:00",
"prepaid_end": "14:00:00"
},
{
"prepaid_id" : 3,
"prepaid_duration": 240, "prepaid_duration": 240,
"prepaid_start" : "20:00:00", "prepaid_start" : "20:00:00",
"prepaid_end": "24:00:00" "prepaid_end": "24:00:00"
@@ -2811,13 +2610,6 @@
{ {
"carry_over_id" : 2, "carry_over_id" : 2,
"carry_over_if": "always", "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_duration": 240,
"carry_over_start" : "20:00:00", "carry_over_start" : "20:00:00",
"carry_over_end": "24:00:00" "carry_over_end": "24:00:00"
@@ -2830,14 +2622,8 @@
"service_ranges" : [ "service_ranges" : [
{ {
"service_id" : 1, "service_id" : 1,
"service_duration": 240, "service_duration": 720,
"service_start" : "08:00:00", "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" "service_end": "20:00:00"
} }
] ]

2850
etc/psa_tariff/tariff01_sommer.json
View File

File diff suppressed because it is too large Load Diff

2850
etc/psa_tariff/tariff01_winter.json
View File

File diff suppressed because it is too large Load Diff

105
etc/psa_tariff/tariff02.json
View File

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

1803
etc/psa_tariff/tariff02_sommer.json
View File

File diff suppressed because it is too large Load Diff

1953
etc/psa_tariff/tariff02_winter.json
View File

File diff suppressed because it is too large Load Diff

155
etc/psa_tariff/tariff03.json
View File

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

File diff suppressed because it is too large Load Diff

3153
etc/psa_tariff/tariff03_winter.json
View File

File diff suppressed because it is too large Load Diff

1624
etc/psa_tariff/tariff04_sommer.json
View File

File diff suppressed because it is too large Load Diff

1858
etc/psa_tariff/tariff04_winter.json
View File

File diff suppressed because it is too large Load Diff

2636
etc/psa_tariff/tariff05.json
View File

File diff suppressed because it is too large Load Diff

2636
etc/psa_tariff/tariff05_sommer.json
View File

File diff suppressed because it is too large Load Diff

2636
etc/psa_tariff/tariff05_winter.json
View File

File diff suppressed because it is too large Load Diff

8
etc/psa_update/opkg_commands
View File

@@ -14,9 +14,7 @@ opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
opkg --cache /var/cache/opkg --download-only upgrade atbqt 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 upgrade ptu5-systemcontroller
opkg --cache /var/cache/opkg --download-only install ptu-package-versions opkg --cache /var/cache/opkg --download-only upgrade ptu-package-versions
opkg --cache /var/cache/opkg --download-only install wbdw
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 atb-plugin-calculateprice-mobilisis
opkg --cache /var/cache/opkg upgrade libmobilisis-calc opkg --cache /var/cache/opkg upgrade libmobilisis-calc
@@ -25,6 +23,4 @@ opkg --cache /var/cache/opkg upgrade atb-dc-libraries
opkg --cache /var/cache/opkg upgrade atb-plugin-dc opkg --cache /var/cache/opkg upgrade atb-plugin-dc
opkg --cache /var/cache/opkg upgrade atbqt opkg --cache /var/cache/opkg upgrade atbqt
opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
opkg --cache /var/cache/opkg install ptu-package-versions opkg --cache /var/cache/opkg upgrade ptu-package-versions
opkg --cache /var/cache/opkg install wbdw
opkg --cache /var/cache/opkg upgrade ptu5-sysconfig