some fixes
This commit is contained in:
@ -553,11 +553,6 @@ static void app_apply_profile_auxiliary_outputs(const profile_t *profile)
|
||||
|
||||
ad9833_apply(profile->ad9833.enabled, profile->ad9833.triangle, profile->ad9833.frequency_word);
|
||||
stm32_dac_output_set(profile->stm32_dac.code, profile->stm32_dac.enabled);
|
||||
|
||||
if (profile->ds1809.apply_position)
|
||||
{
|
||||
ds1809_apply_position_from_min(profile->ds1809.position_from_min);
|
||||
}
|
||||
}
|
||||
|
||||
static void app_prepare_status_response(void)
|
||||
@ -633,17 +628,19 @@ static bool app_activate_profile(const profile_t *profile, uint16_t index, bool
|
||||
g_app.resume_mode = APP_MODE_WORK;
|
||||
}
|
||||
|
||||
if (profile->ds1809.apply_position)
|
||||
{
|
||||
app_suspend_tec_modulation_spi();
|
||||
ds1809_apply_position_from_min(profile->ds1809.position_from_min);
|
||||
app_resume_tec_modulation_spi();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static void app_capture_live_frame(bool update_temperature_loops, bool drive_laser_currents)
|
||||
{
|
||||
uint16_t adc_slot_7;
|
||||
uint16_t adc_slot_8;
|
||||
uint16_t adc_slot_9;
|
||||
uint16_t adc_slot_10;
|
||||
uint16_t adc_slot_11;
|
||||
uint16_t adc_slot_12;
|
||||
adc_internal_telemetry_t internal_telemetry;
|
||||
uint16_t tec_drive_code;
|
||||
|
||||
g_app.laser_runtime[0].power_raw = adc_mux_read_external_channel(1u);
|
||||
@ -679,31 +676,22 @@ static void app_capture_live_frame(bool update_temperature_loops, bool drive_las
|
||||
app_write_laser_dac_channel(2u, g_app.laser_config[1].current_raw);
|
||||
}
|
||||
|
||||
(void)adc_mux_process_internal_adc_step(0u);
|
||||
adc_slot_7 = adc_mux_process_internal_adc_step(1u);
|
||||
adc_slot_8 = adc_mux_process_internal_adc_step(1u);
|
||||
adc_slot_9 = adc_mux_process_internal_adc_step(1u);
|
||||
adc_slot_10 = adc_mux_process_internal_adc_step(1u);
|
||||
adc_slot_11 = adc_mux_process_internal_adc_step(1u);
|
||||
(void)adc_mux_process_internal_adc_step(2u);
|
||||
(void)adc_mux_process_internal_adc_step(3u);
|
||||
(void)adc_mux_process_internal_adc_step(4u);
|
||||
adc_slot_12 = adc_mux_process_internal_adc_step(4u);
|
||||
(void)adc_mux_process_internal_adc_step(5u);
|
||||
(void)adc_mux_capture_internal_telemetry(&internal_telemetry);
|
||||
|
||||
telemetry_set_message_id(&g_app.telemetry, g_app.work_config.message_id);
|
||||
telemetry_set_live_data(&g_app.telemetry,
|
||||
g_app.laser_runtime[0].power_raw,
|
||||
g_app.laser_runtime[1].power_raw,
|
||||
g_app.tick_10ms,
|
||||
internal_telemetry.input_pf3_raw,
|
||||
internal_telemetry.input_pf4_raw,
|
||||
g_app.laser_runtime[0].current_temperature_raw,
|
||||
g_app.laser_runtime[1].current_temperature_raw,
|
||||
adc_slot_7,
|
||||
adc_slot_8,
|
||||
adc_slot_9,
|
||||
adc_slot_10,
|
||||
adc_slot_11,
|
||||
adc_slot_12);
|
||||
internal_telemetry.external_temperature_1_raw,
|
||||
internal_telemetry.external_temperature_2_raw,
|
||||
internal_telemetry.rail_3v3_raw,
|
||||
internal_telemetry.rail_5v1_raw,
|
||||
internal_telemetry.rail_5v2_raw,
|
||||
internal_telemetry.rail_7v0_raw);
|
||||
}
|
||||
|
||||
static void app_decode_work_packet(const uint16_t *packet_words)
|
||||
|
||||
Reference in New Issue
Block a user