21 Commits

Author SHA1 Message Date
046d16651a Update json configuration files. 2023-06-22 12:01:35 +02:00
5c170821fc Add new DC2C config file for device configuration 2023-06-22 11:59:00 +02:00
bac8368079 create link dc2c.bin -> dc2c.4.33.bin 2023-06-21 08:55:41 +02:00
6ee9d22e6e delete link, reset as next step 2023-06-21 08:54:53 +02:00
8fbae9e16d Add device controller firmware dc2c.4.33.bin 2023-06-21 08:52:08 +02:00
7a790e442f Write $line to checkout_history-file only once 2023-06-20 16:06:33 +02:00
68d5205530 re-test post-merge-hook 2023-06-20 15:26:38 +02:00
d1cffff1ba test for post-merge-hook 2023-06-20 12:36:01 +02:00
7c77f1fe11 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1 2023-06-19 17:10:36 +02:00
2b10e4df93 add new opkg commands: install atbqt, atb-plugin-cc-iself, atb-plugin-dc, libdevicecontroller 2023-06-19 17:10:28 +02:00
9528fa5ffc Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-06-19 10:38:53 +02:00
1780e75ac9 testing 16:03 2023-06-05 16:03:41 +02:00
d71556abba testing 16:00 2023-06-05 16:00:49 +02:00
e6342a1e8f check for existence of opkg_commands-file (2) 2023-06-05 15:58:01 +02:00
72e9e645a1 check for existence of opkg_commands-file 2023-06-05 15:51:30 +02:00
530327e20d testing 15:39 2023-06-05 15:39:28 +02:00
0a3bfde486 testing 15:26 2023-06-05 15:26:16 +02:00
94bde10396 testing 15:22 2023-06-05 15:23:07 +02:00
b66848bb75 use the link dc2c.bin and do not add timestamp into file 2023-06-05 15:20:18 +02:00
42317e7660 testing 15:11 2023-06-05 15:11:49 +02:00
605461897e testing new update_psa 2023-06-05 13:59:25 +02:00
26 changed files with 498 additions and 123 deletions

View File

@@ -19,29 +19,32 @@ write_log_file () {
if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then
# line not found. first checkout of this branch (on this PSA).
# mark dc and print-templates to be downloaded by update-tool.
echo "DOWNLOAD, /etc/dc/dc2c.4.21.bin, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/dc/dc2c.bin, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG
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_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG
if grep -qE . "${OPKG_COMMANDS_FILE}"; then
readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
for opkg_c in "${opkg_commands[@]}"; do
# check for lines longer than 'opkg '
if [ "${#opkg_c}" -gt 4 ]; then
# comment: spaces, at least one '#'
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
echo "" >> $GIT_UPDATE_LOG 2>&1
fi
done
if [ -f "$OPKG_COMMANDS_FILE" ]; then
if grep -qE . "${OPKG_COMMANDS_FILE}"; then
readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
for opkg_c in "${opkg_commands[@]}"; do
# check for lines longer than 'opkg '
if [ "${#opkg_c}" -gt 4 ]; then
# comment: spaces, at least one '#'
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
echo "" >> $GIT_UPDATE_LOG 2>&1
fi
done
fi
fi
echo "$line" >> $CHECKOUT_HISTORY_FILE
else
echo "Found existing line: $line. Do nothing"
fi
echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
# echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
else
echo "*******************************************************"
echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! "

BIN
etc/dc/dc2c.4.33.bin Executable file

Binary file not shown.

View File

@@ -1 +1 @@
dc2c.4.22.bin
dc2c.4.33.bin

View File

@@ -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,
}

View File

@@ -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"
}

25
etc/psa_config/DC2C_device.json Executable file
View File

@@ -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
}

View File

@@ -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",
}

View File

@@ -32,6 +32,8 @@
"feed":"nl",
"text":"Üf. szolg nyitvatartás:",
"feed":"nl",
"feed":"nl",
"feed":"nl",
}

View File

@@ -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"
}

View File

@@ -1,5 +1,40 @@
{
"title":"DC2C_pri05",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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",
}

View File

@@ -1,5 +1,39 @@
{
"title":"DC2C_pri06",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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",
}

View File

@@ -1,5 +1,22 @@
{
"title":"DC2C_pri07",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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",
}

View File

@@ -1,5 +1,8 @@
{
"title":"DC2C_pri08",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"title":"DC2C_pri08",
"project":"empty template",
"issued":"09.06.2023 01.01",
"styl":"size 10"
}

View File

@@ -1,5 +1,40 @@
{
"title":"DC2C_pri09",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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",
}

View File

@@ -1,5 +1,39 @@
{
"title":"DC2C_pri10",
"version":"27.02.2023 12:20 00001",
"test":""
}
{
"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",
}

View File

@@ -1,5 +1,22 @@
{
"title":"DC2C_pri11",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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",
}

View File

@@ -1,5 +1,8 @@
{
"title":"DC2C_pri12",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"title":"DC2C_pri12",
"project":"empty template",
"issued":"09.06.2023 01.01",
"styl":"size 10"
}

View File

@@ -1,5 +1,40 @@
{
"title":"DC2C_pri13",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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",
}

View File

@@ -1,5 +1,39 @@
{
"title":"DC2C_pri14",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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",
}

View File

@@ -1,5 +1,22 @@
{
"title":"DC2C_pri15",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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",
}

View File

@@ -1,5 +1,8 @@
{
"title":"DC2C_pri16",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"title":"DC2C_pri16",
"project":"empty template",
"issued":"09.06.2023 01.01",
"styl":"size 10"
}

View File

@@ -1,5 +1,32 @@
{
"title":"DC2C_pri17",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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 "

View File

@@ -1,5 +1,21 @@
{
"title":"DC2C_pri18",
"version":"27.02.2023 12:20 00001",
"":""
}
"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-"

View File

@@ -1,5 +1,31 @@
{
"title":"DC2C_pri19",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"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",

View File

@@ -1,5 +1,9 @@
{
"title":"DC2C_pri20",
"version":"27.02.2023 12:20 00001",
"":""
}
{
"title":"DC2C_pri20",
"project":"empty template",
"issued":"09.06.2023 01.01",
"styl":"size 10"
}

View File

@@ -3,9 +3,9 @@
# package manipulation commands without package:
# update, upgrade, clean
#
#
# informational commands without package:
# list, list-installed, list-upgradable
#
# ptu5-atb-apinfo
# ptu5-scripts
# ptu5-atb-apinfo
@@ -15,11 +15,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