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

Compare commits

base: GerhardHoffmann:zg1/zone1
Branches Tags
GerhardHoffmann:zg1/zone1 GerhardHoffmann:master
..
compare: GerhardHoffmann:33de6240b9790a5fa5a43eb067481bc937c5c3e3
Branches Tags
GerhardHoffmann:zg1/zone1 GerhardHoffmann:master

2 Commits
zg1/zone1 ... 33de6240b9

Author SHA1 Message Date
Gerhard Hoffmann
33de6240b9 starting version 2024-07-22 16:44:19 +02:00
Siegfried Siegert
346fb5160c Merge branch 'zg1/zone1' 2024-07-18 13:17:08 +02:00
3 changed files with 7 additions and 388 deletions
Expand all files Collapse all files

14
etc/atbapp/states/APP_States.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ATB_APP_STATES version="1.1">
<APP_STATE name="IDLE">
<EVENT name="BUTTON_START" resultingState="VEHICLE_SELECTION"/>
<EVENT name="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
<EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
<!-- <EVENT name="RECEIVED_DC_COIN_ATTACHED" resultingState="SETUP_DIRECT_COIN_INPUT"/> -->
<EVENT name="RECEIVED_DC_COIN_ATTACHED" resultingState="SETUP_DIRECT_COIN_INPUT"/>
<SCREEN name="START"/>
<MODE name="IDLE"/>
</APP_STATE>
@@ -21,26 +21,16 @@
setPaymentType="CASH"/>
</APP_STATE>
<!--
<APP_STATE name="SETUP_SELL_STATE">
<ENTRY_TASK name="TIMER" timeout="500"/>
<EVENT name="TIMEOUT" resultingState="PARKTIME_SELECTION" setCashInputMode="PAY_DOWN" setProduct="SHORT_TERM_PARKING"/>
</APP_STATE>
-->
<APP_STATE name="LICENSEPLATE_INPUT">
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
<EVENT name="BUTTON_NEXT" resultingState="PRODUCT_SELECTION"/>
<SCREEN name="LICENSEPLATE_INPUT"/>
</APP_STATE>
<APP_STATE name="VEHICLE_SELECTION">
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
<EVENT name="BUTTON_VEHICLE_1" resultingState="PARKTIME_SELECTION" setCashInputMode="PAY_DOWN" setProduct="SHORT_TERM_PARKING_CAR"/>
<EVENT name="BUTTON_VEHICLE_2" resultingState="PARKTIME_SELECTION" setCashInputMode="PAY_DOWN" setProduct="SHORT_TERM_PARKING_BUS"/>
<SCREEN name="VEHICLE_SELECTION"/>
</APP_STATE>
<APP_STATE name="PRODUCT_SELECTION">
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
<EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP" setProduct="SHORT_TERM_PARKING"/>

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

@@ -1116,11 +1116,11 @@
<it_IT>AUTO</it_IT>
</Text>
<Text textnr="0x32">
<de_AT>BUS</de_AT>
<en_GB>BUS</en_GB>
<fr_FR>BUS</fr_FR>
<de_DE>BUS</de_DE>
<it_IT>BUS</it_IT>
<de_AT>BUS / LKW</de_AT>
<en_GB>BUS / TRUCK</en_GB>
<fr_FR>BUS / CAMION</fr_FR>
<de_DE>BUS / LKW</de_DE>
<it_IT>BUS / AUTOCARRI</it_IT>
</Text>
<Text textnr="0x33">
<de_AT> </de_AT>

371
etc/psa_tariff/tariff02.json
View File

