fix merge

CallumMackenzie · CallumMackenzie · commit 3d66350747c6 · 2025-10-26T18:05:28.000-06:00
diff --git a/main/imu/imu_icm20948_driver.c b/main/imu/imu_icm20948_driver.c
@@ -864,18 +864,11 @@ biodyn_imu_err_t biodyn_imu_icm20948_self_test()
 	// }
 
 	// Run mag self-test
-<<<<<<< HEAD
-	// if ((err = self_test_mag()))
-	// {
-	// 	ESP_LOGE(TAG, "Self test failed - mag (%x)", err);
-	// }
-=======
 	if ((err = self_test_mag()))
 	{
 		ESP_LOGE(TAG, "Self test failed - mag (%x)", err);
 		return err;
 	}
->>>>>>> imu_subsystems
 
 	return BIODYN_IMU_OK;
 }

Original file line number	Diff line number	Diff line change
`@@ -864,18 +864,11 @@ biodyn_imu_err_t biodyn_imu_icm20948_self_test()`
`864`	`864`	`// }`
`865`	`865`
`866`	`866`	`// Run mag self-test`
`867`		`-<<<<<<< HEAD`
`868`		`- // if ((err = self_test_mag()))`
`869`		`- // {`
`870`		`- // ESP_LOGE(TAG, "Self test failed - mag (%x)", err);`
`871`		`- // }`
`872`		`-=======`
`873`	`867`	`if ((err = self_test_mag()))`
`874`	`868`	`{`
`875`	`869`	`ESP_LOGE(TAG, "Self test failed - mag (%x)", err);`
`876`	`870`	`return err;`
`877`	`871`	`}`
`878`		`->>>>>>> imu_subsystems`
`879`	`872`
`880`	`873`	`return BIODYN_IMU_OK;`
`881`	`874`	`}`