Merge branch 'master' into zg1/zone1

This commit is contained in:
Siegfried Siegert 2024-07-19 09:58:49 +02:00
commit 42b26ee0ca
Signed by untrusted user: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
4 changed files with 3600 additions and 2 deletions

124
etc/atbapp/ATBAPP.ini Normal file
View File

@ -0,0 +1,124 @@
[COMMON]
com_port_name=/dev/ttyS1
com_baud_rate=9600
lang1=lt_LT
lang2=en_GB
lang3=de_DE
lang4=ru_RU
lang5=
defaultLanguage=1
CharacterSet="ISO 8859-13"
showInfoButton=false
showHelpButton=false
#useLanguage=[128+][64+][32+][16]
useLanguage=240
#usePayment=[128+][64+][32+][16]
usePayment=96
#useVehicle=[128+][64+][32+][16+][8]
useVehicle=192
#useProduct=[128+][64+][32+][16+][8]
useProduct=192
textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
logfile=/var/log/atbqt.log
alternativeLogoFile=/opt/app/ATBAPP/logo/logo_klaipeda2.png
feature_Log=off
feature_TouchFeedback=off
feature_StartButton=on
feature_selfOOO=off
feature_ShowParkingTime=off
suspend_methode=sysfs
suspend_program=
suspend_time=8
touch_feedback_gpio=121
touch_feedback_on_value=1
touch_feedback_off_value=0
#ooo_mode={useDisk|otherMachine}
ooo_mode=otherMachine
sellTimeout_time=60
showInfoButton=false
showHelpButton=false
useAppStates=1
statefile=/opt/app/ATBAPP/states/APP_States.xml
[SCREENCONFIG]
sc_31="1,1,0"
sc_33="1,0,1"
sc_3F="1,0,0"
sc_40="1,0,1"
sc_41="1,0,0"
sc_35="0,0,0"
sc_51="1,0,1"
sc_52="1,0,0"
sc_53="1,0,0"
[PLUGINS]
CCPlugin=AsyncPOS_CCPlugin
CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
DeviceControllerPlugin=ATBDeviceControllerPlugin
[IngenicoISelf_CCPlugin]
debug=1
PortName=/dev/ttymxc0
ZVT=DE
sleep=1
sleepExtended=1
Currency=HUF
[TCP_CONTROL]
enable=1
[PAYMENT]
currencySymbol=
currencyISOCode=EUR
cashVariant=CoinsAndNotes
paymentPointInTime=poa
useDecimal=yes
[MOBILISIS_CalculatePricePlugin]
useDebug=1
tariffFileName=/etc/psa_tariff/tariff01.json
[ATBDeviceControllerPlugin]
serialPort=ttymxc2
printerEncoding="Windows-1252"
printerLocale="de_DE"
[TCP_ZVT_CCPlugin]
CurrencyCode=EUR
debug=1
IP=192.168.6.242
Port=22000
SSL=0
ZVT=DE
sleep=1
printIntermediateStatus=1
Password=277296
NumberOfChars=37
dcHours="0"
[AsyncPOS_CCPlugin]
APAK=8AC304380E0E476BA2558B75DB9E2516
POSID=T-TPS-SELF2002in
PortName=/dev/ttymxc0
baudrate=19200
dataBits=8
dcHours=0
debug=1
parity=0
sleep=0
stopBits=1

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,976 @@
{
"Project" : "Kleipeda",
"Version" : "1.0.0-2024-06-06T14:56:00+02:00",
"Info" : "Yellow Zone",
"Currency": [
{
"pcu_id": 2,
"pcu_sign": "€",
"pcu_major": "EUR",
"pcu_minor": "",
"pcu_active": true
}
],
"PaymentMethod": [
{
"pme_id": 1,
"pme_label": "progressive"
},
{
"pme_id": 2,
"pme_label": "degressive"
},
{
"pme_id": 3,
"pme_label": "linear"
},
{
"pme_id": 4,
"pme_label": "steps"
}
],
"TimeRange" : [
{
"time_range_id": 1,
"time_range_from": "22:00:00",
"time_range_to": "08:00:00"
},
{
"time_range_id": 2,
"time_range_from": "08:00:00",
"time_range_to": "22:00:00"
},
{
"time_range_id": 3,
"time_range_from": "00:00:00",
"time_range_to": "08:00:00"
}
],
"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": 30,
"comment_pop_min_time": "30mins -> 30 cent",
"pop_max_time": 840,
"comment_pop_max_time": "840mins = 14h -> 21 euros",
"pop_min_price": 30,
"pop_max_price": 840,
"pop_carry_over": 1,
"pop_carry_over_time_range": 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"
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 1,
"pra_price": 10
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 2,
"pra_price": 20
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 3,
"pra_price": 30
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 4,
"pra_price": 40
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 5,
"pra_price": 50
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 6,
"pra_price": 60
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 7,
"pra_price": 70
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 8,
"pra_price": 80
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 9,
"pra_price": 90
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 10,
"pra_price": 100
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 11,
"pra_price": 110
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 12,
"pra_price": 120
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 13,
"pra_price": 130
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 14,
"pra_price": 140
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 15,
"pra_price": 150
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 16,
"pra_price": 160
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 17,
"pra_price": 170
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 18,
"pra_price": 180
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 19,
"pra_price": 190
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 20,
"pra_price": 200
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 21,
"pra_price": 210
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 22,
"pra_price": 220
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 23,
"pra_price": 230
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 24,
"pra_price": 240
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 25,
"pra_price": 250
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 26,
"pra_price": 260
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 27,
"pra_price": 270
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 28,
"pra_price": 280
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 29,
"pra_price": 290
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 30,
"pra_price": 300
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 31,
"pra_price": 310
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 32,
"pra_price": 320
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 33,
"pra_price": 330
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 34,
"pra_price": 340
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 35,
"pra_price": 350
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 36,
"pra_price": 360
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 37,
"pra_price": 370
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 38,
"pra_price": 380
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 39,
"pra_price": 390
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 40,
"pra_price": 400
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 41,
"pra_price": 410
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 42,
"pra_price": 420
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 43,
"pra_price": 430
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 44,
"pra_price": 440
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 45,
"pra_price": 450
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 46,
"pra_price": 460
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 47,
"pra_price": 470
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 48,
"pra_price": 480
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 49,
"pra_price": 490
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 50,
"pra_price": 500
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 51,
"pra_price": 510
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 52,
"pra_price": 520
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 53,
"pra_price": 530
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 54,
"pra_price": 540
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 55,
"pra_price": 550
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 56,
"pra_price": 560
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 57,
"pra_price": 570
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 58,
"pra_price": 580
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 59,
"pra_price": 590
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 60,
"pra_price": 600
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 61,
"pra_price": 610
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 62,
"pra_price": 620
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 63,
"pra_price": 630
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 64,
"pra_price": 640
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 65,
"pra_price": 650
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 66,
"pra_price": 660
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 67,
"pra_price": 670
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 68,
"pra_price": 680
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 69,
"pra_price": 690
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 70,
"pra_price": 700
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 71,
"pra_price": 710
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 72,
"pra_price": 720
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 73,
"pra_price": 730
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 74,
"pra_price": 740
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 75,
"pra_price": 750
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 76,
"pra_price": 760
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 77,
"pra_price": 770
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 78,
"pra_price": 780
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 79,
"pra_price": 790
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 80,
"pra_price": 800
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 81,
"pra_price": 810
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 82,
"pra_price": 820
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 83,
"pra_price": 830
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 84,
"pra_price": 840
}
],
"Duration": [
{
"pun_duration": 10,
"pun_id": 1,
"pun_label": "10 min"
},
{
"pun_duration": 20,
"pun_id": 2,
"pun_label": "20 min"
},
{
"pun_duration": 30,
"pun_id": 3,
"pun_label": "30 min"
},
{
"pun_duration": 40,
"pun_id": 4,
"pun_label": "40 min"
},
{
"pun_duration": 50,
"pun_id": 5,
"pun_label": "50 min"
},
{
"pun_duration": 60,
"pun_id": 6,
"pun_label": "60 min"
},
{
"pun_duration": 70,
"pun_id": 7,
"pun_label": "70 min"
},
{
"pun_duration": 80,
"pun_id": 8,
"pun_label": "80 min"
},
{
"pun_duration": 90,
"pun_id": 9,
"pun_label": "90 min"
},
{
"pun_duration": 100,
"pun_id": 10,
"pun_label": "100 min"
},
{
"pun_duration": 110,
"pun_id": 11,
"pun_label": "110 min"
},
{
"pun_duration": 120,
"pun_id": 12,
"pun_label": "120 min"
},
{
"pun_duration": 130,
"pun_id": 13,
"pun_label": "130 min"
},
{
"pun_duration": 140,
"pun_id": 14,
"pun_label": "140 min"
},
{
"pun_duration": 150,
"pun_id": 15,
"pun_label": "150 min"
},
{
"pun_duration": 160,
"pun_id": 16,
"pun_label": "160 min"
},
{
"pun_duration": 170,
"pun_id": 17,
"pun_label": "170 min"
},
{
"pun_duration": 180,
"pun_id": 18,
"pun_label": "180 min"
},
{
"pun_duration": 190,
"pun_id": 19,
"pun_label": "190 min"
},
{
"pun_duration": 200,
"pun_id": 20,
"pun_label": "200 min"
},
{
"pun_duration": 210,
"pun_id": 21,
"pun_label": "210 min"
},
{
"pun_duration": 220,
"pun_id": 22,
"pun_label": "220 min"
},
{
"pun_duration": 230,
"pun_id": 23,
"pun_label": "230 min"
},
{
"pun_duration": 240,
"pun_id": 24,
"pun_label": "240 min"
},
{
"pun_duration": 250,
"pun_id": 25,
"pun_label": "250 min"
},
{
"pun_duration": 260,
"pun_id": 26,
"pun_label": "260 min"
},
{
"pun_duration": 270,
"pun_id": 27,
"pun_label": "270 min"
},
{
"pun_duration": 280,
"pun_id": 28,
"pun_label": "280 min"
},
{
"pun_duration": 290,
"pun_id": 29,
"pun_label": "290 min"
},
{
"pun_duration": 300,
"pun_id": 30,
"pun_label": "300 min"
},
{
"pun_duration": 310,
"pun_id": 31,
"pun_label": "310 min"
},
{
"pun_duration": 320,
"pun_id": 32,
"pun_label": "320 min"
},
{
"pun_duration": 330,
"pun_id": 33,
"pun_label": "330 min"
},
{
"pun_duration": 340,
"pun_id": 34,
"pun_label": "340 min"
},
{
"pun_duration": 350,
"pun_id": 35,
"pun_label": "350 min"
},
{
"pun_duration": 360,
"pun_id": 36,
"pun_label": "360 min"
},
{
"pun_duration": 370,
"pun_id": 37,
"pun_label": "370 min"
},
{
"pun_duration": 380,
"pun_id": 38,
"pun_label": "380 min"
},
{
"pun_duration": 390,
"pun_id": 39,
"pun_label": "390 min"
},
{
"pun_duration": 400,
"pun_id": 40,
"pun_label": "400 min"
},
{
"pun_duration": 410,
"pun_id": 41,
"pun_label": "410 min"
},
{
"pun_duration": 420,
"pun_id": 42,
"pun_label": "420 min"
},
{
"pun_duration": 430,
"pun_id": 43,
"pun_label": "430 min"
},
{
"pun_duration": 440,
"pun_id": 44,
"pun_label": "440 min"
},
{
"pun_duration": 450,
"pun_id": 45,
"pun_label": "450 min"
},
{
"pun_duration": 460,
"pun_id": 46,
"pun_label": "460 min"
},
{
"pun_duration": 470,
"pun_id": 47,
"pun_label": "470 min"
},
{
"pun_duration": 480,
"pun_id": 48,
"pun_label": "480 min"
},
{
"pun_duration": 490,
"pun_id": 49,
"pun_label": "490 min"
},
{
"pun_duration": 500,
"pun_id": 50,
"pun_label": "500 min"
},
{
"pun_duration": 510,
"pun_id": 51,
"pun_label": "510 min"
},
{
"pun_duration": 520,
"pun_id": 52,
"pun_label": "520 min"
},
{
"pun_duration": 530,
"pun_id": 53,
"pun_label": "530 min"
},
{
"pun_duration": 540,
"pun_id": 54,
"pun_label": "540 min"
},
{
"pun_duration": 550,
"pun_id": 55,
"pun_label": "550 min"
},
{
"pun_duration": 560,
"pun_id": 56,
"pun_label": "560 min"
},
{
"pun_duration": 570,
"pun_id": 57,
"pun_label": "570 min"
},
{
"pun_duration": 580,
"pun_id": 58,
"pun_label": "580 min"
},
{
"pun_duration": 590,
"pun_id": 59,
"pun_label": "590 min"
},
{
"pun_duration": 600,
"pun_id": 60,
"pun_label": "600 min"
},
{
"pun_duration": 610,
"pun_id": 61,
"pun_label": "610 min"
},
{
"pun_duration": 620,
"pun_id": 62,
"pun_label": "620 min"
},
{
"pun_duration": 630,
"pun_id": 63,
"pun_label": "630 min"
},
{
"pun_duration": 640,
"pun_id": 64,
"pun_label": "640 min"
},
{
"pun_duration": 650,
"pun_id": 65,
"pun_label": "650 min"
},
{
"pun_duration": 660,
"pun_id": 66,
"pun_label": "660 min"
},
{
"pun_duration": 670,
"pun_id": 67,
"pun_label": "670 min"
},
{
"pun_duration": 680,
"pun_id": 68,
"pun_label": "680 min"
},
{
"pun_duration": 690,
"pun_id": 69,
"pun_label": "690 min"
},
{
"pun_duration": 700,
"pun_id": 70,
"pun_label": "700 min"
},
{
"pun_duration": 710,
"pun_id": 71,
"pun_label": "710 min"
},
{
"pun_duration": 720,
"pun_id": 72,
"pun_label": "720 min"
},
{
"pun_duration": 730,
"pun_id": 73,
"pun_label": "730 min"
},
{
"pun_duration": 740,
"pun_id": 74,
"pun_label": "740 min"
},
{
"pun_duration": 750,
"pun_id": 75,
"pun_label": "750 min"
},
{
"pun_duration": 760,
"pun_id": 76,
"pun_label": "760 min"
},
{
"pun_duration": 770,
"pun_id": 77,
"pun_label": "770 min"
},
{
"pun_duration": 780,
"pun_id": 78,
"pun_label": "780 min"
},
{
"pun_duration": 790,
"pun_id": 79,
"pun_label": "790 min"
},
{
"pun_duration": 800,
"pun_id": 80,
"pun_label": "800 min"
},
{
"pun_duration": 810,
"pun_id": 81,
"pun_label": "810 min"
},
{
"pun_duration": 820,
"pun_id": 82,
"pun_label": "820 min"
},
{
"pun_duration": 830,
"pun_id": 83,
"pun_label": "830 min"
},
{
"pun_duration": 840,
"pun_id": 84,
"pun_label": "840 min"
}
],
"WeekDaysWorktime": [
{
"pwd_id": 621,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 1,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 622,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 2,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 623,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 3,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 624,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 4,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 625,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 5,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 626,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 6,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22:00:00"
},
{
"pwd_id": 626,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 7,
"pwd_time_from": "08:00:00",
"pwd_time_to": "22: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
}
]
}

View File

@ -4,8 +4,8 @@
# opkg-commands added to this file will be executed by ATBUpdateTool.
###############################################################################
#
opkg update
opkg install prepare-update
#opkg update
#opkg install prepare-update
#
#opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
#opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc