Skip to content

Commit

Permalink
Merge branch 'dev' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
DjordjeMandic committed Jan 1, 2025
2 parents 19accb0 + b901cdb commit 6d0779b
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Add UIRBcore to your `platformio.ini` file using one of the following approaches
```ini
lib_deps =
djordjemandic/UIRBcorelib @ ^1.2.2 ; Depend on the latest 1.x stable version
djordjemandic/UIRBcorelib @ ^1.2.3 ; Depend on the latest 1.x stable version
```

> **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).
Expand All @@ -48,7 +48,7 @@ lib_deps =

```ini
lib_deps =
https://github.com/DjordjeMandic/UIRBcorelib.git#v1.2.2 ; Depend on the v1.2.2 Git tag
https://github.com/DjordjeMandic/UIRBcorelib.git#v1.2.3 ; Depend on the v1.2.3 Git tag
```

### Manually
Expand Down
2 changes: 1 addition & 1 deletion examples/Basic/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ default_envs = uirb-v02 ; Default environment to use for builds (specified belo
platform = atmelavr ; Specifies the Atmel AVR platform (used for ATmega microcontrollers)
framework = arduino ; Utilizes the Arduino framework for development
lib_deps =
djordjemandic/UIRBcorelib @ ^1.2.2 ; UIRBcore library for Universal IR Blaster (GitHub: https://github.com/DjordjeMandic/UIRBcorelib)
djordjemandic/UIRBcorelib @ ^1.2.3 ; UIRBcore library for Universal IR Blaster (GitHub: https://github.com/DjordjeMandic/UIRBcorelib)
monitor_speed = 1000000 ; Serial monitor baud rate (1M)
monitor_filters = default, time, colorize ; Serial monitor: default output, timestamps, and colorized text
build_src_flags =
Expand Down
2 changes: 1 addition & 1 deletion examples/BypassEEPROM/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ build_flags =
-DUIRB_EEPROM_BYPASS_DEBUG ; Enable EEPROM bypass mode (data stored in RAM)
-DUIRB_EEPROM_RPROG_DEBUG=4990 ; Set Rprog resistance to 4990 ohms for debugging
lib_deps = ; Library dependencies
djordjemandic/UIRBcorelib @ ^1.2.2 ; UIRBcorelib library with version 1.2.2 or higher
djordjemandic/UIRBcorelib @ ^1.2.3 ; UIRBcorelib library with version 1.2.3 or higher
monitor_speed = 1000000 ; Speed for serial monitor communication in bits per second
monitor_filters = default, time, colorize ; Serial monitor: default output, timestamps, and colorized text
build_src_flags =
Expand Down
2 changes: 1 addition & 1 deletion examples/Calibration/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ default_envs = uirb-v02 ; Default environment to use for builds (specified belo
platform = atmelavr ; Specifies the Atmel AVR platform (used for ATmega microcontrollers)
framework = arduino ; Utilizes the Arduino framework for development
lib_deps =
djordjemandic/UIRBcorelib @ ^1.2.2 ; UIRBcore library for Universal IR Blaster (GitHub: https://github.com/DjordjeMandic/UIRBcorelib)
djordjemandic/UIRBcorelib @ ^1.2.3 ; UIRBcore library for Universal IR Blaster (GitHub: https://github.com/DjordjeMandic/UIRBcorelib)
monitor_speed = 1000000 ; Serial monitor baud rate (1M)
monitor_filters = default, time, colorize ; Serial monitor: default output, timestamps, and colorized text
build_src_flags =
Expand Down
4 changes: 2 additions & 2 deletions include/UIRBcore_Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
*
* @see https://git-scm.com/docs/git-describe for details about the `git describe` command.
*/
#define UIRB_CORE_LIB_VER_STR "v1.2.2"
#define UIRB_CORE_LIB_VER_STR "v1.2.3"

#if defined(UIRB_CORE_LIB_MAJOR)
#undef UIRB_CORE_LIB_MAJOR
Expand Down Expand Up @@ -126,7 +126,7 @@
* The patch version number indicates backward-compatible bug fixes or minor updates
* that do not introduce new features. Incrementing this number signals a patch release.
*/
#define UIRB_CORE_LIB_PATCH (2)
#define UIRB_CORE_LIB_PATCH (3)

#else // defined(UIRB_CORE_LIB)

Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/platformio/platformio-core/develop/platformio/assets/schema/library.json",
"name": "UIRBcorelib",
"version": "1.2.2",
"version": "1.2.3",
"description": "Universal IR Blaster core library for Arduino.",
"keywords": [
"uirb",
Expand Down
2 changes: 1 addition & 1 deletion scripts/git_info.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ switch ($Operation) {
.OUTPUTS
The project version string or commit hash.
#>
$projVer = git describe --tags --dirty --always 2>$null
$projVer = git describe --git-dir=./.git --work-tree=. --tags --dirty --always 2>$null
if (-not $projVer) {
Write-Output "Unable to retrieve project version. Ensure this is a Git repository."
exit 1
Expand Down

0 comments on commit 6d0779b

Please sign in to comment.