Skip to content

Commit a9873e4

Browse files
authored
Merge pull request #211 from EmixamPP/next
6.1.1
2 parents a6faf39 + ccf71e6 commit a9873e4

File tree

9 files changed

+23
-16
lines changed

9 files changed

+23
-16
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
write "### :package: Artifacts: $(outcome_emoji ${{ needs.build.outputs.compile }})"
3939
write "1. [Download the tarball](${{ needs.build.outputs.tarball-url }})"
4040
write "2. \`unzip linux-enable-ir-emitter*.tar.gz.zip\`"
41-
write "3. [Execute the install instructions](README.md#installation)"
41+
write "3. [Execute the install instructions](https://github.com/EmixamPP/linux-enable-ir-emitter?tab=readme-ov-file#installation)"
4242
write ""
4343
write "During the execution the tool raises an exception?\\"
4444
write "Please send us the gdb backtrace: \`sudo gdb --ex run --args linux-enable-ir-emitter <your command args>\`, once the crash arrives, type \`bt\` to show the error trace (\`q\` to exit)"

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
uses: rickstaa/action-create-tag@v1
2727
with:
2828
tag: ${{ needs.build.outputs.version }}
29-
force_push_tag: true
3029

3130
- name: Create release
3231
uses: softprops/action-gh-release@v2

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [6.1.1] - 2025-01-29
9+
10+
- The `run` command does not crash if one configuration cannot be applied on q device.
11+
812
## [6.1.0] - 2025-01-29
913

1014
### Added

meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project(
22
'linux-enable-ir-emitter',
33
'cpp',
4-
version: '6.1.0',
4+
version: '6.1.1',
55
license: 'MIT',
66
default_options: [
77
'cpp_std=c++20',
@@ -19,7 +19,7 @@ add_project_arguments(
1919
# without importance
2020
'-Wno-shadow',
2121
# unworth increase of reading complexity
22-
'-Wno-abi-tag',
22+
'-Wno-abi-tag',
2323
'-Wno-effc++',
2424
'-Wno-suggest-attribute=pure',
2525
# let the compiler tries

src/configuration/configuration.cpp.in

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Configuration::~Configuration() {
8181
}
8282
}
8383

84-
CameraInstructions& Configuration::instructions() noexcept {
84+
CameraInstructions &Configuration::instructions() noexcept {
8585
save_on_del_ = true;
8686
return instructions_;
8787
}
@@ -102,13 +102,17 @@ CameraInstructions::const_iterator Configuration::end() const { return instructi
102102

103103
Configurations Configuration::ConfiguredDevices() noexcept {
104104
Configurations confs;
105-
for (const auto &conf : filesystem::directory_iterator(SAVE_FOLDER_CONFIG_PATH)) {
106-
// do not consider saved initial config
107-
if (conf.path().filename().extension().compare(".ini") == 0) continue;
105+
try {
106+
for (const auto &conf : filesystem::directory_iterator(SAVE_FOLDER_CONFIG_PATH)) {
107+
// do not consider saved initial config
108+
if (conf.path().filename().extension().compare(".ini") == 0) continue;
108109

109-
auto device = V4L_PREFIX + conf.path().filename().string();
110-
CameraPtr camera = make_shared<Camera>(device);
111-
confs.push_back(Configuration(camera, false));
110+
auto device = V4L_PREFIX + conf.path().filename().string();
111+
CameraPtr camera = make_shared<Camera>(device);
112+
confs.push_back(Configuration(camera, false));
113+
}
114+
} catch (const std::exception &e) {
115+
logger::warn(e.what());
112116
}
113117
return confs;
114118
}

src/configuration/configuration.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class Configuration {
7171

7272
/**
7373
* @brief Get all the device configured, only based on the file name
74-
*
7574
* @return device path of the configured camera
7675
*/
7776
static Configurations ConfiguredDevices() noexcept;

src/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ if get_option('tests')
7676
install: false,
7777
)
7878
test(
79-
'linux-enable-ir-emitter',
80-
test_exe,
79+
'linux-enable-ir-emitter',
80+
test_exe,
8181
timeout: 0
8282
)
8383
endif

src/utils/_logger.hpp.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
#include <time.h>
33

4+
#include <cstdint>
45
#include <format>
56
#include <fstream>
67
#include <iomanip> // put_time

tests/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ meson_exe = find_program('meson')
22

33
test(
44
'clang-tidy',
5-
meson_exe,
5+
meson_exe,
66
args: [
77
'--internal',
88
'clangtidy',
@@ -14,7 +14,7 @@ test(
1414

1515
test(
1616
'clang-format',
17-
meson_exe,
17+
meson_exe,
1818
args: [
1919
'--internal',
2020
'clangformat',

0 commit comments

Comments
 (0)