quiK/NaxGCC-FW
1
0
Fork 0
forked from NaxdyOrg/NaxGCC-FW
Code Pull requests Activity

fix(stick): use correct array types & linear cal values

Browse source
This commit is contained in:
Naxdy 2024-03-27 20:08:58 +01:00
parent 5ab51f5670
commit 4077220f27
Signed by: Naxdy
GPG key ID: CC15075846BCE91B
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/stick.rs
View file

@ -38,8 +38,8 @@ pub struct StickParams {
pub fit_coeffs_y: [f32; NUM_COEFFS], pub fit_coeffs_y: [f32; NUM_COEFFS],
// these are the notch remap parameters // these are the notch remap parameters
pub affine_coeffs: [[f32; 16]; 4], // affine transformation coefficients for all regions of the stick pub affine_coeffs: [[f32; 4]; 16], // affine transformation coefficients for all regions of the stick
pub boundary_angles: [f32; 4], // angles at the boundaries between regions of the stick (in the plane) pub boundary_angles: [f32; 16], // angles at the boundaries between regions of the stick (in the plane)
} }
impl StickParams { impl StickParams {
@ -313,8 +313,8 @@ impl LinearizedCalibration {
#[derive(Clone, Debug, Default)] #[derive(Clone, Debug, Default)]
struct NotchCalibration { struct NotchCalibration {
affine_coeffs: [[f32; 16]; 4], affine_coeffs: [[f32; 4]; 16],
boundary_angles: [f32; 4], boundary_angles: [f32; 16],
} }
impl NotchCalibration { impl NotchCalibration {
@ -388,10 +388,10 @@ impl NotchCalibration {
); );
out.boundary_angles[i - 1] = match atan2f( out.boundary_angles[i - 1] = match atan2f(
cleaned_calibration_points.cleaned_points_y[i] linearized_calibration.linearized_points_y[i]
- cleaned_calibration_points.cleaned_points_y[0], - linearized_calibration.linearized_points_y[0],
cleaned_calibration_points.cleaned_points_x[i] linearized_calibration.linearized_points_x[i]
- cleaned_calibration_points.cleaned_points_x[0], - linearized_calibration.linearized_points_x[0],
) { ) {
a if a < out.boundary_angles[0] => a + 2. * PI, a if a < out.boundary_angles[0] => a + 2. * PI,
a => a, a => a,