Sungwoo Kim
/
HydraulicControlBoard_Rainbow_v1_2
rainbow
Revision 249:f69cd0553be0, committed 2022-06-29
- Comitter:
- Lightvalve
- Date:
- Wed Jun 29 00:19:21 2022 +0000
- Parent:
- 248:544011ad9c85
- Child:
- 250:91d3ec3a087e
- Commit message:
- 220629
Changed in this revision
INIT_HW/INIT_HW.cpp | Show annotated file Show diff for this revision Revisions of this file |
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/INIT_HW/INIT_HW.cpp Fri Jun 24 05:55:29 2022 +0000 +++ b/INIT_HW/INIT_HW.cpp Wed Jun 29 00:19:21 2022 +0000 @@ -225,7 +225,7 @@ TIM4->CR1 |= TIM_CR1_UDIS; TIM4->EGR |= TIM_EGR_UG; - TIM4->PSC = 20-1; // 10 prescaler, timer counts up in sync with the peripheral clock + TIM4->PSC = 10-1; // 10 prescaler, timer counts up in sync with the peripheral clock TIM4->ARR = 1; TIM4->CNT = 0; TIM4->SR = 0;
--- a/main.cpp Fri Jun 24 05:55:29 2022 +0000 +++ b/main.cpp Wed Jun 29 00:19:21 2022 +0000 @@ -1438,6 +1438,7 @@ valve_pos_can = -10000.0f*((float)valve_pos.sen -(float)VALVE_ELECTRIC_CENTER)/((float)VALVE_MIN_POS-(float)VALVE_ELECTRIC_CENTER); } CAN_TX_PWM((int16_t)(valve_pos_can)); +// CAN_TX_PWM((int16_t)(valve_pos.sen)); } }