@@ -1,371 +0,0 @@
{
"Project" : "Valser Alm (Specker)",
"Version" : "0.9.0",
"Info" : "",
"Currency": [
{
"pcu_id": 2,
"pcu_sign": "€",
"pcu_major": "EUR",
"pcu_minor": "",
"pcu_active": true
}
],
"Interpolation": [
{
"interpol_id": 1,
"interpol_id_comment": "no-interpolation"
},
{
"interpol_id": 2,
"interpol_id_comment": "fixed time values (wall-clock)",
"interpol_static_start": "",
"interpol_static_end": ""
},
{
"interpol_id": 3,
"interpol_id_comment": "static time point and duration",
"interpol_dynamic_start": "",
"interpol_dynamic_start_comment": "time-point (as wall-clock time)",
"interpol_dynamic_duration": 0,
"interpol_dynamic_duration_comment": "duration (in minutes)"
},
{
"interpol_id": 4,
"interpol_id_comment": "dynamic time point",
"interpol_dynamic_start": "",
"interpol_dynamic_start_comment": "time-point provided by user (as wall-clock time)",
"interpol_dynamic_duration": 0,
"interpol_dynamic_duration_comment": "duration (in minutes)"
},
{
"interpol_id": 5,
"interpol_id_comment": "dynamic time point",
"interpol_dynamic_start": "now",
"interpol_dynamic_start_comment": "time-point provided by user (abtract)",
"interpol_dynamic_duration": 0,
"interpol_dynamic_duration_comment": "duration (in minutes)"
},
{
"interpol_id": 6,
"interpol_id_comment": "dynamic time point",
"interpolation_seemless": false,
"interpolation_never" : false,
"interpol_dynamic_start": "now",
"interpol_dynamic_start_comment": "time-point provided by user (abtract)",
"interpol_dynamic_until_price": 0,
"interpol_dynamic_until_price_comment": "interpolate until price is reached",
"interpol_static_end": ""
},
{
"interpol_id": 7,
"interpol_id_comment": "dynamic time point",
"interpol_dynamic_start": "now",
"interpol_dynamic_start_comment": "time-point provided by user (abtract)",
"interpol_dynamic_end": "",
"interpol_dynamic_end_comment": "time-point provided by user (in minutes)"
}
],
"Prepaid": [
{
"prepaid_id": 1,
"prepaid_anytime": true,
"prepaid_never": false
},
{
"prepaid_id": 2,
"prepaid_anytime": false,
"prepaid_never": true
},
{
"prepaid_id": 3,
"prepaid_anytime": false,
"prepaid_never": false,
"prepaid_static_start": "19:00:00",
"prepaid_static_end": "07:00:00"
}
],
"CarryOver": [
{
"carry_over_id" : 1,
"carry_over_week" : [
{
"carry_over_day" : 1,
"carry_over_day_comment" : "Monday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "19:00:00",
"carry_over_static_end": "07:00:00"
},
{
"carry_over_day" : 2,
"carry_over_day_comment" : "Tuesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "19:00:00",
"carry_over_static_end": "07:00:00"
},
{
"carry_over_day" : 3,
"carry_over_day_comment" : "Wednesday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "19:00:00",
"carry_over_static_end": "07:00:00"
},
{
"carry_over_day" : 4,
"carry_over_day_comment" : "Thursday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "19:00:00",
"carry_over_static_end": "07:00:00"
},
{
"carry_over_day" : 5,
"carry_over_day_comment" : "Friday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "19:00:00",
"carry_over_static_end": "07:00:00"
},
{
"carry_over_day" : 6,
"carry_over_day_comment" : "Saturday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "19:00:00",
"carry_over_static_end": "07:00:00"
},
{
"carry_over_day" : 7,
"carry_over_day_comment" : "Sunday",
"carry_over_seemless": false,
"carry_over_never" : false,
"carry_over_duration": 720,
"carry_over_static_start" : "19:00:00",
"carry_over_static_end": "07:00:00"
}
]
}
],
"TimeRange" : [
{
"time_range_id": 1,
"time_range_from": "19:00:00",
"time_range_to": "07:00:00"
},
{
"time_range_id": 2,
"time_range_from": "07:00:00",
"time_range_to": "19:00:00"
},
{
"time_range_id": 3,
"time_range_from": "00:00:00",
"time_range_to": "07:00:00"
}
],
"TimeStepConfig" : [
{
"tsconfig_id" : 1,
"tsconfig_label" : "static",
"tsconfig_comment" : "read time steps as given in jsonfiles"
},
{
"tsconfig_id" : 2,
"tsconfig_label" : "dynamic",
"tsconfig_comment" : "determine timesteps at runtime"
}
],
"PaymentMethod": [
{
"pme_id": 1,
"pme_label": "progressive"
},
{
"pme_id": 2,
"pme_label": "degressive"
},
{
"pme_id": 3,
"pme_label": "linear"
},
{
"pme_id": 4,
"pme_label": "steps"
}
],
"PaymentOption": [
{
"pop_id": 1049,
"pop_label": "Zone 1",
"pop_payment_method_id": 4,
"pop_day_end_time": "00:00:00",
"pop_day_night_end_time": "00:00:00",
"pop_price_night": 0,
"pop_min_time": 720,
"comment_pop_min_time": "720mins -> 600 cent",
"pop_max_time": 5040,
"comment_pop_max_time": "7days -> 42 euros",
"pop_truncate_last_interpolation_step": false,
"pop_min_price": 600,
"pop_max_price": 4200,
"pop_carry_over": 1,
"pop_carry_over_option_id": 1,
"pop_prepaid_option_id" : 3,
"pop_accumulate_prices": true,
"pop_accumulate_durations": true,
"pop_interpolate_up_to_first_carry_over": 1,
"pop_interpolate_up_to_first_carry_over_comment_1": "turn interpolation off if the first carry-over interval has been reached",
"pop_interpolate_up_to_first_carry_over_comment_2": "for instance at 20:00:00",
"pop_carry_over_time_range_id": 1,
"pop_carry_over_start_time_range": 2,
"pop_carry_over_end_time_range": 3,
"pop_business_hours": 163584,
"comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours",
"pop_time_step_config": 2
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 1,
"pra_price": 600
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 2,
"pra_price": 1200
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 3,
"pra_price": 1800
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 4,
"pra_price": 2400
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 5,
"pra_price": 3000
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 6,
"pra_price": 3600
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 7,
"pra_price": 4200
}
],
"Duration": [
{
"pun_duration": 720,
"pun_id": 1,
"pun_interpolation_id": 1
},
{
"pun_duration": 720,
"pun_id": 2,
"pun_interpolation_id": 1
},
{
"pun_duration": 720,
"pun_id": 3,
"pun_interpolation_id": 1
},
{
"pun_duration": 720,
"pun_id": 4,
"pun_interpolation_id": 1
},
{
"pun_duration": 720,
"pun_id": 5,
"pun_interpolation_id": 1
},
{
"pun_duration": 720,
"pun_id": 6,
"pun_interpolation_id": 1
},
{
"pun_duration": 720,
"pun_id": 7,
"pun_interpolation_id": 1
}
],
"WeekDaysWorktime": [
{
"pwd_id": 621,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 1,
"pwd_time_from": "07:00:00",
"pwd_time_to": "19:00:00"
},
{
"pwd_id": 622,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 2,
"pwd_time_from": "07:00:00",
"pwd_time_to": "19:00:00"
},
{
"pwd_id": 623,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 3,
"pwd_time_from": "07:00:00",
"pwd_time_to": "19:00:00"
},
{
"pwd_id": 624,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 4,
"pwd_time_from": "07:00:00",
"pwd_time_to": "19:00:00"
},
{
"pwd_id": 625,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 5,
"pwd_time_from": "07:00:00",
"pwd_time_to": "19:00:00"
},
{
"pwd_id": 626,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 6,
"pwd_time_from": "07:00:00",
"pwd_time_to": "19:00:00"
},
{
"pwd_id": 626,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 7,
"pwd_time_from": "07:00:00",
"pwd_time_to": "19:00:00"
}
],
"PeriodYear": [
{
"pye_id": 8,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
}
]
}