Exergie/TransparentBox-V1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial impl for config with queue system

Browse Source
This commit is contained in:
Hector van der Aa
2026-03-24 09:14:27 +01:00
parent 9e2407d06d
commit 1fe4161f39
1 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/modules/config/config.h
View File

@@ -2,35 +2,37 @@
// Copyright (C) 2026 Association Exergie <association.exergie@gmail.com> // Copyright (C) 2026 Association Exergie <association.exergie@gmail.com>
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#pragma once #pragma once
#include "base/module_base.h"
#include "base/ring_buffer.h"
#include "base/task.h"
#include "custom_types.h" #include "custom_types.h"
#include "flags.h" #include "flags.h"
#include "modules/logger/system_logger.h" #include "modules/logger/system_logger.h"
#include "base/task.h"
#include "base/ring_buffer.h"
#include "base/module_base.h"
#include <EEPROM.h> #include <EEPROM.h>
class config : public module_base{ class config : public module_base {
private: private:
vehicle_config _config; vehicle_config _config;
system_logger *_logger; system_logger *_logger;
bool _valid_config; bool _valid_config;
track_data _loaded_track; track_data _loaded_track;
ring_buffer<Task, 16> _queue; ring_buffer<Task, 16> _queue;
int read_cfg(); Task _active_task = {};
int write_cfg(); int read_cfg();
int write_cfg(const vehicle_config& new_config); int write_cfg();
int write_cfg(const vehicle_config &new_config);
int handle_active_task();
public: public:
int push(const Task& task) override; int push(const Task &task) override;
config(); config();
config(system_logger *logger); config(system_logger *logger);
~config(); ~config();
int auto_init(); int auto_init();
int loop(unsigned long timeout_ms = 500);
}; };
int config::push(const Task& task) { int config::push(const Task &task) { return _queue.push(task); }
return _queue.push(task);
}
config::config() : _logger(nullptr), _valid_config(true) {} config::config() : _logger(nullptr), _valid_config(true) {}
config::config(system_logger *logger) : _logger(logger), _valid_config(true) {} config::config(system_logger *logger) : _logger(logger), _valid_config(true) {}
@@ -38,35 +40,52 @@ config::config(system_logger *logger) : _logger(logger), _valid_config(true) {}
config::~config() {} config::~config() {}
int config::read_cfg() { int config::read_cfg() {
EEPROM.get(0, _config); EEPROM.get(0, _config);
return 0; return 0;
} }
int config::write_cfg(const vehicle_config& new_config) { int config::write_cfg(const vehicle_config &new_config) {
EEPROM.put(0, new_config); EEPROM.put(0, new_config);
return 0; return 0;
}
int config::handle_active_task() {
//TODO: handle active task
return 0;
} }
int config::auto_init() { int config::auto_init() {
this->read_cfg();
if (_config.magic != CONFIG_MAGIC) {
#ifdef WARN
if (_logger != nullptr) {
_logger->warn("Config invalid, overwriting");
}
#endif
vehicle_config clean_config;
this->write_cfg(clean_config);
this->read_cfg(); this->read_cfg();
if (_config.magic != CONFIG_MAGIC) { if (_config.magic != CONFIG_MAGIC) {
#ifdef WARN #ifdef ERROR
if (_logger != nullptr) { if (_logger != nullptr) {
_logger->warn("Config invalid, overwriting"); _logger->error("Config write failed, EEPROM may be burnt");
} }
#endif #endif
vehicle_config clean_config; return 1;
this->write_cfg(clean_config);
this->read_cfg();
if (_config.magic != CONFIG_MAGIC) {
#ifdef ERROR
if (_logger != nullptr) {
_logger->error("Config write failed, EEPROM may be burnt");
}
#endif
return 1;
}
} }
_valid_config = true; }
return 0; _valid_config = true;
return 0;
}
int config::loop(unsigned long timeout_ms) {
unsigned long now = millis();
unsigned long task_timeout = now + timeout_ms;
if (_active_task.type != TASK_NULL && _active_task.target != MOD_NULL) {
this->handle_active_task();
return 0;
}
_queue.pop(_active_task);
this->handle_active_task();
return 0;
} }