Test push
This commit is contained in:
parent
67601bf20c
commit
673fa8c951
7 changed files with 47241 additions and 47233 deletions
|
@ -1513,7 +1513,7 @@ void f_projectile(void const * argument)
|
||||||
{
|
{
|
||||||
/* USER CODE BEGIN f_projectile */
|
/* USER CODE BEGIN f_projectile */
|
||||||
TickType_t xLastWakeTime;
|
TickType_t xLastWakeTime;
|
||||||
const TickType_t xPeriodeTache = 50000;
|
const TickType_t xPeriodeTache = 100000;
|
||||||
/* Infinite loop */
|
/* Infinite loop */
|
||||||
struct Missile liste_missile[20];
|
struct Missile liste_missile[20];
|
||||||
struct Missile missile;
|
struct Missile missile;
|
||||||
|
@ -1550,6 +1550,7 @@ void f_projectile(void const * argument)
|
||||||
if ((liste_missile[i].x > 1)&&(liste_missile[i].x < LCD_HEIGHT-1)&&(liste_missile[i].y < LCD_WIDTH-1)&&(liste_missile[i].y > 1))
|
if ((liste_missile[i].x > 1)&&(liste_missile[i].x < LCD_HEIGHT-1)&&(liste_missile[i].y < LCD_WIDTH-1)&&(liste_missile[i].y > 1))
|
||||||
{
|
{
|
||||||
//BSP_LCD_DrawPixel(liste_missile[i].x, liste_missile[i].y, LCD_COLOR_BACKGROUND);
|
//BSP_LCD_DrawPixel(liste_missile[i].x, liste_missile[i].y, LCD_COLOR_BACKGROUND);
|
||||||
|
taskENTER_CRITICAL();
|
||||||
BSP_LCD_SetTextColor(LCD_COLOR_BACKGROUND);
|
BSP_LCD_SetTextColor(LCD_COLOR_BACKGROUND);
|
||||||
BSP_LCD_FillRect(joueur.x, joueur.y, 20, 20);
|
BSP_LCD_FillRect(joueur.x, joueur.y, 20, 20);
|
||||||
liste_missile[i].x = liste_missile[i].x + liste_missile[i].dx ;
|
liste_missile[i].x = liste_missile[i].x + liste_missile[i].dx ;
|
||||||
|
@ -1557,6 +1558,7 @@ void f_projectile(void const * argument)
|
||||||
//BSP_LCD_DrawPixel(liste_missile[i].x, liste_missile[i].y, liste_missile[i].color);
|
//BSP_LCD_DrawPixel(liste_missile[i].x, liste_missile[i].y, liste_missile[i].color);
|
||||||
BSP_LCD_SetTextColor(liste_missile[i].color);
|
BSP_LCD_SetTextColor(liste_missile[i].color);
|
||||||
BSP_LCD_FillRect(liste_missile[i].x, liste_missile[i].y, 20, 20);
|
BSP_LCD_FillRect(liste_missile[i].x, liste_missile[i].y, 20, 20);
|
||||||
|
taskEXIT_CRITICAL();
|
||||||
}
|
}
|
||||||
//TODO test sur tous les ennemis
|
//TODO test sur tous les ennemis
|
||||||
else
|
else
|
||||||
|
|
Binary file not shown.
|
@ -20,5 +20,5 @@ main.c:1330:6:f_GameMaster 32 static
|
||||||
main.c:1377:6:f_Joueur_1 96 static
|
main.c:1377:6:f_Joueur_1 96 static
|
||||||
main.c:1459:6:f_block_enemie 1016 static
|
main.c:1459:6:f_block_enemie 1016 static
|
||||||
main.c:1512:6:f_projectile 384 static
|
main.c:1512:6:f_projectile 384 static
|
||||||
main.c:1608:6:HAL_TIM_PeriodElapsedCallback 16 static
|
main.c:1610:6:HAL_TIM_PeriodElapsedCallback 16 static
|
||||||
main.c:1625:6:Error_Handler 4 static,ignoring_inline_asm
|
main.c:1627:6:Error_Handler 4 static,ignoring_inline_asm
|
||||||
|
|
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue