j/armchair_fw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add different tolerances for X and Y coordinate

Browse Source 
As already did for http joystick:
- Add different config options tolerance zero for X and Y axis for
normal/actual joystick.

This makes it possible to set Y tolerance to a lower value resulting in
a more responsive turning action, with still having a large range around
X axis for turning mode
This commit is contained in:
jonny_ji7 2022-06-24 09:06:26 +02:00
parent 06d0fda8ee
commit 1da03e9429
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/config.cpp
View File

@ -71,10 +71,11 @@ httpJoystick_config_t configHttpJoystickMain{
joystick_config_t configJoystick = { joystick_config_t configJoystick = {
.adc_x = ADC1_CHANNEL_3, //GPIO39 .adc_x = ADC1_CHANNEL_3, //GPIO39
.adc_y = ADC1_CHANNEL_0, //GPIO36 .adc_y = ADC1_CHANNEL_0, //GPIO36
//range around center-threshold of each axis the coordinates stays at 0 (percentage of available range 0-100) //percentage of joystick range the coordinate of the axis snaps to 0 (0-100)
.tolerance_zero = 7, .tolerance_zeroX_per = 7,
//threshold the coordinate snaps to -1 or 1 before configured "_max" or "_min" threshold (mechanical end) is reached (percentage of available range 0-100) .tolerance_zeroY_per = 3,
.tolerance_end = 5, //percentage of joystick range the coordinate snaps to -1 or 1 before configured "_max" or "_min" threshold (mechanical end) is reached (0-100)
.tolerance_end_per = 5,
//threshold the radius jumps to 1 before the stick is at max radius (range 0-1) //threshold the radius jumps to 1 before the stick is at max radius (range 0-1)
.tolerance_radius = 0.05, .tolerance_radius = 0.05,

4
main/joystick.cpp
View File

@ -76,11 +76,11 @@ joystickData_t evaluatedJoystick::getData() {
//get coordinates //get coordinates
//TODO individual tolerances for each axis? Otherwise some parameters can be removed //TODO individual tolerances for each axis? Otherwise some parameters can be removed
ESP_LOGD(TAG, "getting X coodrinate..."); ESP_LOGD(TAG, "getting X coodrinate...");
float x = scaleCoordinate(readAdc(config.adc_x, config.x_inverted), config.x_min, config.x_max, x_center, config.tolerance_zero, config.tolerance_end); float x = scaleCoordinate(readAdc(config.adc_x, config.x_inverted), config.x_min, config.x_max, x_center, config.tolerance_zeroX_per, config.tolerance_end_per);
data.x = x; data.x = x;
ESP_LOGD(TAG, "getting Y coodrinate..."); ESP_LOGD(TAG, "getting Y coodrinate...");
float y = scaleCoordinate(readAdc(config.adc_y, config.y_inverted), config.y_min, config.y_max, y_center, config.tolerance_zero, config.tolerance_end); float y = scaleCoordinate(readAdc(config.adc_y, config.y_inverted), config.y_min, config.y_max, y_center, config.tolerance_zeroY_per, config.tolerance_end_per);
data.y = y; data.y = y;
//calculate radius //calculate radius

9
main/joystick.hpp
View File

@ -31,10 +31,11 @@ typedef struct joystick_config_t {
adc1_channel_t adc_x; adc1_channel_t adc_x;
adc1_channel_t adc_y; adc1_channel_t adc_y;
//range around center-threshold of each axis the coordinates stays at 0 (adc value 0-4095) //percentage of joystick range the coordinate of the axis snaps to 0 (0-100)
int tolerance_zero; int tolerance_zeroX_per;
//threshold the coordinate snaps to -1 or 1 before configured "_max" or "_min" threshold (mechanical end) is reached (adc value 0-4095) int tolerance_zeroY_per;
int tolerance_end; //percentage of joystick range the coordinate snaps to -1 or 1 before configured "_max" or "_min" threshold (mechanical end) is reached (0-100)
int tolerance_end_per;
//threshold the radius jumps to 1 before the stick is at max radius (range 0-1) //threshold the radius jumps to 1 before the stick is at max radius (range 0-1)
float tolerance_radius; float tolerance_radius;