Skip to content

Commit 19accb0

Browse files
committed
Merge branch 'dev' into release
2 parents 931a298 + a546ea0 commit 19accb0

File tree

8 files changed

+20
-10
lines changed

8 files changed

+20
-10
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Add UIRBcore to your `platformio.ini` file using one of the following approaches
3636
3737
```ini
3838
lib_deps =
39-
djordjemandic/UIRBcorelib @ ^1.2.1 ; Depend on the latest 1.x stable version
39+
djordjemandic/UIRBcorelib @ ^1.2.2 ; Depend on the latest 1.x stable version
4040
```
4141

4242
> **Tip:** Discover more about specifying packages in PlatformIO by visiting the [official documentation on package specifications](https://docs.platformio.org/en/latest/core/userguide/pkg/cmd_install.html#package-specifications).
@@ -48,7 +48,7 @@ lib_deps =
4848

4949
```ini
5050
lib_deps =
51-
https://github.com/DjordjeMandic/UIRBcorelib.git#v1.2.1 ; Depend on the v1.2.1 Git tag
51+
https://github.com/DjordjeMandic/UIRBcorelib.git#v1.2.2 ; Depend on the v1.2.2 Git tag
5252
```
5353

5454
### Manually

examples/Basic/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ default_envs = uirb-v02 ; Default environment to use for builds (specified belo
3838
platform = atmelavr ; Specifies the Atmel AVR platform (used for ATmega microcontrollers)
3939
framework = arduino ; Utilizes the Arduino framework for development
4040
lib_deps =
41-
djordjemandic/UIRBcorelib @ ^1.2.1 ; UIRBcore library for Universal IR Blaster (GitHub: https://github.com/DjordjeMandic/UIRBcorelib)
41+
djordjemandic/UIRBcorelib @ ^1.2.2 ; UIRBcore library for Universal IR Blaster (GitHub: https://github.com/DjordjeMandic/UIRBcorelib)
4242
monitor_speed = 1000000 ; Serial monitor baud rate (1M)
4343
monitor_filters = default, time, colorize ; Serial monitor: default output, timestamps, and colorized text
4444
build_src_flags =

examples/BypassEEPROM/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ build_flags =
4848
-DUIRB_EEPROM_BYPASS_DEBUG ; Enable EEPROM bypass mode (data stored in RAM)
4949
-DUIRB_EEPROM_RPROG_DEBUG=4990 ; Set Rprog resistance to 4990 ohms for debugging
5050
lib_deps = ; Library dependencies
51-
djordjemandic/UIRBcorelib @ ^1.2.1 ; UIRBcorelib library with version 1.2.1 or higher
51+
djordjemandic/UIRBcorelib @ ^1.2.2 ; UIRBcorelib library with version 1.2.2 or higher
5252
monitor_speed = 1000000 ; Speed for serial monitor communication in bits per second
5353
monitor_filters = default, time, colorize ; Serial monitor: default output, timestamps, and colorized text
5454
build_src_flags =

examples/Calibration/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ default_envs = uirb-v02 ; Default environment to use for builds (specified belo
3636
platform = atmelavr ; Specifies the Atmel AVR platform (used for ATmega microcontrollers)
3737
framework = arduino ; Utilizes the Arduino framework for development
3838
lib_deps =
39-
djordjemandic/UIRBcorelib @ ^1.2.1 ; UIRBcore library for Universal IR Blaster (GitHub: https://github.com/DjordjeMandic/UIRBcorelib)
39+
djordjemandic/UIRBcorelib @ ^1.2.2 ; UIRBcore library for Universal IR Blaster (GitHub: https://github.com/DjordjeMandic/UIRBcorelib)
4040
monitor_speed = 1000000 ; Serial monitor baud rate (1M)
4141
monitor_filters = default, time, colorize ; Serial monitor: default output, timestamps, and colorized text
4242
build_src_flags =

include/UIRBcore.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@
6363
* @brief Example demonstrating the calibration and usage of the 1.1V internal reference using the UIRBcore library.
6464
*/
6565

66+
/**
67+
* @example examples/BypassEEPROM/src/BypassEEPROM.ino
68+
* @brief Example showcasing EEPROM bypass and debugging features of the UIRBcore library in a simulated environment.
69+
*/
70+
6671
#ifndef UIRBcore_hpp
6772
#define UIRBcore_hpp
6873

include/UIRBcore_Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
*
8686
* @see https://git-scm.com/docs/git-describe for details about the `git describe` command.
8787
*/
88-
#define UIRB_CORE_LIB_VER_STR "v1.2.1"
88+
#define UIRB_CORE_LIB_VER_STR "v1.2.2"
8989

9090
#if defined(UIRB_CORE_LIB_MAJOR)
9191
#undef UIRB_CORE_LIB_MAJOR
@@ -126,7 +126,7 @@
126126
* The patch version number indicates backward-compatible bug fixes or minor updates
127127
* that do not introduce new features. Incrementing this number signals a patch release.
128128
*/
129-
#define UIRB_CORE_LIB_PATCH (1)
129+
#define UIRB_CORE_LIB_PATCH (2)
130130

131131
#else // defined(UIRB_CORE_LIB)
132132

library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/platformio/platformio-core/develop/platformio/assets/schema/library.json",
33
"name": "UIRBcorelib",
4-
"version": "1.2.1",
4+
"version": "1.2.2",
55
"description": "Universal IR Blaster core library for Arduino.",
66
"keywords": [
77
"uirb",

scripts/update_version.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def get_git_version():
1313
Retrieves the latest Git tag or commit hash, appending 'dirty' if there are uncommitted changes.
1414
"""
1515
try:
16-
return subprocess.check_output(["git", "describe", "--tags", "--dirty", "--always"], stderr=subprocess.DEVNULL).strip().decode("utf-8")
16+
return subprocess.check_output(["git", "--git-dir=./.git", "--work-tree=.", "describe", "--tags", "--dirty", "--always"], stderr=subprocess.DEVNULL).strip().decode("utf-8")
1717
except subprocess.CalledProcessError:
1818
raise Exception("Unable to retrieve Git version. Ensure this is a Git repository.")
1919

@@ -62,12 +62,17 @@ def main():
6262
current_dir = os.getcwd()
6363
log_message(f"Current Directory: {current_dir}")
6464

65+
# Get the folder name of the current directory
66+
folder_name = os.path.basename(current_dir)
67+
if folder_name != "UIRBcorelib":
68+
log_message(f"Warning: The current directory {current_dir} does not match the expected folder name 'UIRBcorelib'.")
69+
6570
# Path to the header file
6671
header_file_path = os.path.join(current_dir, "include", "UIRBcore_Version.h")
6772

6873
# Get the latest version from Git
6974
git_version = get_git_version()
70-
log_message(f"Git Tag Version: {git_version}")
75+
log_message(f"Git Describe Output: {git_version}")
7176

7277
# Read the header file
7378
content = read_header_file(header_file_path)

0 commit comments

Comments
 (0)