diff --git a/.githooks/post-checkout b/.githooks/post-checkout index 76812cf..8b86380 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -24,8 +24,27 @@ write_log_file () { echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print05.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print06.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print07.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print08.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print09.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print10.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print11.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print12.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print13.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print14.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print15.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print16.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print17.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print18.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print19.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_print20.json, $now, N/A" >> $GIT_UPDATE_LOG echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_device.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_cash.json, $now, N/A" >> $GIT_UPDATE_LOG + echo "DOWNLOAD, /etc/psa_config/DC2C_conf.json, $now, N/A" >> $GIT_UPDATE_LOG if [ -f "$OPKG_COMMANDS_FILE" ]; then if grep -qE . "${OPKG_COMMANDS_FILE}"; then readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE) @@ -40,10 +59,10 @@ write_log_file () { done fi fi + echo "$line" >> $CHECKOUT_HISTORY_FILE else echo "Found existing line: $line. Do nothing" fi - echo "$line" >> $CHECKOUT_HISTORY_FILE # echo "$line @$now" >> $CHECKOUT_HISTORY_FILE else echo "*******************************************************" diff --git a/etc/dc/dc2c.4.33.bin b/etc/dc/dc2c.4.33.bin new file mode 100755 index 0000000..2b86ef5 Binary files /dev/null and b/etc/dc/dc2c.4.33.bin differ diff --git a/etc/dc/dc2c.bin b/etc/dc/dc2c.bin index 28e7d83..4fe4ead 120000 --- a/etc/dc/dc2c.bin +++ b/etc/dc/dc2c.bin @@ -1 +1 @@ -dc2c.4.22.bin \ No newline at end of file +dc2c.4.33.bin \ No newline at end of file diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 0d2f62d..ca860e4 100644 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -1,16 +1,17 @@ { "title":"DC2C_cash ", "project":"DBM Szeged", -"version":"13.02.2023 12:20 00001", -"localCoinAccept(7..0)":[0,0,0,1,1,1,1,1], -"Name of Currency":"Huf", -"local tax rate":20, -"foreignCoinAccept(15..8)":[0,0,0,0,0,1,1,1], -"CurrencyName":"EUR", -"foreign tax rate":19, -"TokenChannel":3, -"Bills(7..0)":[0,0,0,0,0,0,0,0], -"surcharge":0, -"discount":0, -"":"" +"version":"22.03.2023 11:59 01.02.03", +"CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3], +"CoinValue(15..0)":[760,380,190,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":378 +"TokenChannel":1, +"BillValues(7..0)":[0,0,0,0,0,0,0,0], +"LocalTaxRate":20, +"ForeignTaxRate":19, +"Surcharge":0, +"Discount":0, + } + diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index cb0aa24..1aacc4a 100644 --- a/etc/psa_config/DC2C_conf.json +++ b/etc/psa_config/DC2C_conf.json @@ -3,11 +3,10 @@ "project":"DBM Szeged", "version":"13.02.2023 12:20 00001", "custNum":281, -"machNum":999, +"machNum":997, "borough":1, "zone":1, -"alias":1357, -"location":"92637Weiden/Opf_Bahnhofstraße 65", -"":"" +"alias":997, +"location":"ATB Thomas' office" } diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json new file mode 100644 index 0000000..0d1b38b --- /dev/null +++ b/etc/psa_config/DC2C_device.json @@ -0,0 +1,25 @@ +{ +"title":"DC2C_device", +"project":"DBM Szeged", +"Version":"13.02.2023 12:20 00001", +"printer":1, +"coinChk":1, +"mifRd":1, +"solarPwr":1, +"modem":1, +"creditCard":0, +"escrow":1, +"RejMotor":1, +"shutter":1, +"billRd":1, +"vaultLock":1, +"autoAlarm":1, +"autoOpen":1, +"AccPrint":1, +"DorPrint":1, +"TokPrint":1, +"CBwarnLev":1600, +"CBerrLev":1900 + +} + diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index bd160c8..171324d 100644 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -1,6 +1,6 @@ { "title":"DC2C_pri01", -"project":"DBM Szeged park_coins", +"project":"DBM Szeged coins hour", "issued":"13.04.2023 01.02", "styl":"font 08", "styl":"size 10", @@ -9,7 +9,7 @@ "text":"PARKOLÓJEGY", "styl":"size 00", "feed":"nl", -"text":" Nyugta", +"text":"cash short term", "feed":"nl", "text":"Kérjük az elsö szélvédö", "feed":"nl", @@ -33,6 +33,8 @@ "text":"Parkolás helye: ", "feed":"nl", "vari":"location", +"feed":"nl", +"feed":"nl", } diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 39c031d..a8b3392 100644 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -32,6 +32,8 @@ "feed":"nl", "text":"Üf. szolg nyitvatartás:", "feed":"nl", +"feed":"nl", +"feed":"nl", } diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json index a7a91fa..5290dfa 100644 --- a/etc/psa_config/DC2C_print04.json +++ b/etc/psa_config/DC2C_print04.json @@ -1,8 +1,9 @@ { "title":"DC2C_pri04", -"project":"empty", -"issued":"24.05.2023 01.00", -"text":"" +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 10" + } diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index e16952d..905d799 100644 --- a/etc/psa_config/DC2C_print05.json +++ b/etc/psa_config/DC2C_print05.json @@ -1,5 +1,40 @@ -{ -"title":"DC2C_pri05", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri05", +"project":"DBM Szeged CC hour", +"issued":"13.04.2023 01.02", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"text":"PARKOLÓJEGY", +"styl":"size 00", +"feed":"nl", +"text":"card pay short", +"feed":"nl", +"text":"Kérjük az elsö szélvédö", +"feed":"nl", +"text":"mögé jól láthatóan", +"feed":"nl", +"text":"elhelyezni!", +"feed":"nl", +"text":"A PARKOLÓ NEM ÕRZÖTT", +"feed":"nl", +"feed":"nl", +"text":"Rendszám: ", +"vari":"Dynamic01", +"feed":"nl", +"text":"Parkolási idõ vége:", +"feed":"nl", +"styl":"size 01", +"vari":"Dynamic04", +"vari":"Dynamic03", +"styl":"size 00", +"feed":"nl", +"text":"Parkolás helye: ", +"feed":"nl", +"vari":"location", +"feed":"nl", +"feed":"nl", +} + + diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index de75f30..5e1957a 100644 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -1,5 +1,39 @@ -{ -"title":"DC2C_pri06", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri06", +"project":"DBM Szeged", +"issued":"13.04.2023 01.01", + +"text":"Összeg: ", +"styl":"size 01", +"vari":"Dynamic02", +"styl":"size 00", +"feed":"nl", +"text":"Kiadás időpontja:", +"feed":"nl", +"vari":"date us", +"vari":"time short", +"feed":"nl", +"text":"Automata száma: ", +"vari":"manu", +"text":"Park.jegy sorsz.: ", +"vari":"TickCtr", +"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", +"text":"Üf. szolg nyitvatartás:", +"feed":"nl", +"feed":"nl", +"feed":"nl", +} + + diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index e175462..9f425b0 100644 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -1,5 +1,22 @@ -{ -"title":"DC2C_pri07", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri07", +"project":"DBM Szeged", +"issued":"13.04.2023 01.01", + +"styl":"size 00", +"text":"H - P: 7:45 - 17:00", +"feed":"nl", +"text":"Tel: (80) 820-500", +"feed":"nl", +"text":"Parkoljon egy érintéssel. ", +"feed":"nl", +"text":"Használja bankkártyáját ", +"feed":"nl", +"text":" automatáinknál is!", +"feed":"nl", +"feed":"nl", +"feed":"nl", +"feed":"eject", +} + + diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index f85d23f..6b5d4e7 100644 --- a/etc/psa_config/DC2C_print08.json +++ b/etc/psa_config/DC2C_print08.json @@ -1,5 +1,8 @@ -{ -"title":"DC2C_pri08", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri08", +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 10" +} + + diff --git a/etc/psa_config/DC2C_print09.json b/etc/psa_config/DC2C_print09.json index d98dc90..5a4849a 100644 --- a/etc/psa_config/DC2C_print09.json +++ b/etc/psa_config/DC2C_print09.json @@ -1,5 +1,40 @@ -{ -"title":"DC2C_pri09", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri09", +"project":"DBM Szeged cash day", +"issued":"13.04.2023 01.02", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"text":"PARKOLÓJEGY", +"styl":"size 00", +"feed":"nl", +"text":"Cash day ticket", +"feed":"nl", +"text":"Kérjük az elsö szélvédö", +"feed":"nl", +"text":"mögé jól láthatóan", +"feed":"nl", +"text":"elhelyezni!", +"feed":"nl", +"text":"A PARKOLÓ NEM ÕRZÖTT", +"feed":"nl", +"feed":"nl", +"text":"Rendszám: ", +"vari":"Dynamic01", +"feed":"nl", +"text":"Parkolási idõ vége:", +"feed":"nl", +"styl":"size 01", +"vari":"Dynamic04", +"vari":"Dynamic03", +"styl":"size 00", +"feed":"nl", +"text":"Parkolás helye: ", +"feed":"nl", +"vari":"location", +"feed":"nl", +"feed":"nl", +} + + diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index 47ab37f..3d672d5 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,39 @@ -{ -"title":"DC2C_pri10", -"version":"27.02.2023 12:20 00001", -"test":"05062023-16:03" -} +{ +"title":"DC2C_pri10", +"project":"DBM Szeged", +"issued":"13.04.2023 01.01", + +"text":"Összeg: ", +"styl":"size 01", +"vari":"Dynamic02", +"styl":"size 00", +"feed":"nl", +"text":"Kiadás időpontja:", +"feed":"nl", +"vari":"date us", +"vari":"time short", +"feed":"nl", +"text":"Automata száma: ", +"vari":"manu", +"text":"Park.jegy sorsz.: ", +"vari":"TickCtr", +"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", +"text":"Üf. szolg nyitvatartás:", +"feed":"nl", +"feed":"nl", +"feed":"nl", +} + + diff --git a/etc/psa_config/DC2C_print11.json b/etc/psa_config/DC2C_print11.json index b48b5d2..a1084a3 100644 --- a/etc/psa_config/DC2C_print11.json +++ b/etc/psa_config/DC2C_print11.json @@ -1,5 +1,22 @@ -{ -"title":"DC2C_pri11", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri11", +"project":"DBM Szeged", +"issued":"13.04.2023 01.01", + +"styl":"size 00", +"text":"H - P: 7:45 - 17:00", +"feed":"nl", +"text":"Tel: (80) 820-500", +"feed":"nl", +"text":"Parkoljon egy érintéssel. ", +"feed":"nl", +"text":"Használja bankkártyáját ", +"feed":"nl", +"text":" automatáinknál is!", +"feed":"nl", +"feed":"nl", +"feed":"nl", +"feed":"eject", +} + + diff --git a/etc/psa_config/DC2C_print12.json b/etc/psa_config/DC2C_print12.json index b05d835..a7cf937 100644 --- a/etc/psa_config/DC2C_print12.json +++ b/etc/psa_config/DC2C_print12.json @@ -1,5 +1,8 @@ -{ -"title":"DC2C_pri12", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri12", +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 10" +} + + diff --git a/etc/psa_config/DC2C_print13.json b/etc/psa_config/DC2C_print13.json index 8f3bf7c..b5302b2 100644 --- a/etc/psa_config/DC2C_print13.json +++ b/etc/psa_config/DC2C_print13.json @@ -1,5 +1,40 @@ -{ -"title":"DC2C_pri13", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri13", +"project":"DBM Szeged card day", +"issued":"13.04.2023 01.02", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"text":"PARKOLÓJEGY", +"styl":"size 00", +"feed":"nl", +"text":"card pay day", +"feed":"nl", +"text":"Kérjük az elsö szélvédö", +"feed":"nl", +"text":"mögé jól láthatóan", +"feed":"nl", +"text":"elhelyezni!", +"feed":"nl", +"text":"A PARKOLÓ NEM ÕRZÖTT", +"feed":"nl", +"feed":"nl", +"text":"Rendszám: ", +"vari":"Dynamic01", +"feed":"nl", +"text":"Parkolási idõ vége:", +"feed":"nl", +"styl":"size 01", +"vari":"Dynamic04", +"vari":"Dynamic03", +"styl":"size 00", +"feed":"nl", +"text":"Parkolás helye: ", +"feed":"nl", +"vari":"location", +"feed":"nl", +"feed":"nl", +} + + diff --git a/etc/psa_config/DC2C_print14.json b/etc/psa_config/DC2C_print14.json index 32628fa..d09717c 100644 --- a/etc/psa_config/DC2C_print14.json +++ b/etc/psa_config/DC2C_print14.json @@ -1,5 +1,39 @@ -{ -"title":"DC2C_pri14", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri14", +"project":"DBM Szeged", +"issued":"13.04.2023 01.01", + +"text":"Összeg: ", +"styl":"size 01", +"vari":"Dynamic02", +"styl":"size 00", +"feed":"nl", +"text":"Kiadás időpontja:", +"feed":"nl", +"vari":"date us", +"vari":"time short", +"feed":"nl", +"text":"Automata száma: ", +"vari":"manu", +"text":"Park.jegy sorsz.: ", +"vari":"TickCtr", +"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", +"text":"Üf. szolg nyitvatartás:", +"feed":"nl", +"feed":"nl", +"feed":"nl", +} + + diff --git a/etc/psa_config/DC2C_print15.json b/etc/psa_config/DC2C_print15.json index 3782788..0e8657d 100644 --- a/etc/psa_config/DC2C_print15.json +++ b/etc/psa_config/DC2C_print15.json @@ -1,5 +1,22 @@ -{ -"title":"DC2C_pri15", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri15", +"project":"DBM Szeged park_coins", +"issued":"13.04.2023 01.01", + +"styl":"size 00", +"text":"H - P: 7:45 - 17:00", +"feed":"nl", +"text":"Tel: (80) 820-500", +"feed":"nl", +"text":"Parkoljon egy érintéssel. ", +"feed":"nl", +"text":"Használja bankkártyáját ", +"feed":"nl", +"text":" automatáinknál is!", +"feed":"nl", +"feed":"nl", +"feed":"nl", +"feed":"eject", +} + + diff --git a/etc/psa_config/DC2C_print16.json b/etc/psa_config/DC2C_print16.json index 4f4ce0a..37ebb51 100644 --- a/etc/psa_config/DC2C_print16.json +++ b/etc/psa_config/DC2C_print16.json @@ -1,5 +1,8 @@ -{ -"title":"DC2C_pri16", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri16", +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 10" +} + + diff --git a/etc/psa_config/DC2C_print17.json b/etc/psa_config/DC2C_print17.json index 0adf0ac..5062d97 100644 --- a/etc/psa_config/DC2C_print17.json +++ b/etc/psa_config/DC2C_print17.json @@ -1,5 +1,32 @@ -{ -"title":"DC2C_pri17", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri17", +"styl":"align l", +"feed":"margin01", +"feed":"nl", +"feed":"nl", +"feed":"nl", +"feed":"part", +"text":"Utazzon tovább " +"text":"közösségi " +"text":"közle-" +"text":"kedéssel! Ehhez a " +"text":"leválasztható" +"text":" szelvényhez a közösségi " +"text":"közle- " +"text":"kedési járművek (villa" +"text":"mos, helyi- jár" +"text":"atos busz,troli" +"text":"busz,vasút", +"text":"villa-mos) ba", +"text":"nkkártyás fedélzeti " +"text":"jegy- kiadó automatá" +"text":"iból,illetve" +"text":" a jegy- árusí" +"text":"tó applikációk" +"text":"ból Közte" +"text":"rületi" +"text":"fizető ", +"text":"parkolás na" +"text":"pijegyhez vál- tott " + + diff --git a/etc/psa_config/DC2C_print18.json b/etc/psa_config/DC2C_print18.json index f2ade62..fc0d780 100644 --- a/etc/psa_config/DC2C_print18.json +++ b/etc/psa_config/DC2C_print18.json @@ -1,5 +1,21 @@ -{ -"title":"DC2C_pri18", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +"title":"DC2C_pri18", +"styl":"align l", +"feed":"margin01", +"text":"fizető ", +"text":"parkolás na" +"text":"pijegyhez vál- tott " +"text":"kiegészítő " +"text":"Körút napijegy" +"text":" vá-sárolható " +"text":"(ára 440,-Ft)" +"text":"1 fő részé-re." +"text":" Ez a napijegy " +"text":"Szeged, Nagy- körút" +"text":"ig bezárólag illet" +"text":"ve a Nagy- kör" +"text":"úton túli első " +"text":"megálló" +"text":"helytől" +"text":" agy megálló" +"text":"helyig kor" +"text":"látlan uta-" \ No newline at end of file diff --git a/etc/psa_config/DC2C_print19.json b/etc/psa_config/DC2C_print19.json index 6a27189..dfaae61 100644 --- a/etc/psa_config/DC2C_print19.json +++ b/etc/psa_config/DC2C_print19.json @@ -1,5 +1,31 @@ -{ -"title":"DC2C_pri19", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri19", +"styl":"align l", +"feed":"margin01", +"text":"vagy megálló" +"text":"helyig kor" +"text":"látlan uta-" +"text":"zás" +"text":"ra érvényes a " +"text":"parkolás nap-" +"text":" ján." +"text":"Ellenőrz" +"text":"éshez ezt a szelvényt" +"text":"és az utazásra " +"text":"jogosító papírt" +"feed":"nl", +"text":"vagy elektronikus " +"text":"napijegyet " +"feed":"nl", +"text":"együttesen kell " +"text":"bemutatni." +"feed":"nl", +"text":"Rendszám:" +"vari":"Dynamic01", +"text":"Parkolás kezdete:" +"feed":"nl", +"text":"(Kék Zóna)" +"feed":"nl", +"vari":"date us", +"vari":"time short", +"feed":"eject", diff --git a/etc/psa_config/DC2C_print20.json b/etc/psa_config/DC2C_print20.json index b1a1a6c..68c7408 100644 --- a/etc/psa_config/DC2C_print20.json +++ b/etc/psa_config/DC2C_print20.json @@ -1,5 +1,9 @@ -{ -"title":"DC2C_pri20", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file +{ +"title":"DC2C_pri20", +"project":"empty template", +"issued":"09.06.2023 01.01", +"styl":"size 10" + +} + + diff --git a/etc/psa_config/DC2C_print21.json b/etc/psa_config/DC2C_print21.json deleted file mode 100644 index f54f36a..0000000 --- a/etc/psa_config/DC2C_print21.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri21", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print22.json b/etc/psa_config/DC2C_print22.json deleted file mode 100644 index 60285ba..0000000 --- a/etc/psa_config/DC2C_print22.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri22", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print23.json b/etc/psa_config/DC2C_print23.json deleted file mode 100644 index 905bd39..0000000 --- a/etc/psa_config/DC2C_print23.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri23", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print24.json b/etc/psa_config/DC2C_print24.json deleted file mode 100644 index bac985c..0000000 --- a/etc/psa_config/DC2C_print24.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri24", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print25.json b/etc/psa_config/DC2C_print25.json deleted file mode 100644 index 7f21d88..0000000 --- a/etc/psa_config/DC2C_print25.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri25", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print26.json b/etc/psa_config/DC2C_print26.json deleted file mode 100644 index 93880b7..0000000 --- a/etc/psa_config/DC2C_print26.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri26", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print27.json b/etc/psa_config/DC2C_print27.json deleted file mode 100644 index aa74d57..0000000 --- a/etc/psa_config/DC2C_print27.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri27", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print28.json b/etc/psa_config/DC2C_print28.json deleted file mode 100644 index 706eaa9..0000000 --- a/etc/psa_config/DC2C_print28.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri28", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print30.json b/etc/psa_config/DC2C_print30.json deleted file mode 100644 index 0fa09d2..0000000 --- a/etc/psa_config/DC2C_print30.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri30", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json deleted file mode 100644 index 68b706d..0000000 --- a/etc/psa_config/DC2C_print31.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri31", -"version":"27.02.2023 12:20 00001", -"":"iiii" -} diff --git a/etc/psa_config/DC2C_serial.json b/etc/psa_config/DC2C_serial.json deleted file mode 100644 index d73012b..0000000 --- a/etc/psa_config/DC2C_serial.json +++ /dev/null @@ -1,13 +0,0 @@ -{ -"title":"DC2C_serial", -"setup_master_interface":"", -"project":"DBM Szeged", -"version":"13.02.2023 12:20 00001", -"crcChk":1, -"baudRate":9600, -"data":8, -"parity":"no", -"stop":1, -"":"" -} - diff --git a/etc/psa_config/tariff01.json b/etc/psa_config/tariff01.json deleted file mode 100644 index a4f50e6..0000000 --- a/etc/psa_config/tariff01.json +++ /dev/null @@ -1,2 +0,0 @@ -{"version":"0.1.0","project":"szeged","zone":2,"info":"summer sale","Currency":[{"pcu_id":2,"pcu_sign":"Ft","pcu_major":"HUF","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"}],"PaymentOption":[{"pop_id":22,"pop_label":"Zone 2","pop_payment_method_id":3,"pop_day_end_time":"00:00:00","pop_day_night_end_time":"00:00:00","pop_price_night":0,"pop_min_time":15,"pop_max_time":240,"pop_min_price":120,"pop_carry_over":1}],"PaymentRate":[{"pra_payment_option_id":22,"pra_payment_unit_id":3,"pra_price":480}],"Duration":[{"pun_id":1,"pun_label":"1h","pun_duration":60},{"pun_id":2,"pun_label":"1 min","pun_duration":1},{"pun_id":3,"pun_label":"15 min","pun_duration":15},{"pun_id":4,"pun_label":"1d","pun_duration":1440},{"pun_id":6,"pun_label":"2h","pun_duration":120},{"pun_id":7,"pun_label":"3h","pun_duration":180},{"pun_id":11,"pun_label":"4h","pun_duration":240},{"pun_id":17,"pun_label":"30 min","pun_duration":30},{"pun_id":18,"pun_label":"1.5h","pun_duration":90},{"pun_id":20,"pun_label":"10min","pun_duration":10}],"WeekDaysWorktime":[{"pwd_id":540,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":1,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":541,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":2,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":542,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":3,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":543,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":4,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":544,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":5,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"}],"PeriodYear":[{"pye_id":1,"pye_label":"Summer","pye_start_month":6,"pye_start_day":1,"pye_end_month":9,"pye_end_day":30},{"pye_id":2,"pye_label":"Winter","pye_start_month":10,"pye_start_day":1,"pye_end_month":5,"pye_end_day":31},{"pye_id":8,"pye_label":"Whole year","pye_start_month":1,"pye_start_day":1,"pye_end_month":12,"pye_end_day":31}],"SpecialDaysWorktime":[{"pedwt_id":2156,"pedwt_period_exc_day_id":2024,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2158,"pedwt_period_exc_day_id":2025,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2160,"pedwt_period_exc_day_id":2026,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2162,"pedwt_period_exc_day_id":2027,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2164,"pedwt_period_exc_day_id":2028,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2170,"pedwt_period_exc_day_id":2030,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2172,"pedwt_period_exc_day_id":2032,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2174,"pedwt_period_exc_day_id":11,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2175,"pedwt_period_exc_day_id":13,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2178,"pedwt_period_exc_day_id":2022,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2179,"pedwt_period_exc_day_id":14,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2180,"pedwt_period_exc_day_id":2017,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2181,"pedwt_period_exc_day_id":2018,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2182,"pedwt_period_exc_day_id":2019,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2183,"pedwt_period_exc_day_id":2020,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2184,"pedwt_period_exc_day_id":2021,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2185,"pedwt_period_exc_day_id":2023,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2188,"pedwt_period_exc_day_id":2031,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2189,"pedwt_period_exc_day_id":2029,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2194,"pedwt_period_exc_day_id":2034,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2196,"pedwt_period_exc_day_id":2035,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2198,"pedwt_period_exc_day_id":2036,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2200,"pedwt_period_exc_day_id":2037,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2202,"pedwt_period_exc_day_id":2038,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2219,"pedwt_period_exc_day_id":2041,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2220,"pedwt_period_exc_day_id":2042,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2221,"pedwt_period_exc_day_id":2043,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2222,"pedwt_period_exc_day_id":2044,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2223,"pedwt_period_exc_day_id":2045,"pedwt_time_from":"00:00:00","pedwt_time_to":"01:00:00","pedwt_price":0},{"pedwt_id":2224,"pedwt_period_exc_day_id":2046,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2226,"pedwt_period_exc_day_id":2016,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0}],"SpecialDays":[{"ped_id":11,"ped_label":"Christmas 1st day","ped_date_start":"2022-12-25","ped_date_end":"2022-12-25","ped_period_special_day_id":2,"ped_year":0},{"ped_id":13,"ped_label":"Christmas 2nd day","ped_date_start":"2022-12-26","ped_date_end":"2022-12-26","ped_period_special_day_id":2,"ped_year":0},{"ped_id":14,"ped_label":"Republic Day (Hungary)","ped_date_start":"2022-10-23","ped_date_end":"2022-10-23","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2016,"ped_label":"Christmas (Sunday)","ped_date_start":"2022-12-24","ped_date_end":"2022-12-24","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2017,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-27","ped_date_end":"2022-12-27","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2018,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-28","ped_date_end":"2022-12-28","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2019,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-29","ped_date_end":"2022-12-29","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2020,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-30","ped_date_end":"2022-12-30","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2021,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-31","ped_date_end":"2022-12-31","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2022,"ped_label":"NewYear","ped_date_start":"2023-01-01","ped_date_end":"2023-01-01","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2023,"ped_label":"Holiday (Hungary)","ped_date_start":"2023-01-02","ped_date_end":"2023-01-02","ped_period_special_day_id":1,"ped_year":2024},{"ped_id":2024,"ped_label":"Good Friday","ped_date_start":"2023-04-07","ped_date_end":"2023-04-07","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2025,"ped_label":"Easter Sunday","ped_date_start":"2023-04-09","ped_date_end":"2023-04-09","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2026,"ped_label":"Easter Monday","ped_date_start":"2023-04-10","ped_date_end":"2023-04-10","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2027,"ped_label":"Whit Sunday","ped_date_start":"2023-05-28","ped_date_end":"2023-05-28","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2028,"ped_label":"Whit Monday","ped_date_start":"2023-05-29","ped_date_end":"2023-05-29","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2029,"ped_label":"Revolution Day (Hungary)","ped_date_start":"2023-03-15","ped_date_end":"2023-03-15","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2030,"ped_label":"Labour Day","ped_date_start":"2023-05-01","ped_date_end":"2023-05-01","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2031,"ped_label":"Saint Stephens Day (Hungary)","ped_date_start":"2023-08-20","ped_date_end":"2023-08-20","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2032,"ped_label":"All Saints Day","ped_date_start":"2023-11-01","ped_date_end":"2023-11-01","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2034,"ped_label":"Good Friday","ped_date_start":"2024-03-29","ped_date_end":"2024-03-29","ped_period_special_day_id":2,"ped_year":2024},{"ped_id":2035,"ped_label":"Easter","ped_date_start":"2024-03-31","ped_date_end":"2024-03-31","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2036,"ped_label":"Easter Monday","ped_date_start":"2024-04-01","ped_date_end":"2024-04-01","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2037,"ped_label":"Whit Monday","ped_date_start":"2024-05-20","ped_date_end":"2024-05-20","ped_period_special_day_id":2,"ped_year":2024},{"ped_id":2038,"ped_label":"Whit Sunday","ped_date_start":"2024-05-19","ped_date_end":"2024-05-19","ped_period_special_day_id":2,"ped_year":2024},{"ped_id":2041,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-27","ped_date_end":"2024-12-27","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2042,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-28","ped_date_end":"2024-12-28","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2043,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-29","ped_date_end":"2024-12-29","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2044,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-30","ped_date_end":"2024-12-30","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2045,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-31","ped_date_end":"2024-12-31","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2046,"ped_label":"Holiday (Hungary)","ped_date_start":"2025-01-02","ped_date_end":"2025-01-02","ped_period_special_day_id":1,"ped_year":2025}]} - diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 354c64f..666f7aa 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -2,10 +2,11 @@ # # package manipulation commands without package: # update, upgrade, clean +# +# 2023-06-22: force update # # informational commands without package: # list, list-installed, list-upgradable -# # ptu5-atb-apinfo # ptu5-scripts # ptu5-atb-apinfo @@ -15,11 +16,13 @@ # list-installed # --force-reinstall install ptu5-atb-apinfo # --force-reinstall install atbqt -# update +# opkg update +# opkg install atbqt // die PTU-Kundenapplikation +# opkg install atb-plugin-cc-iself // das Ingenico-iSelf plugin +# opkg install atb-plugin-dc // das DeviceController plugin für ATBQT +# opkg install libdevicecontroller // libCAmaster.so opkg update -# opkg --noaction install atbqt -# opkg install atbqt -# -# -# - +opkg install atbqt +opkg install atb-plugin-cc-iself +opkg install atb-plugin-dc +opkg install libdevicecontroller