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

Compare commits

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

31 Commits
8ebe1e5781 ... vorbereitung-sommer-tariffe

Author SHA1 Message Date
GerhardHoffmann 430d68b113 remove/update holidays 2025-04-25 11:51:05 +02:00
GerhardHoffmann 0debdcab84 usual saturday/sunday has to be paid for 2025-04-25 11:48:52 +02:00
GerhardHoffmann d3d3fc769b Set service time 20:00 -> 22:00. Holidays have to be paid for. 2025-04-23 14:04:00 +02:00
GerhardHoffmann ee68ebeeb0 Settings are identical to tariff04-winter 2025-04-23 13:58:03 +02:00
GerhardHoffmann 1f862da800 Settings are identical to tariff01-sommer 2025-04-23 13:55:56 +02:00
GerhardHoffmann f1834421b6 updated version 2025-04-23 13:37:15 +02:00
GerhardHoffmann 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
GerhardHoffmann 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
GerhardHoffmann 7082f7f2da Tariff files as used before 1st May 2025-04-23 13:06:29 +02:00
SiegfriedSiegert 7b53ed3668 ATBAPP: Text: add screen OVERPAID (0xB1) 2025-03-05 10:59:54 +01:00
SiegfriedSiegert 623155394d ATBAPP: Text: common user messages (0xF3) 2025-03-05 10:46:52 +01:00
GerhardHoffmann 843ddb9679 free-time from 12:00-14:00 for mon-fri 2025-01-07 12:53:30 +01:00
GerhardHoffmann 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
GerhardHoffmann 3f0b812e68 free of charge from 12:00-14:00 2025-01-07 11:25:56 +01:00
SiegfriedSiegert 46aadbb3ec set terminalPowerOnOffHours: 6:00-22:00 2024-12-18 15:44:47 +01:00
SiegfriedSiegert 65f2ee2cf9 Revert "set terminalPowerOnOffHours: 6:00-22:00" 
This reverts commit d324449cc6.
 2024-12-18 15:43:51 +01:00
GerhardHoffmann 2c835d2906 fixed typo: cach -> cache 2024-12-18 11:58:17 +01:00
GerhardHoffmann a2ed372bf4 Zone5 to be used as update-help: machines in zone5: 10, 11, 31 2024-12-16 13:31:35 +01:00
GerhardHoffmann ae4605ebc8 Add special handling for 2025-01-01: 2 hours are free of charge. 2024-12-13 12:56:52 +01:00
GerhardHoffmann d324449cc6 set terminalPowerOnOffHours: 6:00-22:00 2024-12-13 12:51:50 +01:00
SiegfriedSiegert 456a3807d9 opkg upgrade ptu5-sysconfig 2024-12-11 07:47:39 +01:00
SiegfriedSiegert 1a18749793 opkg: install ptu-package-versions ... 
... upgrade does not work for packages which are not installed
 2024-12-09 17:36:01 +01:00
