Commit 0495443b authored by Nathan Girard's avatar Nathan Girard
Browse files

Start new branch for position control M3508

parent 108e7977
...@@ -159,7 +159,7 @@ int main(void) ...@@ -159,7 +159,7 @@ int main(void)
/* USER CODE BEGIN 3 */ /* USER CODE BEGIN 3 */
/* scan is key be pressed down to change target speed and pwm pulse */ /* scan is key be pressed down to change target speed and pwm pulse */
/*if (key_scan()) if (key_scan())
{ {
m3508_frontleft.target += 500; m3508_frontleft.target += 500;
m3508_frontright.target += 500; m3508_frontright.target += 500;
...@@ -180,7 +180,7 @@ int main(void) ...@@ -180,7 +180,7 @@ int main(void)
// PWM_SetAllDuty(&htim1, 0.1f, 0.1f, 0.1f, 0.1f); // PWM_SetAllDuty(&htim1, 0.1f, 0.1f, 0.1f, 0.1f);
// HAL_Delay(2500); // HAL_Delay(2500);
// PWM_SetAllDuty(&htim1, 0, 0, 0, 0); // PWM_SetAllDuty(&htim1, 0, 0, 0, 0);
}*/ }
if (rc_ctrl.rc.sw[0] == 2) if (rc_ctrl.rc.sw[0] == 2)
{ {
...@@ -234,10 +234,10 @@ int main(void) ...@@ -234,10 +234,10 @@ int main(void)
/*Affichage de donnees sur le OLED*/ /*Affichage de donnees sur le OLED*/
oled_clear(Pen_Clear); oled_clear(Pen_Clear);
oled_printf(1, 1, "M2006"); oled_printf(1, 1, "M3508");
oled_printf(2, 1," Target: %f", gm6020_up.info.GM6020_info.angle); oled_printf(2, 1," Target: %f", m3508_frontleft.target);
oled_printf(3, 1," Speed: %i", gm6020_down.info.GM6020_info.angle);//info.M2006_info.speed oled_printf(3, 1," Speed: %i", m3508_frontleft.info.M3508_info.speed);
oled_printf(4, 1," Angle: %i", gm6020_up.info.GM6020_info.angle); oled_printf(4, 1," Angle: %i", m3508_frontleft.info.M3508_info.angle);
oled_refresh_gram(); oled_refresh_gram();
// oled_clear(Pen_Clear); // oled_clear(Pen_Clear);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment