diff --git a/README.md b/README.md index 893d07e5..e30ea6c8 100644 --- a/README.md +++ b/README.md @@ -41,52 +41,14 @@ If you would like to support the developer with a cup of coffee you can do that -##### Rolling - (2021-01-19) +##### 6.1.0 Image Processing in Memory - (2021-01-20) -* Improvement for wlan password: additionally now "`=`" is possible in the password or wlan-name - -* Reduction of log file info (removal of memory information) - -2021-01-18 - -* New Feature `ExtendedResolution` uses the after comma digit of the last analog counter to increase precision by one digit. - This can only be activated in expert mode. - -2021-01-17 - -* Disabling of digital counters implemented -* Attention: do not disable digital and analog! -* Bug fixing: - - * Configuration of analog counters on html-page failed (enable/disable, undefined ROIs) - -2021-01-05 - -* Configuration: simple enabling / disabling of analog counters - -* Alignment Algorithm: implementation of 3 alignment options (`AlignmentAlgo`) - - * `Default` = know algo based on 1 channel SAD (square average difference) - using only the red channel - * `Accurate` = using all 3 color channels (3x slower) - * `Fast` = alignment only on first run, afterward only detection of shift of image by comparing SAD-values - * Time comparison for reference images with 2 times ~2000 pixel²: - * Default ~40 s/run, Accurate: 1:40 min/run, **Fast: 7 s/run** - * `Fast` Option allows must faster value updates (up to 2 per Minute) - -* Configuration of hostname in config.ini: new parameter `hostname` in section `System` - -* Switching of GPIO12/13 via http-interface: - - * ``` - /GPIO?GPIO=12&Status=high - /GPIO?GPIO=12&Status=low - ``` - -* Bug fixing: html configuration page - -* based on Master v6.0.0 (2021-01-02) - - +* Disabling of analog / digital counters in configuration +* Improved Alignment Algorithm (`AlignmentAlgo` = `Default`, `Accurate` , `Fast`) +* Analog counters: `ExtendedResolution` (last digit is extended by sub comma value of CNN) +* `config.ini`: additional parameter `hostname` (additional to wlan.ini) +* Switching of GPIO12/13 via http-interface: `/GPIO?GPIO=12&Status=high/low` +* Bug fixing: html configuration page, wlan password ("=" now possible) ##### 6.0.0 Image Processing in Memory - (2021-01-02) diff --git a/code/main/version.cpp b/code/main/version.cpp index 0b328a30..3ddd16d6 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="2530691"; +const char* GIT_REV="3869da9"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-01-19 19:44"; \ No newline at end of file +const char* BUILD_TIME="2021-01-20 19:24"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index d267c063..94f63b98 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v6.0.0 - 2020-01-02"; +const char* GIT_BASE_BRANCH = "master - v6.1.0 - 2020-01-20"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index 0b328a30..3ddd16d6 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="2530691"; +const char* GIT_REV="3869da9"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-01-19 19:44"; \ No newline at end of file +const char* BUILD_TIME="2021-01-20 19:24"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index b8b66536..76acaa9f 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index b493194a..e2e07fdd 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 1e439396..e53bfa04 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