TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-01-07 22:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

init commit for fix touchscreen bad corner (#1071)

Browse Source 
fix a rounding issue and allow more sensible touchscreen
This commit is contained in:
zxkmm 2023-05-26 15:50:32 +08:00 committed by GitHub
parent 5bdf9363e9
commit 53fcdedb88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/application/hw/touch_adc.cpp
View File

@ -71,10 +71,10 @@ Samples get() {
const auto yp_reg = LPC_ADC0->DR[portapack::adc0_touch_yp_input]; const auto yp_reg = LPC_ADC0->DR[portapack::adc0_touch_yp_input];
const auto yn_reg = LPC_ADC0->DR[portapack::adc0_touch_yn_input]; const auto yn_reg = LPC_ADC0->DR[portapack::adc0_touch_yn_input];
return { return {
(xp_reg >> 6) & 0x3ff, ((xp_reg >> 6) & 0x3ff) * 16,
(xn_reg >> 6) & 0x3ff, ((xn_reg >> 6) & 0x3ff) * 16,
(yp_reg >> 6) & 0x3ff, ((yp_reg >> 6) & 0x3ff) * 16,
(yn_reg >> 6) & 0x3ff, ((yn_reg >> 6) & 0x3ff) * 16,
}; };
} }

12
firmware/application/touch.cpp
View File

@ -34,16 +34,16 @@ Metrics calculate_metrics(const Frame& frame) {
* fast *enough*?), so maybe leave it alone at least for now. * fast *enough*?), so maybe leave it alone at least for now.
*/ */
const auto x_max = frame.x.xp; const auto x_max = frame.x.xp / 16;
const auto x_min = frame.x.xn; const auto x_min = frame.x.xn / 16;
const auto x_range = x_max - x_min; const auto x_range = x_max - x_min;
const float x_position = (frame.x.yp + frame.x.yn) * 0.5f; const float x_position = (frame.x.yp / 16 + frame.x.yn / 16) * 0.5f;
const float x_norm = (x_position - x_min) / x_range; const float x_norm = (x_position - x_min) / x_range;
const auto y_max = frame.y.yn; const auto y_max = frame.y.yn / 16;
const auto y_min = frame.y.yp; const auto y_min = frame.y.yp / 16;
const auto y_range = y_max - y_min; const auto y_range = y_max - y_min;
const float y_position = (frame.y.xp + frame.y.xn) * 0.5f; const float y_position = (frame.y.xp / 16 + frame.y.xn / 16) * 0.5f;
const float y_norm = (y_position - y_min) / y_range; const float y_norm = (y_position - y_min) / y_range;
const auto z_max = frame.pressure.yp; const auto z_max = frame.pressure.yp;