Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robomaster_allrobots
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PolySTAR
RoboMaster
Controle-et-Systeme
robomaster_allrobots
Commits
b58e073c
Commit
b58e073c
authored
4 years ago
by
sfaguet
Browse files
Options
Downloads
Patches
Plain Diff
Adaptation pour plus de puissance sur le chassis
parent
d2972447
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
MDK-ARM/RobotMaster_allRobots.uvoptx
+1
-1
1 addition, 1 deletion
MDK-ARM/RobotMaster_allRobots.uvoptx
Src/BoardA_handle.c
+3
-2
3 additions, 2 deletions
Src/BoardA_handle.c
Src/canon.c
+2
-0
2 additions, 0 deletions
Src/canon.c
Src/pilotes.c
+3
-3
3 additions, 3 deletions
Src/pilotes.c
with
9 additions
and
6 deletions
MDK-ARM/RobotMaster_allRobots.uvoptx
+
1
−
1
View file @
b58e073c
...
@@ -725,7 +725,7 @@
...
@@ -725,7 +725,7 @@
<GroupNumber>
7
</GroupNumber>
<GroupNumber>
7
</GroupNumber>
<FileNumber>
37
</FileNumber>
<FileNumber>
37
</FileNumber>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
1
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
<bDave2>
0
</bDave2>
<bDave2>
0
</bDave2>
<PathWithFileName>
..\Src\receiver_RadioController.c
</PathWithFileName>
<PathWithFileName>
..\Src\receiver_RadioController.c
</PathWithFileName>
...
...
This diff is collapsed.
Click to expand it.
Src/BoardA_handle.c
+
3
−
2
View file @
b58e073c
...
@@ -105,13 +105,14 @@ void uart_debug(){
...
@@ -105,13 +105,14 @@ void uart_debug(){
return
;
return
;
}
}
tickstart
=
HAL_GetTick
();
tickstart
=
HAL_GetTick
();
snprintf
(
buff2
,
1000
,
"
Keyboard Z%i S%i Q%i D
%i
\r\n
"
,
receiver_RadioController
.
data
.
kb
.
bit
.
Z
,
receiver_RadioController
.
data
.
kb
.
bit
.
S
,
receiver_RadioController
.
data
.
kb
.
bit
.
Q
,
receiver_RadioController
.
data
.
kb
.
bit
.
D
);
snprintf
(
buff2
,
1000
,
"
Mouse Z
%i
\r\n
"
,
receiver_RadioController
.
data
.
mouse
.
z
);
HAL_UART_Transmit_DMA
(
&
huart8
,
(
uint8_t
*
)
buff2
,
strlen
(
buff2
));
HAL_UART_Transmit_DMA
(
&
huart8
,
(
uint8_t
*
)
buff2
,
strlen
(
buff2
));
/*
/*
uart_debug_command("[2J"); //Clear entire screen
uart_debug_command("[2J"); //Clear entire screen
uart_debug_printf("\r\nTOURELLE YAW\r\n");
uart_debug_printf("\r\nTOURELLE YAW\r\n");
uart_debug_printf("\tAngle: %u (%x)\r\n", motors[TOURELLE_YAW].info.angle, motors[TOURELLE_YAW].info.angle);
uart_debug_printf("\tAngle: %u (%x)\r\n", motors[TOURELLE_YAW].info.angle, motors[TOURELLE_YAW].info.angle);
uart_debug_printf("\tSpeed: %d\r\n", motors[TOURELLE_YAW].info.speed);
uart_debug_
printf("\tSpeed: %d\r\n", motors[TOURELLE_YAW].info.speed);
uart_debug_printf("\tTorque: %d\r\n", motors[TOURELLE_YAW].info.torque);
uart_debug_printf("\tTorque: %d\r\n", motors[TOURELLE_YAW].info.torque);
uart_debug_printf("\tTemperature: %d\r\n", motors[TOURELLE_YAW].info.temp);
uart_debug_printf("\tTemperature: %d\r\n", motors[TOURELLE_YAW].info.temp);
uart_debug_printf("\tCommand: %f\r\n", motors[TOURELLE_YAW].command);*/
uart_debug_printf("\tCommand: %f\r\n", motors[TOURELLE_YAW].command);*/
...
...
This diff is collapsed.
Click to expand it.
Src/canon.c
+
2
−
0
View file @
b58e073c
...
@@ -27,6 +27,8 @@ void canon_shoot(float speed, float rate){
...
@@ -27,6 +27,8 @@ void canon_shoot(float speed, float rate){
PWM_SetAllDuty
(
&
htim1
,
speed
,
speed
);
//Démarage des snails
PWM_SetAllDuty
(
&
htim1
,
speed
,
speed
);
//Démarage des snails
shoot_rate
=
rate
;
//Sauvegarde de la cadance de tir
shoot_rate
=
rate
;
//Sauvegarde de la cadance de tir
motors
[
FEEDER
].
consigne
=
shoot_rate
;
//Démarage du feeder
}
}
//Prise en compte des nouvelles valeurs que si nous sommes entrain de tirer
//Prise en compte des nouvelles valeurs que si nous sommes entrain de tirer
...
...
This diff is collapsed.
Click to expand it.
Src/pilotes.c
+
3
−
3
View file @
b58e073c
...
@@ -22,9 +22,9 @@ void piloteInit(uint8_t pilote_id){
...
@@ -22,9 +22,9 @@ void piloteInit(uint8_t pilote_id){
pilote
.
sensitivity_chassis_RC_Vy
=
10
;
pilote
.
sensitivity_chassis_RC_Vy
=
10
;
pilote
.
sensitivity_chassis_RC_W
=
3
;
pilote
.
sensitivity_chassis_RC_W
=
3
;
pilote
.
sensitivity_chassis_keyboard_Vx
=
5
00
;
pilote
.
sensitivity_chassis_keyboard_Vx
=
10
00
;
pilote
.
sensitivity_chassis_keyboard_Vy
=
5
00
;
pilote
.
sensitivity_chassis_keyboard_Vy
=
10
00
;
pilote
.
sensitivity_chassis_mouse_W
=
2
;
pilote
.
sensitivity_chassis_mouse_W
=
5
;
switch
(
pilote_id
){
//Configuration personnalisée
switch
(
pilote_id
){
//Configuration personnalisée
/* Antonin */
/* Antonin */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment