Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repair ci #564

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Repair ci #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e1f1bd
Try to repair CI runs
ckormanyos Oct 17, 2024
88d0951
Hanlde some tidy messages
ckormanyos Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ref_app/src/app/benchmark/app_benchmark_wide_integer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// then the wide-integer calculations will be constexpr
// and performed at compile-time.

#if 0
#if 1
#define APP_BENCHMARK_WIDE_INTEGER_CONSTEXPR_OR_CONST const // NOLINT(cppcoreguidelines-macro-usage)
#define APP_BENCHMARK_WIDE_INTEGER_CONSTEXPR_IS_COMPILE_TIME_CONSTANT 0 // NOLINT(cppcoreguidelines-macro-usage)
#else
Expand Down
8 changes: 4 additions & 4 deletions ref_app/src/mcal/host/mcal_wdg_watchdog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
timer_type my_timer { my_period };
const std::thread my_thread;

static watchdog my_watchdog;
static std::atomic_flag my_lock;
static watchdog my_watchdog; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
static std::atomic_flag my_lock; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)

auto get_watchdog_timeout() const -> bool
{
Expand Down Expand Up @@ -119,10 +119,10 @@
};

template<const typename watchdog_base::base_timer_type::tick_type MyPeriod>
watchdog<MyPeriod> watchdog<MyPeriod>::my_watchdog(thread_function); // NOLINT(cert-err58-cpp)
watchdog<MyPeriod> watchdog<MyPeriod>::my_watchdog(thread_function); // NOLINT(cppcoreguidelines-avoid-non-const-global-variables,cert-err58-cpp)

template<const typename watchdog_base::base_timer_type::tick_type MyPeriod>
std::atomic_flag watchdog<MyPeriod>::my_lock = ATOMIC_FLAG_INIT;
std::atomic_flag watchdog<MyPeriod>::my_lock = ATOMIC_FLAG_INIT; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
} // namespace wdg
} // namespace mcal

Expand Down
2 changes: 1 addition & 1 deletion ref_app/src/util/utility/util_communication.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
template<typename send_iterator_type>
auto send_n(send_iterator_type first, send_iterator_type last) noexcept -> bool
{
auto send_result = true;
bool send_result { true }; // NOLINT(altera-id-dependent-backward-branch)

while((first != last) && send_result) // NOLINT(altera-id-dependent-backward-branch)
{
Expand Down
2 changes: 1 addition & 1 deletion ref_app/src/util/utility/util_time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@

static auto blocking_delay(const tick_type& delay) -> void
{
const timer t_delay(delay);
const timer t_delay { delay }; // NOLINT(altera-id-dependent-backward-branch)

while(!t_delay.timeout()) // NOLINT(altera-id-dependent-backward-branch)
{
Expand Down
2 changes: 1 addition & 1 deletion ref_app/target/micros/rpi_pico2_rp2350/make/rpi_pico2_rp2350_flags.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ifeq ($(TYP_OS),WIN)
IMG_SUFFIX := uf2
IMAGE_FILE := $(APP).$(IMG_SUFFIX)
ELF2UF2 := $(PATH_TOOLS)/rpi_pico2/picotool/picotool.exe
ELF2UF2 := $(subst /,\,$(PATH_TOOLS)/rpi_pico2/picotool/picotool.exe)
ELF2UF2 := $(subst /,\,$(ELF2UF2))
RULE_SPECIAL_MAKE_IMAGE_FILE := $(ELF2UF2) uf2 convert --quiet $(subst /,\,$(APP).$(TGT_SUFFIX)) $(subst /,\,$(IMAGE_FILE)) --family rp2350-arm-s --abs-block
else
RULE_SPECIAL_MAKE_IMAGE_FILE :=
Expand Down
2 changes: 1 addition & 1 deletion ref_app/target/micros/rpi_pico_rp2040/make/rpi_pico_rp2040_flags.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ifeq ($(TYP_OS),WIN)
IMG_SUFFIX := uf2
IMAGE_FILE := $(APP).$(IMG_SUFFIX)
ELF2UF2 := $(PATH_TOOLS)/rpi_pico/elf2uf2.exe
ELF2UF2 := $(subst /,\,$(PATH_TOOLS)/rpi_pico/elf2uf2.exe)
ELF2UF2 := $(subst /,\,$(ELF2UF2))
RULE_SPECIAL_MAKE_IMAGE_FILE := $(ELF2UF2) $(subst /,\,$(APP).$(TGT_SUFFIX)) $(subst /,\,$(IMAGE_FILE))
else
RULE_SPECIAL_MAKE_IMAGE_FILE :=
Expand Down