File tree Expand file tree Collapse file tree
Src/HALAL/Models/TimerDomain Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -709,10 +709,7 @@ struct TimerDomain {
709709
710710 static void init (std::span<const Config, N> cfgs) {
711711 Scheduler_global_timer = cmsis_timers[timer_idxmap[SCHEDULER_TIMER_DOMAIN]];
712- callbacks[ST_LIB::timer_idxmap[SCHEDULER_TIMER_DOMAIN]] =
713- Scheduler_global_timer_callback;
714712 rcc_enable_timer (Scheduler_global_timer);
715- Scheduler_start ();
716713
717714 TimerDomain::callbacks[0 ] = TIM_Default_Callback;
718715 TimerDomain::callbacks[1 ] = TIM_Default_Callback;
@@ -731,6 +728,10 @@ struct TimerDomain {
731728 TimerDomain::callbacks[14 ] = TIM_Default_Callback;
732729 TimerDomain::callbacks[15 ] = TIM_Default_Callback;
733730
731+ callbacks[ST_LIB::timer_idxmap[SCHEDULER_TIMER_DOMAIN]] =
732+ Scheduler_global_timer_callback;
733+ Scheduler_start ();
734+
734735 for (std::size_t i = 0 ; i < N; i++) {
735736 const Config& e = cfgs[i];
736737
Original file line number Diff line number Diff line change @@ -78,9 +78,11 @@ class InputCapture {
7878 volatile HAL_TIM_ChannelStateTypeDef* chx_1_n_state;
7979 uint32_t enableCCx_1;
8080 {
81- chx_1_state = &timer->instance ->hal_tim
81+ chx_1_state =
82+ &timer->instance ->hal_tim
8283 ->ChannelState [TimerDomain::get_channel_state_idx (pin_rising.channel )];
83- chx_1_n_state = &timer->instance ->hal_tim
84+ chx_1_n_state =
85+ &timer->instance ->hal_tim
8486 ->ChannelNState [TimerDomain::get_channel_state_idx (pin_rising.channel )];
8587 if ((*chx_1_state != HAL_TIM_CHANNEL_STATE_READY) ||
8688 (*chx_1_n_state != HAL_TIM_CHANNEL_STATE_READY)) {
@@ -93,8 +95,8 @@ class InputCapture {
9395
9496 timer->template enable_capture_compare_interrupt <pin_rising.channel >();
9597 enableCCx_1 = TIM_CCER_CC1E
96- << (TimerDomain::get_channel_mul4 (pin_rising.channel ) & 0x1FU
97- ); /* 0x1FU = 31 bits max shift */
98+ << (TimerDomain::get_channel_mul4 (pin_rising.channel ) & 0x1FU
99+ ); /* 0x1FU = 31 bits max shift */
98100 SET_BIT (timer->instance ->tim ->CCER , enableCCx_1);
99101 }
100102
Original file line number Diff line number Diff line change @@ -144,7 +144,8 @@ class DualPWM {
144144 );
145145
146146 HAL_TIM_ChannelStateTypeDef* state =
147- &timer->instance ->hal_tim ->ChannelState [TimerDomain::get_channel_state_idx (pin.channel )];
147+ &timer->instance ->hal_tim
148+ ->ChannelState [TimerDomain::get_channel_state_idx (pin.channel )];
148149 *state = HAL_TIM_CHANNEL_STATE_READY;
149150
150151 if (timer->are_all_channels_free ()) {
@@ -170,7 +171,7 @@ class DualPWM {
170171
171172 HAL_TIM_ChannelStateTypeDef* state =
172173 &timer->instance ->hal_tim
173- . ChannelState [TimerDomain::get_channel_state_idx (negated_pin.channel )];
174+ -> ChannelState [TimerDomain::get_channel_state_idx (negated_pin.channel )];
174175 *state = HAL_TIM_CHANNEL_STATE_READY;
175176
176177 if (timer->are_all_channels_free ()) {
Original file line number Diff line number Diff line change @@ -27,7 +27,9 @@ void* TimerDomain::callback_data[TimerDomain::max_instances] = {nullptr};
2727TimerDomain::InputCaptureInfo input_capture_info_dummy = {0 };
2828
2929TimerDomain::InputCaptureInfo* TimerDomain::input_capture_info[max_instances]
30- [input_capture_channels] = {&input_capture_info_dummy};
30+ [input_capture_channels] = {
31+ &input_capture_info_dummy
32+ };
3133TimerDomain::InputCaptureInfo TimerDomain::input_capture_info_backing[max_instances]
3234 [input_capture_channels];
3335
You can’t perform that action at this time.
0 commit comments