SiegfriedSiegert 928da6929c Systemcontrol: switch on suspendcontroller 2024-12-09 12:44:43 +01:00
SiegfriedSiegert 9c5c9c2c2f SystemControl: inputBrightness = 30 2024-12-04 12:54:55 +01:00
SiegfriedSiegert c49185913d opkg fix: install wbdw 2024-12-03 16:36:30 +01:00
SiegfriedSiegert 0d3816ebef opkg: install wbdw 2024-12-03 16:12:41 +01:00
GerhardHoffmann 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
GerhardHoffmann ed85579f97 Copied from Palanga (336) 2024-11-15 12:41:25 +01:00
SiegfriedSiegert 85e6068803 Text: screen 0x3c ASC_RECEIPT 2024-11-05 16:38:25 +01:00
SiegfriedSiegert 36af7686a7 Text: Fix typo 2024-11-05 16:38:11 +01:00
SiegfriedSiegert 16da59b1e1 Selling process / Card payment: ask for printing receipt 2024-11-05 16:37:57 +01:00
19 changed files with 27522 additions and 61 deletions
Expand all files Collapse all files
etc/atb/SystemControl.ini
+66
View File
@@ -0,0 +1,66 @@
[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
etc/atbapp/ATBAPP.ini
+1
View File
@@ -122,3 +122,4 @@ debug=1
parity=0
sleep=0
stopBits=1
terminalPowerOnOffHours="06:00:00,22:00:00"
etc/atbapp/states/APP_States.xml
+10 -1
View File
@@ -228,9 +228,18 @@
<APP_STATE name="CARD_PAYMENT_CONFIRM">
<ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="GOODBYE_PAYMENT_OK"/>
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="ASK_RECEIPT"/>
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
</APP_STATE>
<APP_STATE name="ASK_RECEIPT">
<ENTRY_TASK name="TIMER" timeout="8000"/>
<EVENT name="TIMEOUT" resultingState="GOODBYE_PAYMENT_OK"/>
<EVENT name="BUTTON_YES" resultingState="PRINT_RECEIPT"/>
<EVENT name="BUTTON_NO" resultingState="GOODBYE_PAYMENT_OK"/>
<SCREEN name="ASK_RECEIPT"/>
</APP_STATE>
<APP_STATE name="PRINT_RECEIPT">
<ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
<EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
etc/atbapp/text/HMI_Texte.xml
+139 -15
View File
@@ -490,7 +490,7 @@
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
<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>
@@ -600,7 +600,7 @@
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
<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>
@@ -782,7 +782,7 @@
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
<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>
@@ -846,7 +846,7 @@
<ru_RU>Максимальная сумма билета</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
<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>
@@ -898,10 +898,10 @@
<ru_RU> </ru_RU>
</Text>
<Text textnr="0x34">
<lt_LT>Spausdinti bilietą</lt_LT>
<en_GB>Request Ticket?</en_GB>
<de_DE>Parkschein anfordern?</de_DE>
<ru_RU>Заказ билета</ru_RU>
<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>
@@ -916,10 +916,10 @@
<ru_RU>ДА</ru_RU>
</Text>
<Text textnr="0x37">
<lt_LT>Permoka!</lt_LT>
<en_GB>Overpaid!</en_GB>
<de_DE>Überbezahlt!</de_DE>
<ru_RU>Переплата!</ru_RU>
<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>
@@ -934,7 +934,75 @@
<ru_RU>Достигнуто максимальное количество монет!</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
<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="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>
@@ -2219,7 +2287,7 @@
<ru_RU>Принимаются только платежные карточки…</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
<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>
@@ -2425,7 +2493,7 @@
<ru_RU>Достигнуто максимальное количество монет!</ru_RU>
</Text>
<Text name="user_message_04" textnr="0x84">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
<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>
@@ -2501,4 +2569,60 @@
<ru_RU>880012344</ru_RU>
</Text>
</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>
etc/psa_tariff/tariff01.json
+222 -8
View File
@@ -1,6 +1,6 @@
{
"Project" : "Kleipeda",
"Version" : "2.0.0-2024-10-01T09:32:12+02:00",
"Version" : "2.1.0-2024-12-13T12:36:12+02:00",
"Info" : "Red Zone (center)",
"Currency": [
{
@@ -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"
}
]
@@ -2314,6 +2352,87 @@
}
}],
"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" : {
"payment_settings" : [
{
@@ -2334,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"
@@ -2354,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"
@@ -2366,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"
}
]
@@ -2398,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"
@@ -2418,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"
@@ -2430,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"
}
]
@@ -2462,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"
@@ -2482,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"
@@ -2494,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"
}
]
@@ -2526,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"
@@ -2546,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"
@@ -2558,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"
}
]
@@ -2590,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"
@@ -2610,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"
@@ -2622,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"
}
]
etc/psa_tariff/tariff01_sommer.json
+2850
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff01_winter.json
+2850
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff02.json
+100 -5
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"
}
]
etc/psa_tariff/tariff02_sommer.json
+1803
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff02_winter.json
+1953
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff03.json
+125 -30
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"
}
]
}
etc/psa_tariff/tariff03_sommer.json
+2850
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff03_winter.json
+3153
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff04_sommer.json
+1624
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff04_winter.json
+1858
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff05.json
+2636
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff05_sommer.json
+2636
View File
File diff suppressed because it is too large Load Diff
etc/psa_tariff/tariff05_winter.json
+2636
View File
File diff suppressed because it is too large Load Diff
etc/psa_update/opkg_commands
+8
View File
@@ -13,6 +13,10 @@ opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-cc-asyncpos
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 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 --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
@@ -20,3 +24,7 @@ opkg --cache /var/cache/opkg upgrade atb-plugin-cc-asyncpos
opkg --cache /var/cache/opkg upgrade atb-dc-libraries
opkg --cache /var/cache/opkg upgrade atb-plugin-dc
opkg --cache /var/cache/opkg upgrade atbqt
opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
opkg --cache /var/cache/opkg install ptu-package-versions
opkg --cache /var/cache/opkg install wbdw
opkg --cache /var/cache/opkg upgrade ptu5-sysconfig