Add support for GM861

- Add support for GM861 1D and 2D bar code reader (#18399) - Bump version to v12.5.0.2
arendst · May 5, 2023 · d7b6d72 · d7b6d72
1 parent 069278f
commit d7b6d72
Show file tree

Hide file tree

Showing 6 changed files with 358 additions and 15 deletions.
diff --git a/BUILDS.md b/BUILDS.md
@@ -215,6 +215,7 @@ Note: `minimal` variant is not listed as it shouldn't be used outside of the [up
 | USE_PROJECTOR_CTRL        | - | - / - | - | - | - | - |
 | USE_AS608                 | - | - / - | - | - | - | - |
 | USE_LD2410                | - | - / - | - | - | - | - |
+| USE_GM861                 | - | - / - | - | - | - | - |
 | USE_TCP_BRIDGE            | - | - / - | - | - | - | - | zbbridge / zbbrdgpro
 |                           |   |       |   |   |   |   |
 | USE_NRF24                 | - | - / - | - | - | - | - |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,22 +3,32 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] - Development
 
-## [12.5.0.1]
+## [12.5.0.2]
+### Added
+- Matter support for Shutters with Tilt
+- Matter POC for remote Relay
+- Support for Zero-Cross Dimmer on ESP32, changed calculation on EPS8266, high resolution control e.g. Solar: `ZCDimmerSet`
+- ESP32 Enhanced Shutterbuttons functionality to control tilt position, additionally incr/decr possible to position and tilt.
+- ESP32 `Shuttersetup` for "Shelly 2.5 pro" automatic calibration and setup (experimental)
+- Berry `tcpclientasync` class for non-blocking TCP client
+- Support for GM861 1D and 2D bar code reader (#18399)
+
+### Breaking Changed
+
+### Changed
+
+### Fixed
+
+### Removed
+
+## [12.5.0.1] 20230505
 ### Added
 - Matter sensors Humidity, Pressure, Illuminance; optimize memory (#18441)
 - Command ``SetOption152 0/1`` to select two (0 = default) pin bistable or one (1) pin latching relay control (#18386)
 - Matter allow `Matter#Initialized` rule once the device is configured (#18451)
 - Matter UI to change endpoints configuration (#18498)
 - Matter support for Shutters (without Tilt) (#18509)
 - Support for TC74 temperature sensor by Michael Loftis (#18042)
-- Matter support for Shutters with Tilt
-- Matter POC for remote Relay
-- Added support for Zero-Cross Dimmer on ESP32, changed calculation on EPS8266, high resolution control e.g. Solar: `ZCDimmerSet`
-- ESP32: Enhanced Shutterbuttons functionality to control tilt position, additionally incr/decr possible to position and tilt.
-- ESP32: `Shuttersetup` for "Shelly 2.5 pro" automatic calibration and setup (experimental)
-- Berry add `tcpclientasync` class for non-blocking TCP client
-
-### Breaking Changed
 
 ### Changed
 - ESP32 Framework (Core) from v2.0.7 to v2.0.8
@@ -31,8 +41,6 @@ All notable changes to this project will be documented in this file.
 - Berry fix rules for string comparisons (#18464)
 - Shutter: GarageMode does not stop on console commands, `ShutterSetOpen` and `ShutterSetClose` does not reset direction (#18539)
 
-### Removed
-
 ## [Released]
 
 ## [12.5.0] 20230417

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -110,14 +110,18 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 
 [Complete list](BUILDS.md) of available feature and sensors.
 
-## Changelog v12.5.0.1
+## Changelog v12.5.0.2
 ### Added
 - Command ``SetOption152 0/1`` to select two (0 = default) pin bistable or one (1) pin latching relay control [#18386](https://github.com/arendst/Tasmota/issues/18386)
 - Support for TC74 temperature sensor by Michael Loftis [#18042](https://github.com/arendst/Tasmota/issues/18042)
+- Support for GM861 1D and 2D bar code reader [#18399](https://github.com/arendst/Tasmota/issues/18399)
 - Matter sensors Humidity, Pressure, Illuminance [#18441](https://github.com/arendst/Tasmota/issues/18441)
 - Matter allow `Matter#Initialized` rule once the device is configured [#18451](https://github.com/arendst/Tasmota/issues/18451)
 - Matter UI to change endpoints configuration [#18498](https://github.com/arendst/Tasmota/issues/18498)
-- Matter support for Shutters (without Tilt) [#18509](https://github.com/arendst/Tasmota/issues/18509)
+- Matter support for Shutters with Tilt [#18509](https://github.com/arendst/Tasmota/issues/18509)
+- ESP32 Enhanced Shutterbuttons functionality to control tilt position, additionally incr/decr possible to position and tilt.
+- ESP32 `Shuttersetup` for "Shelly 2.5 pro" automatic calibration and setup (experimental)
+- Berry `tcpclientasync` class for non-blocking TCP client
 
 ### Breaking Changed
 

diff --git a/tasmota/include/tasmota_version.h b/tasmota/include/tasmota_version.h
@@ -20,6 +20,6 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x0C050001;   // 12.5.0.1
+const uint32_t VERSION = 0x0C050002;   // 12.5.0.2
 
 #endif  // _TASMOTA_VERSION_H_
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
@@ -831,7 +831,8 @@
 //  #define VINDRIKTNING_SHOW_PM1                  // Display undocumented/supposed PM1.0 values
 //  #define VINDRIKTNING_SHOW_PM10                 // Display undocumented/supposed PM10 values
 //#define USE_LD2410                               // Add support for HLK-LD2410 24GHz smart wave motion sensor (+2k8 code)
-// #define USE_LOX_O2                               // Add support for LuminOx LOX O2 Sensor (+0k8 code)
+//#define USE_LOX_O2                               // Add support for LuminOx LOX O2 Sensor (+0k8 code)
+//#define USE_GM861                                // Add support for GM861 1D and 2D Bar Code Reader (+1k3 code)
 
 // -- Power monitoring sensors --------------------
 #define USE_ENERGY_SENSOR                        // Add support for Energy Monitors (+14k code)