Minor code cleanup

This commit is contained in:
whowechina
2024-04-30 08:56:39 +08:00
parent a3234f59bc
commit c91fe7560e
3 changed files with 155 additions and 155 deletions
Binary file not shown.
+97 -97
View File
@@ -1,97 +1,97 @@
/*
* Controller Config and Runtime Data
* WHowe <github.com/whowechina>
*
* Config is a global data structure that stores all the configuration
* Runtime is something to share between files.
*/
#include "config.h"
#include "save.h"
chu_cfg_t *chu_cfg;
static chu_cfg_t default_cfg = {
.colors = {
.key_on_upper = 0x00FF00,
.key_on_lower = 0xff0000,
.key_on_both = 0xff0000,
.key_off = 0x000000,
.gap = 0x000000,
},
.style = {
.key = 0,
.gap = 0,
.tof = 0,
.level = 127,
},
.tof = {
.offset = 80,
.pitch = 20,
},
.sense = {
.filter = 0x10,
.debounce_touch = 1,
.debounce_release = 2,
},
.hid = {
.joy = 1,
.nkro = 0,
},
.aime = {
.mode = 0,
.virtual_aic = 0,
},
};
chu_runtime_t *chu_runtime;
static void config_loaded()
{
if (chu_cfg->style.level > 10) {
chu_cfg->style.level = default_cfg.style.level;
config_changed();
}
if ((chu_cfg->tof.offset < 40) ||
(chu_cfg->tof.pitch < 4) || (chu_cfg->tof.pitch > 50)) {
chu_cfg->tof = default_cfg.tof;
config_changed();
}
if ((chu_cfg->sense.filter & 0x0f) > 3 ||
((chu_cfg->sense.filter >> 4) & 0x0f) > 3) {
chu_cfg->sense.filter = default_cfg.sense.filter;
config_changed();
}
if ((chu_cfg->sense.global > 9) || (chu_cfg->sense.global < -9)) {
chu_cfg->sense.global = default_cfg.sense.global;
config_changed();
}
for (int i = 0; i < 32; i++) {
if ((chu_cfg->sense.keys[i] > 9) || (chu_cfg->sense.keys[i] < -9)) {
chu_cfg->sense.keys[i] = default_cfg.sense.keys[i];
config_changed();
}
}
if ((chu_cfg->sense.debounce_touch > 7) |
(chu_cfg->sense.debounce_release > 7)) {
chu_cfg->sense.debounce_touch = default_cfg.sense.debounce_touch;
chu_cfg->sense.debounce_release = default_cfg.sense.debounce_release;
config_changed();
}
}
void config_changed()
{
save_request(false);
}
void config_factory_reset()
{
*chu_cfg = default_cfg;
save_request(true);
}
void config_init()
{
chu_cfg = (chu_cfg_t *)save_alloc(sizeof(*chu_cfg), &default_cfg, config_loaded);
}
/*
* Controller Config and Runtime Data
* WHowe <github.com/whowechina>
*
* Config is a global data structure that stores all the configuration
* Runtime is something to share between files.
*/
#include "config.h"
#include "save.h"
chu_cfg_t *chu_cfg;
static chu_cfg_t default_cfg = {
.colors = {
.key_on_upper = 0x00FF00,
.key_on_lower = 0xff0000,
.key_on_both = 0xff0000,
.key_off = 0x000000,
.gap = 0x000000,
},
.style = {
.key = 0,
.gap = 0,
.tof = 0,
.level = 127,
},
.tof = {
.offset = 80,
.pitch = 20,
},
.sense = {
.filter = 0x10,
.debounce_touch = 1,
.debounce_release = 2,
},
.hid = {
.joy = 1,
.nkro = 0,
},
.aime = {
.mode = 0,
.virtual_aic = 0,
},
};
chu_runtime_t chu_runtime;
static void config_loaded()
{
if (chu_cfg->style.level > 10) {
chu_cfg->style.level = default_cfg.style.level;
config_changed();
}
if ((chu_cfg->tof.offset < 40) ||
(chu_cfg->tof.pitch < 4) || (chu_cfg->tof.pitch > 50)) {
chu_cfg->tof = default_cfg.tof;
config_changed();
}
if ((chu_cfg->sense.filter & 0x0f) > 3 ||
((chu_cfg->sense.filter >> 4) & 0x0f) > 3) {
chu_cfg->sense.filter = default_cfg.sense.filter;
config_changed();
}
if ((chu_cfg->sense.global > 9) || (chu_cfg->sense.global < -9)) {
chu_cfg->sense.global = default_cfg.sense.global;
config_changed();
}
for (int i = 0; i < 32; i++) {
if ((chu_cfg->sense.keys[i] > 9) || (chu_cfg->sense.keys[i] < -9)) {
chu_cfg->sense.keys[i] = default_cfg.sense.keys[i];
config_changed();
}
}
if ((chu_cfg->sense.debounce_touch > 7) |
(chu_cfg->sense.debounce_release > 7)) {
chu_cfg->sense.debounce_touch = default_cfg.sense.debounce_touch;
chu_cfg->sense.debounce_release = default_cfg.sense.debounce_release;
config_changed();
}
}
void config_changed()
{
save_request(false);
}
void config_factory_reset()
{
*chu_cfg = default_cfg;
save_request(true);
}
void config_init()
{
chu_cfg = (chu_cfg_t *)save_alloc(sizeof(*chu_cfg), &default_cfg, config_loaded);
}
+58 -58
View File
@@ -1,58 +1,58 @@
/*
* Controller Config
* WHowe <github.com/whowechina>
*/
#ifndef CONFIG_H
#define CONFIG_H
#include <stdint.h>
#include <stdbool.h>
typedef struct __attribute__((packed)) {
struct {
uint32_t key_on_upper;
uint32_t key_on_lower;
uint32_t key_on_both;
uint32_t key_off;
uint32_t gap;
} colors;
struct {
uint8_t key;
uint8_t gap;
uint8_t tof;
uint8_t level;
} style;
struct {
uint8_t offset;
uint8_t pitch;
} tof;
struct {
int8_t filter;
int8_t global;
uint8_t debounce_touch;
uint8_t debounce_release;
int8_t keys[32];
} sense;
struct {
uint8_t joy : 4;
uint8_t nkro : 4;
} hid;
struct {
uint8_t mode : 4;
uint8_t virtual_aic : 4;
} aime;
} chu_cfg_t;
typedef struct {
uint16_t fps[2];
} chu_runtime_t;
extern chu_cfg_t *chu_cfg;
extern chu_runtime_t *chu_runtime;
void config_init();
void config_changed(); // Notify the config has changed
void config_factory_reset(); // Reset the config to factory default
#endif
/*
* Controller Config
* WHowe <github.com/whowechina>
*/
#ifndef CONFIG_H
#define CONFIG_H
#include <stdint.h>
#include <stdbool.h>
typedef struct __attribute__((packed)) {
struct {
uint32_t key_on_upper;
uint32_t key_on_lower;
uint32_t key_on_both;
uint32_t key_off;
uint32_t gap;
} colors;
struct {
uint8_t key;
uint8_t gap;
uint8_t tof;
uint8_t level;
} style;
struct {
uint8_t offset;
uint8_t pitch;
} tof;
struct {
int8_t filter;
int8_t global;
uint8_t debounce_touch;
uint8_t debounce_release;
int8_t keys[32];
} sense;
struct {
uint8_t joy : 4;
uint8_t nkro : 4;
} hid;
struct {
uint8_t mode : 4;
uint8_t virtual_aic : 4;
} aime;
} chu_cfg_t;
typedef struct {
bool debug;
} chu_runtime_t;
extern chu_cfg_t *chu_cfg;
extern chu_runtime_t chu_runtime;
void config_init();
void config_changed(); // Notify the config has changed
void config_factory_reset(); // Reset the config to factory default
#endif