diff --git a/sw/airborne/arch/sim/jsbsim_hw.c b/sw/airborne/arch/sim/jsbsim_hw.c index 153f8859a8..d188b1609a 100644 --- a/sw/airborne/arch/sim/jsbsim_hw.c +++ b/sw/airborne/arch/sim/jsbsim_hw.c @@ -28,7 +28,7 @@ uint16_t adc_generic_val2; uint8_t ac_id; void update_bat(double bat) { - fbw_vsupply_decivolt = (int) (bat * 10.); + electrical.vsupply = (int) (bat * 10.); } void adc_generic_init( void ) {} diff --git a/sw/airborne/arch/sim/sim_ap.c b/sw/airborne/arch/sim/sim_ap.c index 1990c33a84..ce7c7f804a 100644 --- a/sw/airborne/arch/sim/sim_ap.c +++ b/sw/airborne/arch/sim/sim_ap.c @@ -91,7 +91,7 @@ value sim_init(value unit) { } value update_bat(value bat) { - fbw_vsupply_decivolt = Int_val(bat); + electrical.vsupply = Int_val(bat); return Val_unit; } diff --git a/sw/airborne/fbw_downlink.h b/sw/airborne/fbw_downlink.h index 637fbcf787..61fe9228bb 100644 --- a/sw/airborne/fbw_downlink.h +++ b/sw/airborne/fbw_downlink.h @@ -62,7 +62,7 @@ #endif #define PERIODIC_SEND_RC(_chan) DOWNLINK_SEND_RC(_chan, RADIO_CONTROL_NB_CHANNEL, radio_control.values) #else // RADIO_CONTROL -#define PERIODIC_SEND_FBW_STATUS(_chan) { uint8_t dummy = 0; DOWNLINK_SEND_FBW_STATUS(_chan, &dummy, &dummy, &fbw_mode, &fbw_vsupply_decivolt, &fbw_current_milliamp); } +#define PERIODIC_SEND_FBW_STATUS(_chan) { uint8_t dummy = 0; DOWNLINK_SEND_FBW_STATUS(_chan, &dummy, &dummy, &fbw_mode, &electrical.vsupply, &electrical.current); } #define PERIODIC_SEND_PPM(_chan) {} #define PERIODIC_SEND_RC(_chan) {} #endif // RADIO_CONTROL