6 Commits

12 changed files with 197 additions and 1020 deletions

View File

@@ -1,56 +0,0 @@
#!/bin/bash -
# echo "POST-CHECKOUT"
# echo "PREV-HEAD=$1"
# echo "CURR-HEAD=$2"
# echo "BRANCH-CHECKOUT=$3"
readonly CHECKOUT_HISTORY_FILE="/opt/app/tools/atbupdate/checkout_history"
readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv"
readonly OPKG_COMMANDS_FILE="/etc/psa_update/opkg_commands"
write_log_file () {
if [ -f $CHECKOUT_HISTORY_FILE ]; then
# repo: customer_281
readonly repo=$(basename $(git rev-parse --show-toplevel))
# branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1
readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g)
readonly line="$repo:$branch"
readonly now="$(date +%Y-%m-%dT%T)"
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.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 [ -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
else
echo "Found existing line: $line. Do nothing"
fi
echo "$line" >> $CHECKOUT_HISTORY_FILE
# echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
else
echo "*******************************************************"
echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! "
echo "*******************************************************"
fi
}
write_log_file

100
etc/atb/ATBAPP.ini Normal file
View File

@@ -0,0 +1,100 @@
[COMMON]
com_port_name=/dev/ttyS1
com_baud_rate=9600
lang1=hu_HU
lang2=en_GB
lang3=de_DE
lang4=sr
lang5=ro_RO
defaultLanguage=1
showInfoButton=false
showHelpButton=false
CharacterSet="ISO 8859-2"
#useLanguage=[128+][64+][32+][16]
useLanguage=248
#usePayment=[128+][64+][32+][16]
usePayment=96
#useVehicle=[128+][64+][32+][16+][8]
useVehicle=240
#useProduct=[128+][64+][32+][16+][8]
useProduct=240
textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
logfile=/var/log/atbqt.log
alternativeLogoFile=
feature_Log=off
feature_TouchFeedback=off
feature_DisplayControl=off
feature_SystemSuspend=off
feature_StartButton=on
feature_selfOOO=off
feature_DBusDisplayControl=on
feature_DBusSuspendControl=on
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,1"
sc_35="0,0,0"
sc_51="1,0,1"
sc_52="1,0,0"
sc_53="1,0,0"
[PLUGINS]
CCPlugin=IngenicoISelf_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=
cashVariant=CoinsOnly
paymentPointInTime=poa
[MOBILISIS_CalculatePricePlugin]
useDebug=1
[ATBDeviceControllerPlugin]
serialPort=ttymxc2

51
etc/atb/SystemControl.ini Normal file
View File

@@ -0,0 +1,51 @@
[COMMON]
startBacklightController=1
startSuspendController=1
startMonitoringController=0
startMQTTController=0
[BACKLIGHT]
inputBrightness=80
curve=1
dimLowValue=1
SensorMax=3500
SensorMin=0
dimMin=20
dimMax=100
[SUSPEND]
program=/home/root/system_powerdown_wakeup.sh
[MONITORING]
protocol=mqtt
useDeviceId=on
monitoring_heartbeatInterval=60
[MQTT]
mqtt_host=mqtt2.atb-comm.de
mqtt_port=8883
mqtt_username=testuser
mqtt_password=xyz123
mqtt_useSsl=on
mqtt_debug=on
mqtt_QoS=0
mqtt_TopicScheme=ATB_ISMAS
mqtt_TopicDeviceType=MP
mqtt_TopicPrefix=ATB
[NETWORKCHECK]
useNetworkCheck=on
setOOO=off
PingHost=google.com
networkRestart="/sbin/ifup -a"
[AT_TASKS]
size=1
1\id=PTU5UPDATE
1\program="/opt/app/tools/atbupdate/PTUGitInstaller"
1\arguments=-q,--platform,wayland
1\envs=QT_QPA_EGLFS_KMS_ATOMIC=1,QT_QPA_EGLFS_ALWAYS_SET_MODE=1,XDG_RUNTIME_DIR=/var/run/user/0
1\hourOfDay=1

Binary file not shown.

Binary file not shown.

View File

@@ -1,38 +1,28 @@
{ {
"title":"DC2C_pri01", "title":"DC2C_pri01",
"project":"DBM Szeged park_coins", "project":"DBM Szeged",
"issued":"13.04.2023 01.02", "version":"13.02.2023 12:20 00001",
"styl":"font 08", "styl":"bold on",
"styl":"size 10", "text":"Parkingticket ",
"feed":"margin02", "styl":"bold off",
"feed":"rim02",
"text":"PARKOLÓJEGY",
"styl":"size 00",
"feed":"nl", "feed":"nl",
"text":" Nyugta", "text":"Parkingticket ",
"styl":"under on",
"text":"Parkingticket ",
"styl":"under off",
"feed":"nl", "feed":"nl",
"text":"Kérjük az elsö szélvédö", "text":"Parkingticket ",
"styl":"latin on",
"text":"Parkingticket ",
"styl":"latin off",
"feed":"nl", "feed":"nl",
"text":"mögé jól láthatóan", "text":"Parkingticket ",
"styl":"font 09",
"text":"Park ",
"styl":"font 16",
"text":"Park ",
"feed":"nl", "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",
} }

View File

@@ -1,37 +1,5 @@
{ {
"title":"DC2C_pri02", "title":"DC2C_pri02",
"project":"DBM Szeged park_coins", "version":"27.02.2023 12:20 00001",
"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",
}

View File

@@ -1,22 +1,5 @@
{ {
"title":"DC2C_pri03", "title":"DC2C_pri03",
"project":"DBM Szeged park_coins", "version":"27.02.2023 12:20 00001",
"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,8 +1,5 @@
{ {
"title":"DC2C_pri04", "title":"DC2C_pri04",
"project":"empty", "version":"27.02.2023 12:20 00001",
"issued":"24.05.2023 01.00", "":""
"text":"" }
}

View File

@@ -1,24 +1,5 @@
{ {
"title":"DC2C_pri29", "title":"DC2C_pri29",
"project":"ATB test", "version":"27.02.2023 12:20 00001",
"issued":"24.05.2023 01.00", "":""
"styl":"font 08", }
"styl":"size 11",
"feed":"margin02",
"feed":"rim02",
"text":"All 8 Variables:",
"feed":"nl",
"vari":"Dynamic01",
"vari":"Dynamic02",
"vari":"Dynamic03",
"vari":"Dynamic04",
"vari":"Dynamic05",
"vari":"Dynamic06",
"vari":"Dynamic07",
"vari":"Dynamic08",
"feed":"eject",
}

View File

@@ -1,39 +1,6 @@
{ {
"title":"DC2C_pri32", "title":"DC2C_pri32",
"project":"DBM Szeged door", "version":"27.02.2023 12:20 00001",
"issued":"18.04.2023 01.01", "":"",
"styl":"font 08", "":"10001"
"styl":"size 10", }
"feed":"margin02",
"feed":"rim02",
"styl":"size 11",
"text":"AJTÓ NYITÁS",
"feed":"nl",
"styl":"size 00",
"text":"Door closed",
"feed":"nl",
"feed":"nl",
"text":"CuNu: ",
"vari":"cunu",
"text":"MaNu: ",
"vari":"manu",
"text":"Place: ",
"vari":"location",
"text":"Group: ",
"vari":"group",
"text":"Zone: ",
"vari":"zone",
"text":"Name: ",
"vari":"alias",
"text":"Date: ",
"vari":"date us",
"text":"Time: ",
"vari":"time long",
"feed":"nl",
"text":" * * * * * * * * ",
"feed":"nl",
"feed":"nl",
"feed":"eject",
}

File diff suppressed because one or more lines are too long