Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_999 into zg1/zone1

.githooks/post-checkout

@@ -0,0 +1,62 @@
+#!/bin/bash -
+# echo "POST-CHECKOUT"
+# echo "PREV-HEAD=$1"
+# echo "CURR-HEAD=$2"
+# echo "BRANCH-CHECKOUT=$3"
+
+readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv"
+readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands"
+            
+write_log_file () {
+    # 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)"
+    # 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_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
+            # make sure the file is empty
+            echo -n "" > $GIT_UPDATE_LOG 
+            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
+}
+
+write_log_file
+

.githooks/post-merge

@@ -0,0 +1,56 @@
+#!/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_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
+                # 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")
+}
+
+write_log_file () {
+    local now=$(date +"%Y-%m-%dT%T")
+    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
+        if grep -qE "DC2C.*json" <<< $fn; then
+            # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
+            # add '/' prefix
+            echo "DOWNLOAD, $(echo $fn | awk '{ printf "/"$0 }'), $now, N/A" >> "$GIT_UPDATE_LOG"
+        elif grep -qE "dc2c.bin" <<< $fn; then
+            # download the file referenced by the link dc2c.bin
+            echo "DOWNLOAD, "/etc/dc/dc2c.bin", $now, N/A" >> "$GIT_UPDATE_LOG"
+        elif grep -qE ".*opkg_commands" <<< $fn; then
+            readarray opkg_commands < <(cat $fn)
+            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
+    done
+}
+
+write_log_file
+

.githooks/post-merge.bck

@@ -0,0 +1,61 @@
+#!/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_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 () {
+    blob=$(get_blob $1)
+    if [ ! -z $blob ]; then
+        # search for the blob in all commits for the file(name) $1
+        echo $(echo $(git log --all --pretty=format:%H -- $1) |
+               xargs -I{} bash -c "git ls-tree {} -- $1       |
+               grep -q $blob && echo {}")
+    fi
+}
+
+changed_file_names () {
+    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
+        CHANGED_FILE_NAMES+=($fn)
+    done
+}
+
+# write_git
+
+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
+        fsize=0
+        if [[ -f "$fn" ]]; then
+            fsize=$(ls -l "$fn" | awk '{ print $5 }')
+        fi
+        echo "$fn $fsize" >> $GIT_PULL_TMP
+    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

.gitignore

