diff --git a/conf/airframes/AGGIEAIR/aggieair_iris_indi.xml b/conf/airframes/AGGIEAIR/aggieair_iris_indi.xml index 1d4fcfa409..61de9ba398 100644 --- a/conf/airframes/AGGIEAIR/aggieair_iris_indi.xml +++ b/conf/airframes/AGGIEAIR/aggieair_iris_indi.xml @@ -11,114 +11,115 @@ - + + - - amount of time it take for the bat to check - to avoid bat low spike detection when strong pullup withch draws short sudden power - - - - - - - - - - - - - - - - - - - - - - - - use external mag + amount of time it take for the bat to check + to avoid bat low spike detection when strong pullup withch draws short sudden power - - - + + + + + + + + + + + + + + - - - - - + - + + + + + use external mag + + + + - - - - - - - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/airframes/ENAC/fixed-wing/jp.xml b/conf/airframes/ENAC/fixed-wing/jp.xml index d3e63eb84a..22b673e795 100644 --- a/conf/airframes/ENAC/fixed-wing/jp.xml +++ b/conf/airframes/ENAC/fixed-wing/jp.xml @@ -4,9 +4,9 @@ - + @@ -19,6 +19,7 @@ + diff --git a/conf/airframes/examples/quadrotor_navstik.xml b/conf/airframes/examples/quadrotor_navstik.xml index 23d8b1be45..34377b629b 100644 --- a/conf/airframes/examples/quadrotor_navstik.xml +++ b/conf/airframes/examples/quadrotor_navstik.xml @@ -30,9 +30,7 @@ - - - + diff --git a/conf/airframes/tudelft/logo600.xml b/conf/airframes/tudelft/logo600.xml index e44ab09980..ea7608cf4d 100644 --- a/conf/airframes/tudelft/logo600.xml +++ b/conf/airframes/tudelft/logo600.xml @@ -22,51 +22,53 @@ The xml in master currently configures the LOGO600 as a pure model aircraft: mea - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + + diff --git a/sw/airborne/math/pprz_matrix_decomp_float.c b/sw/airborne/math/pprz_matrix_decomp_float.c index d823035fcd..6175397093 100644 --- a/sw/airborne/math/pprz_matrix_decomp_float.c +++ b/sw/airborne/math/pprz_matrix_decomp_float.c @@ -650,7 +650,7 @@ void fit_linear_model_prior(float *targets, int D, float (*samples)[D], uint16_t MAKE_MATRIX_PTR(AATAA, _AATAA, D_1); float _PRIOR[D_1][D_1]; MAKE_MATRIX_PTR(PRIOR, _PRIOR, D_1); - for(int d = 0; d < D; d++) { + for(d = 0; d < D; d++) { PRIOR[d][d] = priors[d]; } if(use_bias) { diff --git a/sw/airborne/modules/fsae_electric/vms_ecu_demo.c b/sw/airborne/modules/fsae_electric/vms_ecu_demo.c index e9407ce897..b0ad953206 100644 --- a/sw/airborne/modules/fsae_electric/vms_ecu_demo.c +++ b/sw/airborne/modules/fsae_electric/vms_ecu_demo.c @@ -121,11 +121,11 @@ static const struct can_instance can2 = {&CAND2, 12}; * from abort mode. * See section 22.7.7 on the STM32 reference manual. */ -static const CANConfig cancfg_lb = { - CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP, - CAN_BTR_LBKM | CAN_BTR_SJW(0) | CAN_BTR_TS2(1) | - CAN_BTR_TS1(8) | CAN_BTR_BRP(6) -}; +// static const CANConfig cancfg_lb = { +// CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP, +// CAN_BTR_LBKM | CAN_BTR_SJW(0) | CAN_BTR_TS2(1) | +// CAN_BTR_TS1(8) | CAN_BTR_BRP(6) +// }; /* * Normal mode, see if we can ping each other