zmkfirmware
/
zmk
mirror of https://github.com/zmkfirmware/zmk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup! feat: Refactor behaviors, sensor to raise behavior_binding_event

This commit is contained in:
Nicolas Munnich 2025-11-29 23:21:24 +00:00
parent c0fdb586ef
commit a7b00f6c91
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/sensors.c
View File

@ -150,25 +150,27 @@ int sensor_listener(const zmk_event_t *eh) {
return -EINVAL; return -EINVAL;
} }
uint32_t sensor_index = sensor_ev->sensor_index; uint32_t sensor_index = sensor_ev->sensor_index;
const struct sensor_value value = sensor_ev->channel_data[0].value; const struct sensor_value previous_value = sensor_ev->channel_data[0].value;
const struct zmk_sensor_data *data = zmk_sensor_get_data(sensor_index); const struct zmk_sensor_data *data = zmk_sensor_get_data(sensor_index);
const struct zmk_sensor_config *sensor_config = zmk_sensors_get_config_at_index(sensor_index); const struct zmk_sensor_config *sensor_config = zmk_sensors_get_config_at_index(sensor_index);
data->remainder.val1 += value.val1; struct sensor_value new_value = {
data->remainder.val2 += value.val2; .val1 = data->remainder.val1 + previous_value.val1,
.val2 = data->remainder.val2 + previous_value.val2,
};
if (data->remainder.val2 >= 1000000 || data->remainder.val2 <= 1000000) { if (new_value.val2 >= 1000000 || new_value.val2 <= 1000000) {
data->remainder.val1 += data->remainder.val2 / 1000000; new_value.val1 += new_value.val2 / 1000000;
data->remainder.val2 %= 1000000; new_value.val2 %= 1000000;
} }
int trigger_degrees = 360 / sensor_config->triggers_per_rotation; int trigger_degrees = 360 / sensor_config->triggers_per_rotation;
int triggers = data->remainder.val1 / trigger_degrees; int triggers = new_value.val1 / trigger_degrees;
data->remainder.val1 %= trigger_degrees; new_value.val1 %= trigger_degrees;
zmk_sensor_set_remainder(sensor_index, data->remainder); zmk_sensor_set_remainder(sensor_index, new_value);
zmk_sensor_set_num_triggers(sensor_index, triggers); zmk_sensor_set_num_triggers(sensor_index, triggers);
LOG_DBG("val1: %d, val2: %d, remainder: %d/%d triggers: %d", value.val1, value.val2, LOG_DBG("val1: %d, val2: %d, remainder: %d/%d triggers: %d", previous_value.val1,
data->remainder.val1, data->remainder.val2, triggers); previous_value.val2, new_value.val1, new_value.val2, triggers);
int position = ZMK_VIRTUAL_KEY_POSITION_SENSOR(sensor_index); int position = ZMK_VIRTUAL_KEY_POSITION_SENSOR(sensor_index);
// Source is set to local for the time being, to be improved in the future // Source is set to local for the time being, to be improved in the future