@@ -0,0 +1,27 @@
+# First, ignore everything
+*
+# Now, whitelist anything that's a directory
+!*/
+# And all the file types you're interested in
+!.gitignore
+!.githooks/post-merge
+!.githooks/post-checkout
+!**/.gitignore
+!**/.githooks/post-merge
+!**/.githooks/post-checkout
+
+## Except
+!etc/atb/*
+!etc/psa_config/*
+!etc/psa_update/*
+!etc/psa_tariff/*
+!etc/dc/*.hex
+!etc/dc/*.bin
+!*/etc/*.ini
+!*/etc/atb/*
+!*/etc/psa_config/*
+!*/etc/psa_update/*
+!*/etc/psa_tariff/*
+!*/etc/dc/*.hex
+!*/etc/dc/*.bin
+

ChangeLog

@@ -1,4 +1,236 @@
-Wed 30 Aug 2023 10:37:28 AM CEST Version 0.0.1: Test (1) 
-Wed 30 Aug 2023 10:45:08 AM CEST Version 0.0.2: Test (2)
-Wed 30 Aug 2023 11:24:51 AM CEST Version 0.0.3: Test (3)
-Wed 30 Aug 2023 11:29:44 AM CEST Version 0.0.4: Test (4)
+# Changelog
+
+## [Unreleased]
+
+## [1.1.1] - 2023-03-05
+
+### Added
+
+- Arabic translation (#444).
+- v1.1 French translation.
+- v1.1 Dutch translation (#371).
+- v1.1 Russian translation (#410).
+- v1.1 Japanese translation (#363).
+- v1.1 Norwegian Bokmål translation (#383).
+- v1.1 "Inconsistent Changes" Turkish translation (#347).
+- Default to most recent versions available for each languages
+- Display count of available translations (26 to date!)
+- Centralize all links into `/data/links.json` so they can be updated easily
+
+### Fixed
+
+- Improve French translation (#377).
+- Improve id-ID translation (#416).
+- Improve Persian translation (#457).
+- Improve Russian translation (#408).
+- Improve Swedish title (#419).
+- Improve zh-CN translation (#359).
+- Improve French translation (#357).
+- Improve zh-TW translation (#360, #355).
+- Improve Spanish (es-ES) transltion (#362).
+- Foldout menu in Dutch translation (#371).
+- Missing periods at the end of each change (#451).
+- Fix missing logo in 1.1 pages
+- Display notice when translation isn't for most recent version
+- Various broken links, page versions, and indentations.
+
+### Changed
+
+- Upgrade dependencies: Ruby 3.2.1, Middleman, etc.
+
+### Removed
+
+- Unused normalize.css file
+- Identical links assigned in each translation file
+- Duplicate index file for the english version
+
+## [1.1.0] - 2019-02-15
+
+### Added
+
+- Danish translation (#297).
+- Georgian translation from (#337).
+- Changelog inconsistency section in Bad Practices.
+
+### Fixed
+
+- Italian translation (#332).
+- Indonesian translation (#336).
+
+## [1.0.0] - 2017-06-20
+
+### Added
+
+- New visual identity by [@tylerfortune8](https://github.com/tylerfortune8).
+- Version navigation.
+- Links to latest released version in previous versions.
+- "Why keep a changelog?" section.
+- "Who needs a changelog?" section.
+- "How do I make a changelog?" section.
+- "Frequently Asked Questions" section.
+- New "Guiding Principles" sub-section to "How do I make a changelog?".
+- Simplified and Traditional Chinese translations from [@tianshuo](https://github.com/tianshuo).
+- German translation from [@mpbzh](https://github.com/mpbzh) & [@Art4](https://github.com/Art4).
+- Italian translation from [@azkidenz](https://github.com/azkidenz).
+- Swedish translation from [@magol](https://github.com/magol).
+- Turkish translation from [@emreerkan](https://github.com/emreerkan).
+- French translation from [@zapashcanon](https://github.com/zapashcanon).
+- Brazilian Portuguese translation from [@Webysther](https://github.com/Webysther).
+- Polish translation from [@amielucha](https://github.com/amielucha) & [@m-aciek](https://github.com/m-aciek).
+- Russian translation from [@aishek](https://github.com/aishek).
+- Czech translation from [@h4vry](https://github.com/h4vry).
+- Slovak translation from [@jkostolansky](https://github.com/jkostolansky).
+- Korean translation from [@pierceh89](https://github.com/pierceh89).
+- Croatian translation from [@porx](https://github.com/porx).
+- Persian translation from [@Hameds](https://github.com/Hameds).
+- Ukrainian translation from [@osadchyi-s](https://github.com/osadchyi-s).
+
+### Changed
+
+- Start using "changelog" over "change log" since it's the common usage.
+- Start versioning based on the current English version at 0.3.0 to help
+  translation authors keep things up-to-date.
+- Rewrite "What makes unicorns cry?" section.
+- Rewrite "Ignoring Deprecations" sub-section to clarify the ideal
+  scenario.
+- Improve "Commit log diffs" sub-section to further argument against
+  them.
+- Merge "Why can’t people just use a git log diff?" with "Commit log
+  diffs".
+- Fix typos in Simplified Chinese and Traditional Chinese translations.
+- Fix typos in Brazilian Portuguese translation.
+- Fix typos in Turkish translation.
+- Fix typos in Czech translation.
+- Fix typos in Swedish translation.
+- Improve phrasing in French translation.
+- Fix phrasing and spelling in German translation.
+
+### Removed
+
+- Section about "changelog" vs "CHANGELOG".
+
+## [0.3.0] - 2015-12-03
+
+### Added
+
+- RU translation from [@aishek](https://github.com/aishek).
+- pt-BR translation from [@tallesl](https://github.com/tallesl).
+- es-ES translation from [@ZeliosAriex](https://github.com/ZeliosAriex).
+
+## [0.2.0] - 2015-10-06
+
+### Changed
+
+- Remove exclusionary mentions of "open source" since this project can
+  benefit both "open" and "closed" source projects equally.
+
+## [0.1.0] - 2015-10-06
+
+### Added
+
+- Answer "Should you ever rewrite a change log?".
+
+### Changed
+
+- Improve argument against commit logs.
+- Start following [SemVer](https://semver.org) properly.
+
+## [0.0.8] - 2015-02-17
+
+### Changed
+
+- Update year to match in every README example.
+- Reluctantly stop making fun of Brits only, since most of the world
+  writes dates in a strange way.
+
+### Fixed
+
+- Fix typos in recent README changes.
+- Update outdated unreleased diff link.
+
+## [0.0.7] - 2015-02-16
+
+### Added
+
+- Link, and make it obvious that date format is ISO 8601.
+
+### Changed
+
+- Clarified the section on "Is there a standard change log format?".
+
+### Fixed
+
+- Fix Markdown links to tag comparison URL with footnote-style links.
+
+## [0.0.6] - 2014-12-12
+
+### Added
+
+- README section on "yanked" releases.
+
+## [0.0.5] - 2014-08-09
+
+### Added
+
+- Markdown links to version tags on release headings.
+- Unreleased section to gather unreleased changes and encourage note
+  keeping prior to releases.
+
+## [0.0.4] - 2014-08-09
+
+### Added
+
+- Better explanation of the difference between the file ("CHANGELOG")
+  and its function "the change log".
+
+### Changed
+
+- Refer to a "change log" instead of a "CHANGELOG" throughout the site
+  to differentiate between the file and the purpose of the file — the
+  logging of changes.
+
+### Removed
+
+- Remove empty sections from CHANGELOG, they occupy too much space and
+  create too much noise in the file. People will have to assume that the
+  missing sections were intentionally left out because they contained no
+  notable changes.
+
+## [0.0.3] - 2014-08-09
+
+### Added
+
+- "Why should I care?" section mentioning The Changelog podcast.
+
+## [0.0.2] - 2014-07-10
+
+### Added
+
+- Explanation of the recommended reverse chronological release ordering.
+
+## [0.0.1] - 2014-05-31
+
+### Added
+
+- This CHANGELOG file to hopefully serve as an evolving example of a
+  standardized open source project CHANGELOG.
+- CNAME file to enable GitHub Pages custom domain.
+- README now contains answers to common questions about CHANGELOGs.
+- Good examples and basic guidelines, including proper date formatting.
+- Counter-examples: "What makes unicorns cry?".
+
+[unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.1.1...HEAD
+[1.1.1]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.0.0...v1.1.0
+[1.0.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.0...v1.0.0
+[0.3.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.1.0...v0.2.0
+[0.1.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.8...v0.1.0
+[0.0.8]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.7...v0.0.8
+[0.0.7]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.6...v0.0.7
+[0.0.6]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.5...v0.0.6
+[0.0.5]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.4...v0.0.5
+[0.0.4]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.3...v0.0.4
+[0.0.3]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.2...v0.0.3
+[0.0.2]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.1...v0.0.2
+[0.0.1]: https://github.com/olivierlacan/keep-a-changelog/releases/tag/v0.0.1

etc/dc/dc2c.04.38.bin

@@ -0,0 +1,23 @@
+# Tue Aug  1 13:34:05 CEST 2023
+# Tue Aug  1 14:07:04 CEST 2023
+# Tue Aug  1 14:12:18 CEST 2023
+# Tue Aug  1 14:22:24 CEST 2023
+# Tue Aug  1 14:25:40 CEST 2023
+# Tue Aug  1 14:38:42 CEST 2023
+# Tue Aug  1 14:47:57 CEST 2023
+# Tue Aug  1 14:51:37 CEST 2023
+# Tue Aug  1 15:00:52 CEST 2023
+# Tue Aug  1 15:03:49 CEST 2023
+# Wed Aug  2 08:55:43 CEST 2023
+# Wed Aug  2 09:03:02 CEST 2023
+# Wed Aug  2 09:37:39 CEST 2023
+# Wed Aug  2 09:50:27 CEST 2023
+# Wed Aug  2 10:02:50 CEST 2023
+# Wed Aug  2 10:16:52 CEST 2023
+# Wed Aug  2 10:20:29 CEST 2023
+# Wed Aug  2 10:23:09 CEST 2023
+# Wed Aug  2 10:29:58 CEST 2023
+# Wed Aug  2 10:41:26 CEST 2023
+# Wed Aug  2 10:45:55 CEST 2023
+# Wed Aug  2 10:53:45 CEST 2023
+# Wed Aug  2 10:56:28 CEST 2023

etc/psa_config/DC2C_cash.json

@@ -1,18 +1,18 @@
-{	     
-"title":"DC2C_cash  ",
-"project":"Schoenau",
-"version":"15.10.2023 14:55 02.00.06",
-"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
-"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
-"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0],
-"ExchangeRate":1,
-"TokenChannel":6,
-"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
-"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
-"LocalTaxRate":19,
-"ForeignTaxRate":0,
-"Surcharge":0,	
-"Discount":0
-}
-#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
-
+{	     
+"title":"DC2C_cash",
+"Project":"TEST",
+"Version":"2024-05-15T09:00:00+02:00",
+"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
+"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
+"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0],
+"ExchangeRate":1,
+"TokenChannel":6,
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
+"LocalTaxRate":19,
+"ForeignTaxRate":0,
+"Surcharge":0,	
+"Discount":0
+}
+#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500], 
+

etc/psa_config/DC2C_conf.json

@@ -1,12 +1,12 @@
-{ 
-"title":"DC2C_config",
-"project":"Schoenau",
-"version":"15.11.2023 00001",
-"custNum":332,
-"machNum":10,
-"borough":1,
-"zone":1,
-"alias":0,
-"location":"PP Königssee"
-}
-
+{ 
+"title":"DC2C_config",
+"Project":"TEST",
+"Version":"2024-05-15T09:01:58+02:00",
+"custNum":332,
+"machNum":10,
+"borough":1,
+"zone":1,
+"alias":0,
+"location":"PP Königssee"
+}
+

etc/psa_config/DC2C_device solar.json

@@ -1,27 +0,0 @@
-{
-"title":"DC2C_device",
-"project":"Schoenau",
-"Version":"15.11.2023 00102",
-"printer":1,
-"coinChk":3,
-"mifRd":1,
-"solarPwr":1,
-"modem":1,
-"creditCard":1,
-"escrow":0,
-"RejMotor":0,
-"shutter":1,
-"billRd":1,
-"vaultLock":0,
-"autoAlarm":1,
-"autoOpen":1,
-"AccPrint":1,
-"DorPrint":1,
-"TokPrint":1,
-"CBwarnLev":1600,
-"CBerrLev":1900,
-"BattWarn":11800,
-"BattErr":11200,
-"foreign":1,
-"refPrint":0
-}

etc/psa_config/DC2C_device.json

@@ -1,27 +1,27 @@
-{
-"title":"DC2C_device",
-"project":"Schoenau",
-"Version":"15.11.2023 00102",
-"printer":1,
-"coinChk":3,
-"mifRd":1,
-"solarPwr":0,
-"modem":0,
-"creditCard":1,
-"escrow":0,
-"RejMotor":0,
-"shutter":1,
-"billRd":1,
-"vaultLock":0,
-"autoAlarm":1,
-"autoOpen":1,
-"AccPrint":1,
-"DorPrint":1,
-"TokPrint":1,
-"CBwarnLev":1600,
-"CBerrLev":1900,
-"BattWarn":11800,
-"BattErr":11200,
-"foreign":1,
-"refPrint":1
-}
+{
+"title":"DC2C_device",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:04+02:00",
+"printer":1,
+"coinChk":3,
+"mifRd":1,
+"solarPwr":0,
+"modem":0,
+"creditCard":1,
+"escrow":0,
+"RejMotor":0,
+"shutter":1,
+"billRd":1,
+"vaultLock":0,
+"autoAlarm":1,
+"autoOpen":1,
+"AccPrint":1,
+"DorPrint":1,
+"TokPrint":1,
+"CBwarnLev":1600,
+"CBerrLev":1900,
+"BattWarn":11800,
+"BattErr":11200,
+"foreign":1,
+"refPrint":1
+}

etc/psa_config/DC2C_print01.json

@@ -1,46 +1,34 @@
-{
-"title":"DC2C_pri01",
-"project":"Schoenau",
-"Version":"15.11.2023 00001",
-"styl":"font 10",
-"styl":"size 11",
-"styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
-"text":"PARKTICKET",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"nl",
-"styl":"align l",
-"text":"Ihr Kennzeichen: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic01",
-"styl":"size 00",
-"feed":"nl",
-"text":"Parkende: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
+{
+"title":"DC2C_pri01",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:09+02:00",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKTICKET",
+"styl":"size 00",
+"feed":"nl",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"nl",
+"styl":"align l",
+"text":"Ihr Kennzeichen: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic01",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkende: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}

etc/psa_config/DC2C_print02.json

@@ -1,31 +1,19 @@
-{
-"title":"DC2C_pri02",
-"project":"Schoenau",
-"Version":"15.11.2023 00001",
-"issued":"13.11.2023 01.01",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
-"feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"feed":"nl",
-"styl":"size 00",
-"text":"Gedruckt am: ",
-"vari":"wday deu short",
-"vari":"date ge",	
-"vari":"time long"
-}
-
-
-
-
-
-
-
-
-
-
-
-
+{
+"title":"DC2C_pri02",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:12+02:00",
+"issued":"13.11.2023 01.01",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"feed":"nl",
+"styl":"size 00",
+"text":"Gedruckt am: ",
+"vari":"wday deu short",
+"vari":"date ge",	
+"vari":"time long"
+}

etc/psa_config/DC2C_print03.json

@@ -1,38 +1,38 @@
-{
-"title":"DC2C_pri03",
-"project":"Schoenau",
-"Version":"15.11.2023 00001",
-"feed":"nl",
-"styl":"size 00",
-"text":"Automat: ",
-"vari":"manu",	
-"text":"Gruppe: ",
-"vari":"group",	
-"text":"Zone: ",
-"vari":"zone",	
-"feed":"nl",
-"text":"Ort: ",
-"vari":"location",	
-"styl":"align c",
-"text":"Schönau am Königssee",
-"feed":"nl",
-"text":"Ticket-Nr. ",
-"vari":"TickCtr",
-"feed":"nl",
-"text":"Automatentechnik ",
-"feed":"nl",
-"text":"Baumann GmbH",
-"feed":"eject"
-}
-
-
-
-
-
-
-
-
-
-
-
-
+{
+"title":"DC2C_pri03",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:18+02:00",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"feed":"nl",
+"text":"Ort: ",
+"vari":"location",	
+"styl":"align c",
+"text":"Schönau am Königssee",
+"feed":"nl",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
+"text":"Automatentechnik ",
+"feed":"nl",
+"text":"Baumann GmbH",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print04.json

@@ -1,6 +1,6 @@
-{
-"title":"DC2C_pri04",
-"project":"Schoenau",
-"Version":"15.11.2023 01.01",
-"text":"";
-}
+{
+"title":"DC2C_pri04",
+"project":"TEST",
+"Version":"2024-05-15T09:02:20+02:00",
+"text":""
+}

etc/psa_config/DC2C_print05.json

@@ -1,46 +1,34 @@
-{
-"title":"DC2C_pri05",
-"project":"Schoenau",
-"Version":"15.11.2023 00001",
-"styl":"font 10",
-"styl":"size 11",
-"styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
-"text":"PARKTICKET",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"nl",
-"styl":"align l",
-"text":"Ihr Kennzeichen: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic01",
-"styl":"size 00",
-"feed":"nl",
-"text":"Parkende: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
+{
+"title":"DC2C_pri05",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:23+02:00",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKTICKET",
+"styl":"size 00",
+"feed":"nl",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"nl",
+"styl":"align l",
+"text":"Ihr Kennzeichen: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic01",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkende: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}

etc/psa_config/DC2C_print06.json

@@ -1,31 +1,19 @@
-{
-"title":"DC2C_pri06",
-"project":"Schoenau",
-"Version":"15.11.2023 00001",
-"issued":"13.11.2023 01.01",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
-"feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"feed":"nl",
-"styl":"size 00",
-"text":"Gedruckt am: ",
-"vari":"wday deu short",
-"vari":"date ge",	
-"vari":"time long"
-}
-
-
-
-
-
-
-
-
-
-
-
-
+{
+"title":"DC2C_pri06",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:27+02:00",
+"issued":"13.11.2023 01.01",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"feed":"nl",
+"styl":"size 00",
+"text":"Gedruckt am: ",
+"vari":"wday deu short",
+"vari":"date ge",	
+"vari":"time long"
+}

etc/psa_config/DC2C_print07.json

@@ -1,38 +1,26 @@
-{
-"title":"DC2C_pri07",
-"project":"Schoenau",
-"Version":"15.11.2023 00001",
-"feed":"nl",
-"styl":"size 00",
-"text":"Automat: ",
-"vari":"manu",	
-"text":"Gruppe: ",
-"vari":"group",	
-"text":"Zone: ",
-"vari":"zone",	
-"feed":"nl",
-"text":"Ort: ",
-"vari":"location",	
-"styl":"align c",
-"text":"Schönau am Königssee",
-"feed":"nl",
-"text":"Ticket-Nr. ",
-"vari":"TickCtr",
-"feed":"nl",
-"text":"Automatentechnik ",
-"feed":"nl",
-"text":"Baumann GmbH",
-"feed":"eject"
-}
-
-
-
-
-
-
-
-
-
-
-
-
+{
+"title":"DC2C_pri07",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:34+02:00",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"feed":"nl",
+"text":"Ort: ",
+"vari":"location",	
+"styl":"align c",
+"text":"Schönau am Königssee",
+"feed":"nl",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
+"text":"Automatentechnik ",
+"feed":"nl",
+"text":"Baumann GmbH",
+"feed":"eject"
+}

etc/psa_config/DC2C_print08.json

@@ -1,6 +1,6 @@
-{
-"title":"DC2C_pri08",
-"project":"Schoenau",
-"Version":"15.11.2023 01.01",
-"text":"";
-}
+{
+"title":"DC2C_pri08",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:44+02:00",
+"text":""
+}

etc/psa_config/DC2C_print31.json

@@ -1,40 +1,38 @@
-{
-"title":"DC2C_pri31",
-"project":"door close print",
-"Version":"15.11.2023 00001",
-"styl":"font 08",
-"styl":"size 10",
-"feed":"margin02",
-"feed":"rim02",
-"feed":"speed10",
-"styl":"size 11",
-"feed":"nl",
-"text":"Türöffnung um:",
-"feed":"nl",
-"styl":"size 00",
-"vari":"date ge",
-"vari":"time long",
-"feed":"nl",
-"text":"KuNu: ",
-"vari":"cunu",	
-"text":"MaNu: ",
-"vari":"manu",	
-"text":"Ort: ",
-"vari":"location",	
-"text":"Gruppe: ",
-"vari":"group",	
-"text":"Zone: ",
-"vari":"zone",	
-"text":"Name: ",
-"vari":"alias",	
-"feed":"nl",
-"text":"**Automatentechnik ",
-"feed":"nl",
-"text":"   Baumann GmbH ***",
-"feed":"nl",
-"text":" * * * * * * * * * ",
-"feed":"nl",
-"feed":"eject"
-}
-
-
+{
+"title":"DC2C_pri31",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:49+02:00",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"feed":"nl",
+"text":"Türöffnung um:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"text":"KuNu: ",
+"vari":"cunu",	
+"text":"MaNu: ",
+"vari":"manu",	
+"text":"Ort: ",
+"vari":"location",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"feed":"nl",
+"text":"**Automatentechnik ",
+"feed":"nl",
+"text":"   Baumann GmbH ***",
+"feed":"nl",
+"text":" * * * * * * * * * ",
+"feed":"nl",
+"feed":"eject"
+}

etc/psa_config/DC2C_print32.json

@@ -1,42 +1,40 @@
-{
-"title":"DC2C_pri32",
-"project":"refund reciept",
-"Version":"15.11.2023 00001",
-"styl":"font 08",
-"styl":"size 10",
-"feed":"margin02",
-"feed":"rim02",
-"feed":"speed10",
-"styl":"size 11",
-"text":"Ersatzbeleg",
-"feed":"nl",
-"styl":"size 00",
-"text":"Erstattungsbetrag: ",
-"feed":"nl",
-"vari":"Dynamic07",
-"text":"€",
-"feed":"nl",
-"text":"KuNu: ",
-"vari":"cunu",	
-"text":"MaNu: ",
-"vari":"manu",	
-"text":"Ort: ",
-"vari":"location",	
-"text":"Gruppe: ",
-"vari":"group",	
-"text":"Zone: ",
-"vari":"zone",	
-"text":"Name: ",
-"vari":"alias",	
-"text":"Am: ",
-"vari":"date us",
-"text":"Um: ",
-"vari":"time long",
-"feed":"nl",
-"text":" * * * * * * * * ",
-"feed":"nl",
-"feed":"nl",
-"feed":"eject"
-}
-
-
+{
+"title":"DC2C_pri32",
+"Project":"TEST",
+"Version":"2024-05-15T09:02:53+02:00",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"text":"Ersatzbeleg",
+"feed":"nl",
+"styl":"size 00",
+"text":"Erstattungsbetrag: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"text":"€",
+"feed":"nl",
+"text":"KuNu: ",
+"vari":"cunu",	
+"text":"MaNu: ",
+"vari":"manu",	
+"text":"Ort: ",
+"vari":"location",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"text":"Am: ",
+"vari":"date us",
+"text":"Um: ",
+"vari":"time long",
+"feed":"nl",
+"text":" * * * * * * * * ",
+"feed":"nl",
+"feed":"nl",
+"feed":"eject"
+}

etc/psa_tariff/tariff01.json

@@ -1,10 +1,13 @@
 {
+  "Project":"ATB",
+  "Info": "Info",
+  "Version": "1.0.10",
   "Currency": [
     {
       "pcu_id": 2,
       "pcu_sign": "Ft",
       "pcu_major": "HUF",
-      "pcu_minor": "",
+      "pcu_minor": "01/26/2024 4",
       "pcu_active": true
     }
   ],
@@ -802,4 +805,8 @@
       "ped_year": 2024
     }
   ]
-}
+
+}  
+
+
+

etc/psa_tariff/tariff06.json

@@ -1,3 +1,4 @@
+
 {
   "Currency": [
     {
@@ -1133,3 +1134,24 @@
   ]
 }
 
+
+
+
+Fri Aug  4 09:27:37 AM CEST 2023
+Fri Aug  4 10:15:42 AM CEST 2023
+Fri Aug  4 10:20:50 AM CEST 2023
+Fri Aug  4 10:23:36 AM CEST 2023
+Fri Aug  4 10:56:35 AM CEST 2023
+Fri Aug  4 11:02:15 AM CEST 2023
+Fri Aug  4 11:49:28 AM CEST 2023
+Fri Aug  4 12:03:05 PM CEST 2023
+Fri Aug  4 12:15:24 PM CEST 2023
+Fri Aug  4 12:17:03 PM CEST 2023
+Fri Aug  4 12:20:21 PM CEST 2023
+Fri Aug  4 12:21:36 PM CEST 2023
+Fri Aug  4 12:24:45 PM CEST 2023
+Fri Aug  4 12:30:02 PM CEST 2023
+Fri Aug  4 12:31:32 PM CEST 2023
+Fri Aug  4 12:34:10 PM CEST 2023
+Fri Aug  4 12:38:22 PM CEST 2023
+Fri Aug  4 12:55:56 PM CEST 2023

etc/psa_update/opkg_commands

@@ -1 +1,36 @@
+###############################################################################
+#                          !!! NOTE !!!
+###############################################################################
+# opkg-commands added to this file will be executed by ATBUpdateTool.          
+###############################################################################
+# #
+# # # # # # # # # # # #
+opkg info atbqt
+opkg info atbupdatetool
 opkg update
+opkg install prepare-update
+opkg install atbupdatetool
+# opkg remove atb-accountingtool
+# opkg install atb-accountingtool
+opkg --cache /var/cache/opkg --download-only upgrade
+opkg --cache /var/cache/opkg upgrade --verbosity=2
+# opkg remove apism
+# opkg install apism
+opkg info apism
+opkg info atbqt
+opkg info atbupdatetool
+opkg info apism
+opkg info atbqt
+opkg info atbupdatetool
+opkg info apism
+opkg info atbqt
+opkg info atbupdatetool
+opkg info apism
+opkg info atbqt
+opkg info atbupdatetool
+#
+#
+#
+#
+#
+#

opt/app/ATBAPP/ATBQT.ini

@@ -1 +1,91 @@
-# Thu Jul 13 15:02:54 CEST 2023
+[ATBDeviceControllerPlugin]
+serialPort=ttymxc2
+
+[COMMON]
+%23ooo_mode={useDisk|otherMachine}
+%23useLanguage=[128+][64+][32+][16]
+%23usePayment=[128+][64+][32+][16]
+%23useProduct=[128+][64+][32+][16+][8]
+%23useVehicle=[128+][64+][32+][16+][8]
+CharacterSet=ISO 8859-2
+alternativeLogoFile=
+com_baud_rate=9600
+com_port_name=/dev/ttyS1
+defaultLanguage=1
+feature_DBusDisplayControl=on
+feature_DBusDisplayDimLow=off
+feature_DBusSuspendControl=on
+feature_DisplayControl=off
+feature_Log=off
+feature_ShowParkingTime=off
+feature_StartButton=on
+feature_SystemSuspend=off
+feature_TouchFeedback=off
+feature_selfOOO=off
+lang1=hu_HU
+lang2=en_GB
+lang3=de_DE
+lang4=sr
+lang5=ro_RO
+logfile=/var/log/atbqt.log
+ooo_alternativeLocation=
+ooo_mode=otherMachine
+ooo_serviceEmail=
+ooo_serviceNumber=
+sellTimeout_time=60
+showHelpButton=false
+showInfoButton=false
+statefile=/opt/app/ATBAPP/states/APP_States.xml
+suspend_methode=sysfs
+suspend_program=
+suspend_time=8
+textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
+touch_feedback_gpio=121
+touch_feedback_off_value=0
+touch_feedback_on_value=1
+useAppStates=1
+useLanguage=240
+usePayment=96
+useProduct=240
+useVehicle=240
+
+[IngenicoISelf_CCPlugin]
+Currency=HUF
+PortName=/dev/ttymxc0
+ZVT=DE
+debug=1
+sleep=1
+sleepExtended=1
+
+[MOBILISIS_CalculatePricePlugin]
+tariffFileName=/etc/psa_tariff/tariff01.json
+useDebug=1
+
+[PAYMENT]
+cashVariant=CoinsOnly
+currencyISOCode=HUF
+currencySymbol=Ft
+paymentPointInTime=poa
+useHonestPayment=on
+
+[PLUGINS]
+CCPlugin=IngenicoISelf_CCPlugin
+CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
+DeviceControllerPlugin=ATBDeviceControllerPlugin
+
+[SCREENCONFIG]
+sc_31="1,1,0"
+sc_33="1,0,1"
+sc_35="0,0,0"
+sc_3F="1,0,0"
+sc_40="1,0,1"
+sc_41="1,0,1"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
+
+[TCP_CONTROL]
+enable=1
+
+###
+###