Skip to content
Snippets Groups Projects
Commit b58e073c authored by sfaguet's avatar sfaguet
Browse files

Adaptation pour plus de puissance sur le chassis

parent d2972447
No related branches found
No related tags found
No related merge requests found
...@@ -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>
......
...@@ -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);*/
......
...@@ -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
......
...@@ -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 = 500; pilote.sensitivity_chassis_keyboard_Vx = 1000;
pilote.sensitivity_chassis_keyboard_Vy = 500; pilote.sensitivity_chassis_keyboard_Vy = 1000;
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 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment