Skip to content

SUKU revh velocity fixed by correcting improper ASC factors #335

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

Merged
Greg-Orca merged 1 commit into from
Mar 25, 2026
Merged

SUKU revh velocity fixed by correcting improper ASC factors #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 25 additions & 11 deletions grid_esp/components/grid_esp32_module_bu16/grid_esp32_module_bu16.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <stdint.h>

#include "grid_ain.h"
#include "grid_asc.h"
#include "grid_cal.h"
#include "grid_config.h"
#include "grid_platform.h"
Expand All @@ -21,7 +22,12 @@

// static const char* TAG = "module_bu16";

#define GRID_MODULE_BU16_ASC_FACTOR 8
#define GRID_MODULE_BU16_ASC_FACTOR_REVH 1

static struct grid_ui_model* DRAM_ATTR ui_ptr = NULL;
static struct grid_asc* DRAM_ATTR asc_array = NULL;
static uint8_t DRAM_ATTR asc_array_length = 0;

static DRAM_ATTR const uint8_t mux_element_lookup[2][8] = {
{0, 1, 4, 5, 8, 9, 12, 13},
Expand All @@ -37,6 +43,11 @@ void IRAM_ATTR bu16_process_analog(struct grid_adc_result* result) {

result->value = GRID_ADC_INVERT_COND(result->value, element_index, element_invert_bm);

assert(element_index < asc_array_length);
if (!grid_asc_process(&asc_array[element_index], result->value, &result->value)) {
return;
}

struct grid_ui_element* ele = &ui_ptr->element_list[element_index];
grid_ui_button_store_input(grid_ui_button_get_state(ele), result->value);
}
Expand All @@ -45,29 +56,32 @@ void grid_esp32_module_bu16_init(struct grid_sys_model* sys, struct grid_ui_mode

ui_ptr = ui;

for (int i = 0; i < ui->element_list_length; ++i) {
struct grid_ui_element* ele = &ui->element_list[i];
if (ele->type == GRID_PARAMETER_ELEMENT_BUTTON) {
grid_ui_button_state_init(grid_ui_button_get_state(ele), GRID_AIN_INTERNAL_RESOLUTION, GRID_BUTTON_THRESHOLD, GRID_BUTTON_HYSTERESIS);
}
}
bool rev_h = grid_hwcfg_module_is_rev_h(sys);

asc_array_length = ui->element_list_length - 1;
asc_array = grid_platform_allocate_volatile(asc_array_length * sizeof(struct grid_asc));
memset(asc_array, 0, asc_array_length * sizeof(struct grid_asc));

grid_config_init(conf, cal);
grid_cal_init(cal, ui->element_list_length, GRID_AIN_INTERNAL_RESOLUTION);

if (grid_hwcfg_module_is_rev_h(sys)) {
for (int i = 0; i < ui->element_list_length; ++i) {
struct grid_ui_element* ele = &ui->element_list[i];
if (ele->type == GRID_PARAMETER_ELEMENT_BUTTON) {
for (int i = 0; i < ui->element_list_length; ++i) {
struct grid_ui_element* ele = &ui->element_list[i];
if (ele->type == GRID_PARAMETER_ELEMENT_BUTTON) {
grid_ui_button_state_init(grid_ui_button_get_state(ele), GRID_AIN_INTERNAL_RESOLUTION, GRID_BUTTON_THRESHOLD, GRID_BUTTON_HYSTERESIS);
grid_asc_set_factor(&asc_array[i], rev_h ? GRID_MODULE_BU16_ASC_FACTOR_REVH : GRID_MODULE_BU16_ASC_FACTOR);
if (rev_h) {
grid_cal_channel_set(cal, i, GRID_CAL_LIMITS, &grid_ui_button_get_state(ele)->limits);
}
}
}

if (rev_h) {
grid_ui_bulk_start_with_state(ui, grid_ui_bulk_conf_read, 0, 0, NULL);
grid_ui_bulk_flush(ui);
}

uint8_t mux_dependent = !grid_hwcfg_module_is_rev_h(sys);
uint8_t mux_dependent = !rev_h;
grid_esp32_adc_init(adc, 0b11111111, mux_dependent, bu16_process_analog);
grid_esp32_adc_start(adc);
}
3 changes: 2 additions & 1 deletion grid_esp/components/grid_esp32_module_pbf4/grid_esp32_module_pbf4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
// static const char* TAG = "module_pbf4";

#define GRID_MODULE_PBF4_ASC_FACTOR 8
#define GRID_MODULE_PBF4_ASC_FACTOR_REVH 1

static struct grid_ui_model* DRAM_ATTR ui_ptr = NULL;
static struct grid_asc* DRAM_ATTR asc_array = NULL;
Expand Down Expand Up @@ -95,7 +96,7 @@ void grid_esp32_module_pbf4_init(struct grid_sys_model* sys, struct grid_ui_mode
grid_asc_set_factor(&asc_array[i], GRID_MODULE_PBF4_ASC_FACTOR);
grid_cal_channel_set(cal, i, GRID_CAL_LIMITS, &grid_ui_potmeter_get_state(ele)->limits);
} else if (ele->type == GRID_PARAMETER_ELEMENT_BUTTON) {
grid_asc_set_factor(&asc_array[i], rev_h ? 1 : GRID_MODULE_PBF4_ASC_FACTOR);
grid_asc_set_factor(&asc_array[i], rev_h ? GRID_MODULE_PBF4_ASC_FACTOR_REVH : GRID_MODULE_PBF4_ASC_FACTOR);
if (rev_h) {
grid_cal_channel_set(cal, i, GRID_CAL_LIMITS, &grid_ui_button_get_state(ele)->limits);
}
Expand Down
3 changes: 2 additions & 1 deletion grid_esp/components/grid_esp32_module_vsnx/grid_esp32_module_vsnx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#define GRID_MODULE_VSNX_BUTTON_COUNT 8
#define GRID_MODULE_VSNX_MINIBUTTON_COUNT 8
#define GRID_MODULE_VSNX_ASC_FACTOR 8
#define GRID_MODULE_VSNX_ASC_FACTOR_REVH 1

static struct grid_ui_model* DRAM_ATTR ui_ptr = NULL;
static struct grid_asc* DRAM_ATTR asc_array = NULL;
Expand Down Expand Up @@ -185,7 +186,7 @@ void grid_esp32_module_vsnx_init(struct grid_sys_model* sys, struct grid_ui_mode
struct grid_ui_element* ele = &ui->element_list[i];
if (ele->type == GRID_PARAMETER_ELEMENT_BUTTON && i < GRID_MODULE_VSNX_BUTTON_COUNT) {
grid_ui_button_state_init(grid_ui_button_get_state(ele), GRID_AIN_INTERNAL_RESOLUTION, GRID_BUTTON_THRESHOLD, GRID_BUTTON_HYSTERESIS);
grid_asc_set_factor(&asc_array[i], GRID_MODULE_VSNX_ASC_FACTOR);
grid_asc_set_factor(&asc_array[i], rev_h ? GRID_MODULE_VSNX_ASC_FACTOR_REVH : GRID_MODULE_VSNX_ASC_FACTOR);
if (rev_h) {
grid_cal_channel_set(cal, i, GRID_CAL_LIMITS, &grid_ui_button_get_state(ele)->limits);
}
Expand Down
Loading