Various improvements (#264)

- Replace C function pointers with C++ `std::function` in `Thread`, `Timer` and `DispatcherThread`
- Rename `SystemEvent`-related functions
- WiFi: fix auto-connect when WiFi disconnects from bad signal
- WiFi: fix auto-connect when WiFi fails to auto-connect
- WiFi: implement disconnect() when tapping connected WiFi ap in WiFi management app
This commit is contained in:
Ken Van Hoeylandt
2025-03-30 21:59:31 +02:00
committed by GitHub
parent d72852a6e2
commit 3f1bfee3f5
37 changed files with 239 additions and 322 deletions
+7 -24
View File
@@ -4,26 +4,10 @@
using namespace tt;
static uint32_t counter = 0;
static const uint32_t value_chacker_expected = 123;
void increment_callback(TT_UNUSED std::shared_ptr<void> context) {
counter++;
}
void value_checker(std::shared_ptr<void> context) {
auto value = std::static_pointer_cast<uint32_t>(context);
if (*value != value_chacker_expected) {
tt_crash("Test error");
}
}
TEST_CASE("dispatcher should not call callback if consume isn't called") {
counter = 0;
int counter = 0;
Dispatcher dispatcher;
auto context = std::make_shared<uint32_t>();
dispatcher.dispatch(&increment_callback, std::move(context));
dispatcher.dispatch([&counter]() { counter++; });
kernel::delayTicks(10);
CHECK_EQ(counter, 0);
@@ -32,24 +16,23 @@ TEST_CASE("dispatcher should not call callback if consume isn't called") {
TEST_CASE("dispatcher should be able to dealloc when message is not consumed") {
auto* dispatcher = new Dispatcher();
auto context = std::make_shared<uint32_t>();
dispatcher->dispatch(increment_callback, std::move(context));
dispatcher->dispatch([]() { /* NO-OP */ });
delete dispatcher;
}
TEST_CASE("dispatcher should call callback when consume is called") {
counter = 0;
int counter = 0;
Dispatcher dispatcher;
auto context = std::make_shared<uint32_t>();
dispatcher.dispatch(increment_callback, std::move(context));
dispatcher.dispatch([&counter]() { counter++; });
dispatcher.consume(100);
CHECK_EQ(counter, 1);
}
TEST_CASE("message should be passed on correctly") {
Dispatcher dispatcher;
auto context = std::make_shared<uint32_t>(value_chacker_expected);
dispatcher.dispatch(value_checker, std::move(context));
dispatcher.dispatch([]() { /* NO-OP */ });
dispatcher.consume(100);
}
+9 -32
View File
@@ -2,34 +2,11 @@
#include <Tactility/TactilityCore.h>
#include <Tactility/Timer.h>
#include <utility>
using namespace tt;
std::shared_ptr<void> timer_callback_context = NULL;
static void timer_callback_with_context(std::shared_ptr<void> context) {
timer_callback_context = std::move(context);
}
static void timer_callback_with_counter(std::shared_ptr<void> context) {
auto int_ptr = std::static_pointer_cast<int>(context);
(*int_ptr)++;
}
TEST_CASE("a timer passes the context correctly") {
auto foo = std::make_shared<int>(1);
auto* timer = new Timer(Timer::Type::Once, &timer_callback_with_context, foo);
timer->start(1);
kernel::delayTicks(10);
timer->stop();
delete timer;
CHECK_EQ(*std::static_pointer_cast<int>(timer_callback_context), *foo);
}
TEST_CASE("TimerType::Periodic timers can be stopped and restarted") {
auto counter = std::make_shared<int>(0);
auto* timer = new Timer(Timer::Type::Periodic, &timer_callback_with_counter, counter);
int counter = 0;
auto* timer = new Timer(Timer::Type::Periodic, [&counter]() { counter++; });
timer->start(1);
kernel::delayTicks(10);
timer->stop();
@@ -38,24 +15,24 @@ TEST_CASE("TimerType::Periodic timers can be stopped and restarted") {
timer->stop();
delete timer;
CHECK_GE(*counter, 2);
CHECK_GE(counter, 2);
}
TEST_CASE("TimerType::Periodic calls the callback periodically") {
auto counter = std::make_shared<int>(0);
int ticks_to_run = 10;
auto* timer = new Timer(Timer::Type::Periodic, &timer_callback_with_counter, counter);
int counter = 0;
auto* timer = new Timer(Timer::Type::Periodic, [&counter]() { counter++; });
timer->start(1);
kernel::delayTicks(ticks_to_run);
timer->stop();
delete timer;
CHECK_EQ(*counter, ticks_to_run);
CHECK_EQ(counter, ticks_to_run);
}
TEST_CASE("restarting TimerType::Once timers calls the callback again") {
auto counter = std::make_shared<int>(0);
auto* timer = new Timer(Timer::Type::Once, &timer_callback_with_counter, counter);
int counter = 0;
auto* timer = new Timer(Timer::Type::Once, [&counter]() { counter++; });
timer->start(1);
kernel::delayTicks(10);
timer->stop();
@@ -64,5 +41,5 @@ TEST_CASE("restarting TimerType::Once timers calls the callback again") {
timer->stop();
delete timer;
CHECK_EQ(*counter, 2);
CHECK_EQ(counter, 2);
}