Updated to use new prices.

new price: 165
    new daily price: 990
tariff02:
    new price: 260
    new daily price: 1560
tariff03:
    new price: 360
    new daily price: 2160
tariff04:
    new price: 650

Set new holidays starting from Dec. 2023.

.githooks/post-merge

@@ -11,8 +11,10 @@ if [ -z $IFS ]; then
     IFS=$'\n'
 fi
 
+
 GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
 
+
 #TODO: use in UpdateController
 
 get_blob () {   # get the blob of the file(name) passed as $1
@@ -27,6 +29,7 @@ get_commit_for_blob () {
            grep -q $1 && echo -n {} && head -n 1")
 }
 
+
 write_log_file () {
     local now=$(date +"%Y-%m-%dT%T")
     for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do

.gitignore

@@ -1,16 +1,27 @@
+# First, ignore everything
 *
-
+# Now, whitelist anything that's a directory
-## Except
+!*/
+# And all the file types you're interested in
+!.gitignore
+!.githooks/post-merge
+!.githooks/post-checkout
 !**/.gitignore
 !**/.githooks/post-merge
-!/etc/*.ini
+!**/.githooks/post-checkout
-!/etc/atb/*.ini
-!/etc/psa_config/*
-!/etc/psa_update/*
-!/etc/psa_tariff/*
-!/etc/dc/dc2c.hex
 
-!/opt/app/ATBAPP/*.ini
+## Except
-!/opt/app/sysconfig/*.ini
+!etc/atb/*
-!/opt/app/ISMASMgr/*.ini
+!etc/psa_config/*
+!etc/psa_update/*
+!etc/psa_tariff/*
+!etc/dc/*.hex
+!etc/dc/*.bin
+!*/etc/*.ini
+!*/etc/atb/*
+!*/etc/psa_config/*
+!*/etc/psa_update/*
+!*/etc/psa_tariff/*
+!*/etc/dc/*.hex
+!*/etc/dc/*.bin
 

DC2C_print23.json

@@ -1,35 +0,0 @@
-"title":"DC2C_pri23",
-"project":"DBM Szeged StartParking",
-"styl":"size 00",
-"feed":"nl",
-"text":"Szegedi Közlekedési Kft",
-"feed":"nl",
-"text":"   6720 Szeged",
-"feed":"nl",
-"text":" Zrínyi utca 4-8.",
-"feed":"nl",
-"text":"Adósz: 11092612-2-06",
-"feed":"nl",
-"feed":"nl",
-"text":"Parkolás a zónában érvényes",
-"feed":"nl",
-"text":"4 óra maximális
-"feed":"nl",
-"text":"várakozási idő után ",
-"feed":"nl",
-"text":"AUTOMATIKUSAN LEÁLL",
-"feed":"nl",
-"text":"Leállító KÓD:",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic07",
-"feed":"nl",
-"vari":"Dynamic08",
-"styl":"size 00",
-"feed":"nl",
-"text":"Õrizze meg, tartsa magánál!",
-"feed":"nl",
-"feed":"eject"
-}
-
-

etc/dc/dc2c.bin

@@ -0,0 +1 @@
+dc2c.4.33.bin

etc/psa_config/DC2C_cash.json

@@ -1,16 +0,0 @@
-{	     
-"title":"DC2C_cash  ",
-"project":"DBM Szeged",
-"version":"1.0.0-2024-07-05",
-"CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3],
-"CoinValue(15..0)":[730,365,185,0,0,0,0,100,200,100,50,20,10,5,0,3],
-"CoinAccept(15..0)":[1,1,1,0,0,0,0,1,1,1,1,1,1,1,0,1],
-"ExchangeRate":365,
-"TokenChannel":1,
-"BillValues(7..0)":[0,0,0,0,0,0,0,0],
-"LocalTaxRate":20,
-"ForeignTaxRate":19,
-"Surcharge":0,	
-"Discount":0
-}
-

etc/psa_config/DC2C_print22.json

@@ -1,27 +0,0 @@
-"title":"DC2C_pri22",
-"project":"DBM Szeged StartParking",
-"styl":"size 00",
-"text":"Automata száma: ",
-"vari":"manu",
-"feed":"nl",
-"text":"Igazoló sz. sorsz: ",
-"feed":"nl",
-"vari":"Dynamic07",
-"feed":"nl",
-"vari":"Dynamic08",
-"feed":"nl",
-"text":"Az igazolo szelvény",
-"feed":"nl"
-"text":"a nyugtával együtt érvényes. ",
-"feed":"nl",
-"feed":"nl",
-"text":"Üf. szolg nyitvatartás:",
-"feed":"nl",
-"text":"Zrínyi utca 4-8",
-"feed":"nl",
-"text":"H - P: 7:45 - 17:00",
-"feed":"nl",
-"text":"Tel: (80) 820-500",
-"feed":"nl",
-"feed":"nl"
-}

etc/psa_config/DC2C_print25.json

@@ -1,29 +0,0 @@
-{
-"title":"DC2C_pri25",
-"project":"DBM Szeged StopParking",
-"text":"érvényes.",
-"feed":"nl",
-"feed":"nl",
-"text":"Üf. szolg nyitvatartás:"
-"feed":"nl",
-"text":"    Zrínyi utca 4-8",
-"styl":"size 00",
-"feed":"nl",
-"text":"  H - P: 7:45 - 17:00",
-"feed":"nl",
-"text":"   Tel: (80) 820-500",
-"feed":"nl",
-"feed":"nl",
-"text":"Szegedi Közlekedési Kft",
-"feed":"nl",
-"text":"   6720 Szeged ",
-"feed":"nl",
-"text":" Zrínyi utca 4-8.",
-"feed":"nl",
-"text":"Adósz: 11092612-2-06",
-"feed":"nl",
-"text":"  A jegy ára az ÁFA-t",
-"feed":"nl",
-"text":"     tartalmazza!",
-"feed":"nl"
-}

etc/psa_config/DC2C_print28.json

@@ -1,34 +0,0 @@
-{
-"title":"DC2C_pri28",
-"project":"DBM Szeged Error",
-"styl":"size 00",
-"text":" Üf. szolg nyitvatartás:",
-"feed":"nl",
-"text":"  Zrínyi utca 4-8 ",
-"feed":"nl",
-"text":"  H - P: 7:45 - 17:00",
-"feed":"nl",
-"text":"   Tel: (80) 820-500",
-"feed":"nl",
-"feed":"nl",
-"text":"Szegedi Közlekedési Kft",
-"feed":"nl",
-"text":"     6720",
-"text":" Szeged ",
-"feed":"nl",
-"text":"  Zrínyi utca 4-8",
-"feed":"nl",
-"text":"Adósz: ", 
-"text":"11092612-2-06", 
-"feed":"nl",
-"feed":"nl",
-"text":"Parkoljon egy érintéssel.",
-"feed":"nl",
-"text":"Használja bankkártyáját",
-"feed":"nl",
-"text":"  automatáinknál",
-"text":" is!",
-"feed":"nl",
-"feed":"eject"
-
-}

etc/psa_update/opkg_commands

@@ -3,18 +3,18 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-##
+# 
+opkg info atbqt
+opkg info atbupdatetool
 opkg update
-# opkg install prepare-update
+opkg install prepare-update
-# download packages
+opkg install atbupdatetool
-# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
+# opkg remove atb-accountingtool
-# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
+# opkg install atb-accountingtool
-# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg --download-only upgrade
-opkg --cache /var/cache/opkg --download-only upgrade atbqt=4.99.11+git0+66f98a3bef-r0
+opkg --cache /var/cache/opkg upgrade
-opkg --cache /var/cache/opkg --download-only upgrade apism=1.7.0-r1
+# opkg remove apism
-# install packages
+# opkg install apism
-# opkg --cache /var/cache/opkg upgrade tariff-config-281
+opkg info apism
-# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
+opkg info atbqt
-# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
+opkg info atbupdatetool
-opkg --cache /var/cache/opkg upgrade atbqt=4.99.11+git0+66f98a3bef-r0
-opkg --cache /var/cache/opkg upgrade apism=1.7.0-r1