diff --git a/MDK-ARM/RobotMaster_allRobots.uvoptx b/MDK-ARM/RobotMaster_allRobots.uvoptx index f61020c55f1708836293eadfb285475d90fd1be6..04ac74146c05f2efed224e958102dab16099e749 100644 --- a/MDK-ARM/RobotMaster_allRobots.uvoptx +++ b/MDK-ARM/RobotMaster_allRobots.uvoptx @@ -725,7 +725,7 @@ <GroupNumber>7</GroupNumber> <FileNumber>37</FileNumber> <FileType>1</FileType> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\receiver_RadioController.c</PathWithFileName> diff --git a/Src/BoardA_handle.c b/Src/BoardA_handle.c index ffacb2b9b7e709bcf06d0977eaf72bd7c98872ae..22e55669bbadec286e8640246054ca5b77852e20 100644 --- a/Src/BoardA_handle.c +++ b/Src/BoardA_handle.c @@ -105,13 +105,14 @@ void uart_debug(){ return; } 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)); /* uart_debug_command("[2J"); //Clear entire screen 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("\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("\tTemperature: %d\r\n", motors[TOURELLE_YAW].info.temp); uart_debug_printf("\tCommand: %f\r\n", motors[TOURELLE_YAW].command);*/ diff --git a/Src/canon.c b/Src/canon.c index f4dc583d876c413c5f7712044bfc45fde7dab33f..63cb3f43365b38ac56772cb702e43e5dfa560658 100644 --- a/Src/canon.c +++ b/Src/canon.c @@ -27,6 +27,8 @@ void canon_shoot(float speed, float rate){ PWM_SetAllDuty(&htim1, speed, speed); //Démarage des snails 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 diff --git a/Src/pilotes.c b/Src/pilotes.c index 7d00eec5e556697db139bf127e3f5f93b951f4b4..b6703a223d017f623a482dda35e89f471485ace4 100644 --- a/Src/pilotes.c +++ b/Src/pilotes.c @@ -22,9 +22,9 @@ void piloteInit(uint8_t pilote_id){ pilote.sensitivity_chassis_RC_Vy = 10; pilote.sensitivity_chassis_RC_W = 3; - pilote.sensitivity_chassis_keyboard_Vx = 500; - pilote.sensitivity_chassis_keyboard_Vy = 500; - pilote.sensitivity_chassis_mouse_W = 2; + pilote.sensitivity_chassis_keyboard_Vx = 1000; + pilote.sensitivity_chassis_keyboard_Vy = 1000; + pilote.sensitivity_chassis_mouse_W = 5; switch(pilote_id){ //Configuration personnalisée /* Antonin */