Compare commits
14 Commits
zone2
...
2f3b47a06e
Author | SHA1 | Date | |
---|---|---|---|
2f3b47a06e | |||
1911e6711c | |||
49abff7eb7 | |||
7b32ba5234 | |||
5ee830df17 | |||
e12646efb1 | |||
c645d5afd2 | |||
7ba0e9d080 | |||
87d8b7ca4a | |||
42fcba89fb | |||
7e79b2e01c | |||
08304f5dc4 | |||
2bcbf27671 | |||
b77017768a |
@@ -1,54 +0,0 @@
|
||||
#!/bin/bash -
|
||||
|
||||
# FILE="/tmp/post-merge$(date +%FT%H-%M-%S)"
|
||||
# commit=$(git rev-parse --verify HEAD)
|
||||
# echo "$commit $(git cat-file commit $commit)" >> /tmp/post-merge
|
||||
|
||||
# Redirect output to stderr.
|
||||
exec 1>&2
|
||||
|
||||
if [ -z $IFS ]; then
|
||||
IFS=$'\n'
|
||||
fi
|
||||
|
||||
GIT_PULL_TMP=/tmp/git_changed_files_for_last_pull
|
||||
OPKG_CMDS_TMP=/tmp/opkg_commands
|
||||
|
||||
rm -f $GIT_PULL_TMP
|
||||
rm -f $OPKG_CMDS_TMP
|
||||
|
||||
get_blob () { # get the blob of the file(name) passed as $1
|
||||
# note: this can be used for any file in the filesystem
|
||||
echo $(git hash-object $1)
|
||||
}
|
||||
|
||||
get_commit_for_blob () {
|
||||
# search for the blob in all commits for the file(name) $1
|
||||
echo $(git log --all --pretty=format:%H -- $2 |
|
||||
xargs -I{} bash -c "git ls-tree {} -- $2 |
|
||||
grep -q $1 && echo -n {} && head -n 1")
|
||||
}
|
||||
|
||||
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
|
||||
if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
|
||||
# called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
|
||||
# add '/' prefix
|
||||
fn=$(echo $fn | awk '{ printf "/"$0 }')
|
||||
if [[ -f "$fn" ]]; then
|
||||
blob=$(get_blob "$fn")
|
||||
commit=$(get_commit_for_blob $blob "$fn")
|
||||
fsize=$(ls -l "$fn" | awk '{ print $5 }')
|
||||
echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP
|
||||
fi
|
||||
fi
|
||||
if grep -E -q ".*opkg_commands" <<< $fn; then
|
||||
readarray opkg_commands < <(cat $fn)
|
||||
for opkg_c in "${opkg_commands[@]}"; do
|
||||
test -z $opkg_c && continue;
|
||||
test ! -z $(grep -E "^\s*[#]+.*$" <<< $opkg_c) && continue
|
||||
echo -n "$opkg_c" | tr -d '\n\r' >> $OPKG_CMDS_TMP 2>&1
|
||||
echo "" >> $OPKG_CMDS_TMP 2>&1
|
||||
done
|
||||
source "$fn"
|
||||
fi
|
||||
done
|
16
.gitignore
vendored
16
.gitignore
vendored
@@ -1,16 +0,0 @@
|
||||
*
|
||||
|
||||
## Except
|
||||
!**/.gitignore
|
||||
!**/.githooks/post-merge
|
||||
!/etc/*.ini
|
||||
!/etc/atb/*.ini
|
||||
!/etc/psa_config/*
|
||||
!/etc/psa_update/*
|
||||
!/etc/psa_tariff/*
|
||||
!/etc/dc/dc2c.hex
|
||||
|
||||
!/opt/app/ATBAPP/*.ini
|
||||
!/opt/app/sysconfig/*.ini
|
||||
!/opt/app/ISMASMgr/*.ini
|
||||
|
@@ -1,100 +0,0 @@
|
||||
[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
|
@@ -1,51 +0,0 @@
|
||||
[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
|
6030
etc/dc/dc2c.hex
6030
etc/dc/dc2c.hex
File diff suppressed because it is too large
Load Diff
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"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,
|
||||
"":""
|
||||
}
|
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_config",
|
||||
"project":"DBM Szeged",
|
||||
"version":"13.02.2023 12:20 00001",
|
||||
"custNum":281,
|
||||
"machNum":999,
|
||||
"borough":1,
|
||||
"zone":1,
|
||||
"alias":1357,
|
||||
"location":"92637Weiden/Opf_Bahnhofstraße 65",
|
||||
"":""
|
||||
}
|
||||
|
@@ -1,28 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri01",
|
||||
"project":"DBM Szeged",
|
||||
"version":"13.02.2023 12:20 00001",
|
||||
"styl":"bold on",
|
||||
"text":"Parkingticket ",
|
||||
"styl":"bold off",
|
||||
"feed":"nl",
|
||||
"text":"Parkingticket ",
|
||||
"styl":"under on",
|
||||
"text":"Parkingticket ",
|
||||
"styl":"under off",
|
||||
"feed":"nl",
|
||||
"text":"Parkingticket ",
|
||||
"styl":"latin on",
|
||||
"text":"Parkingticket ",
|
||||
"styl":"latin off",
|
||||
"feed":"nl",
|
||||
"text":"Parkingticket ",
|
||||
"styl":"font 09",
|
||||
"text":"Park ",
|
||||
"styl":"font 16",
|
||||
"text":"Park ",
|
||||
"feed":"nl",
|
||||
"":""
|
||||
}
|
||||
|
||||
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri02",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri03",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri04",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri05",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri06",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri07",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri08",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri09",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri10",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri11",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri12",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri13",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri14",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri15",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri16",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri17",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri18",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri19",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri20",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri21",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri22",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri23",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri24",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri25",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri26",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri27",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri28",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri29",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri30",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":""
|
||||
}
|
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri31",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":"iiii"
|
||||
}
|
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri32",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":"",
|
||||
"":"10001"
|
||||
}
|
@@ -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,
|
||||
"":""
|
||||
}
|
||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,4 +0,0 @@
|
||||
{
|
||||
|
||||
|
||||
}
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,28 +0,0 @@
|
||||
# opkg prefix will be added inside evaluating script
|
||||
#
|
||||
# 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
|
||||
# atb-plugin-calculateprice-prm
|
||||
# atb-plugin-cc-tcpzvt
|
||||
# atbqt
|
||||
# list-installed
|
||||
# --force-reinstall install ptu5-atb-apinfo
|
||||
# --force-reinstall install atbqt
|
||||
# update
|
||||
|
||||
opkg update
|
||||
opkg --noaction install atbqt
|
||||
opkg install atbqt
|
||||
|
||||
|
||||
#
|
||||
#
|
||||
#
|
||||
|
@@ -1 +0,0 @@
|
||||
"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"
|
1
szeged/.location
Normal file
1
szeged/.location
Normal file
@@ -0,0 +1 @@
|
||||
szeged
|
1
szeged/1/.zone_group
Normal file
1
szeged/1/.zone_group
Normal file
@@ -0,0 +1 @@
|
||||
contained zones in group 1
|
1
szeged/1/1/.zone
Normal file
1
szeged/1/1/.zone
Normal file
@@ -0,0 +1 @@
|
||||
1
|
1
szeged/1/1/zone
Normal file
1
szeged/1/1/zone
Normal file
@@ -0,0 +1 @@
|
||||
1
|
1
szeged/1/zone_group
Normal file
1
szeged/1/zone_group
Normal file
@@ -0,0 +1 @@
|
||||
contained zones in group 1
|
1
szeged/location
Normal file
1
szeged/location
Normal file
@@ -0,0 +1 @@
|
||||
szeged
|
19
szeged/update.conf
Normal file
19
szeged/update.conf
Normal file
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"ini" : {
|
||||
"/opt/app/sysconfig/ISMASMgr.ini" : "d41d8cd98f00b204e9800998ecf8427e",
|
||||
"/opt/app/sysconfig/sysconfig.ini" : "d41d8cd98f00b204e9800998ecf8427e",
|
||||
"/opt/app/sysconfig/SystemControl.ini" : "d41d8cd98f00b204e9800998ecf8427e"
|
||||
},
|
||||
"conf" : {
|
||||
"szeged/1/1/etc/psa_config/emp.conf" : "d41d8cd98f00b204e9800998ecf8427e",
|
||||
"szeged/1/1/etc/psa_config/printer.conf": "d41d8cd98f00b204e9800998ecf8427e"
|
||||
},
|
||||
"opkg" : {
|
||||
"atbqt" : {
|
||||
"Version" : "1.0.0-r1",
|
||||
"MD5Sum" : "642eda2b3637291b024ef152479218bc",
|
||||
"Architecture" : "cortexa9t2hf-neon"
|
||||
}
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user