Merge branch 'zg1/zone2' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone2

.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

etc/dc/dc2c.bin

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

etc/psa_config/DC2C_print10.json

@@ -1,5 +1,5 @@
 {
 "title":"DC2C_pri10",
 "version":"27.02.2023 12:20 00001",
-"":""
-}
+"test":""
+}

etc/psa_update/opkg_commands

@@ -6,9 +6,9 @@
 # opkg prefix will be added inside evaluating script
 #
 # 2023-06-30: return to usual workflow
-opkg info ptu5-gitinstaller
+#opkg info ptu5-gitinstaller
 opkg info atbqt
-opkg update
-opkg install ptu5-gitinstaller
-opkg install atbqt
+#opkg update
+#opkg install ptu5-gitinstaller
+#opkg install atbqt
 opkg info atbqt