Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
PolySTAR
RoboMaster
Controle-et-Systeme
Robots
Commits
0495443b
Commit
0495443b
authored
Mar 08, 2020
by
Nathan Girard
Browse files
Start new branch for position control M3508
parent
108e7977
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Standard_robot/MDK-ARM/Standard_robot.uvguix.natha
View file @
0495443b
This diff is collapsed.
Click to expand it.
Standard_robot/MDK-ARM/Standard_robot/Standard_robot.hex
View file @
0495443b
This diff is collapsed.
Click to expand it.
Standard_robot/Src/main.c
View file @
0495443b
...
...
@@ -159,7 +159,7 @@ int main(void)
/* USER CODE BEGIN 3 */
/* scan is key be pressed down to change target speed and pwm pulse */
/*
if (key_scan())
if
(
key_scan
())
{
m3508_frontleft
.
target
+=
500
;
m3508_frontright
.
target
+=
500
;
...
...
@@ -180,7 +180,7 @@ int main(void)
// PWM_SetAllDuty(&htim1, 0.1f, 0.1f, 0.1f, 0.1f);
// HAL_Delay(2500);
// PWM_SetAllDuty(&htim1, 0, 0, 0, 0);
}
*/
}
if
(
rc_ctrl
.
rc
.
sw
[
0
]
==
2
)
{
...
...
@@ -234,10 +234,10 @@ int main(void)
/*Affichage de donnees sur le OLED*/
oled_clear
(
Pen_Clear
);
oled_printf
(
1
,
1
,
"M
2006
"
);
oled_printf
(
2
,
1
,
" Target: %f"
,
gm6020_up
.
info
.
GM6020_info
.
angle
);
oled_printf
(
3
,
1
,
" Speed: %i"
,
gm6020_down
.
info
.
GM6020_info
.
angle
);
//
info.M
2006
_info.speed
oled_printf
(
4
,
1
,
" Angle: %i"
,
gm6020_up
.
info
.
GM6020
_info
.
angle
);
oled_printf
(
1
,
1
,
"M
3508
"
);
oled_printf
(
2
,
1
,
" Target: %f"
,
m3508_frontleft
.
target
);
oled_printf
(
3
,
1
,
" Speed: %i"
,
m3508_frontleft
.
info
.
M
3508
_info
.
speed
);
oled_printf
(
4
,
1
,
" Angle: %i"
,
m3508_frontleft
.
info
.
M3508
_info
.
angle
);
oled_refresh_gram
();
// oled_clear(Pen_Clear);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment