Merge pull request #49 from rtlopez/blackbox-45-dev

blackbox gyro unfitered + debug x8
rtlopez · Jul 31, 2023 · 210b815 · 210b815
2 parents 8dfe620 + c0a837d
commit 210b815
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 18 deletions.
diff --git a/lib/Espfc/src/Blackbox.h b/lib/Espfc/src/Blackbox.h
@@ -220,6 +220,11 @@ class Blackbox
       cp->anti_gravity_cutoff_hz = 100;
       cp->d_min_gain = 0;
       cp->d_min_advance = 0;
+      cp->angle_limit = _model.config.angleLimit;
+      cp->angle_earth_ref = 100;
+      cp->horizon_limit_degrees = 135;
+      cp->horizon_delay_ms = 500;
+      cp->thrustLinearization = 0;
 
       rcControlsConfigMutable()->deadband = _model.config.input.deadband;
       rcControlsConfigMutable()->yaw_deadband = _model.config.input.deadband;
@@ -274,7 +279,7 @@ class Blackbox
         blackboxConfigMutable()->sample_rate = blackboxCalculateSampleRate(_model.config.blackboxPdenom);
       }
       blackboxConfigMutable()->device = _model.config.blackboxDev;
-      blackboxConfigMutable()->fields_disabled_mask = 0;
+      blackboxConfigMutable()->fields_disabled_mask = _model.config.blackboxFieldsDisabledMask;
 
       featureConfigMutable()->enabledFeatures = _model.config.featureMask;
 
@@ -325,6 +330,7 @@ class Blackbox
       for(size_t i = 0; i < 3; i++)
       {
         gyro.gyroADCf[i] = degrees(_model.state.gyro[i]);
+        gyro.gyroADC[i] = degrees(_model.state.gyroSampled[i]);
         pidData[i].P = _model.state.innerPid[i].pTerm * 1000.f;
         pidData[i].I = _model.state.innerPid[i].iTerm * 1000.f;
         pidData[i].D = _model.state.innerPid[i].dTerm * 1000.f;

diff --git a/lib/Espfc/src/ModelState.h b/lib/Espfc/src/ModelState.h
@@ -273,7 +273,7 @@ struct ModelState
 
   bool airmodeAllowed;
 
-  int16_t debug[4];
+  int16_t debug[8];
 
   BuzzerState buzzer;