Change P1 paddle speed for quick change

flipper_pong.c

@@ -15,7 +15,7 @@
 
 #define PAD_SIZE_X 3
 #define PAD_SIZE_Y 8
-#define PLAYER1_PAD_SPEED 2
+#define PLAYER1_PAD_SPEED 8
 #define PLAYER2_PAD_SPEED 2
 #define BALL_SIZE 4
 
@@ -29,34 +29,39 @@ typedef struct {
     InputEvent input;
 } EventApp;
 
-typedef struct Players 
-{
-  uint8_t player1_X,player1_Y,player2_X,player2_Y;
-  uint16_t player1_score,player2_score;
-  uint8_t ball_X,ball_Y,ball_X_speed,ball_Y_speed,ball_X_direction,ball_Y_direction;
+typedef struct Players {
+    uint8_t player1_X, player1_Y, player2_X, player2_Y;
+    uint16_t player1_score, player2_score;
+    uint8_t ball_X, ball_Y, ball_X_speed, ball_Y_speed, ball_X_direction, ball_Y_direction;
 } Players;
 
-static void draw_callback(Canvas* canvas, void* ctx) 
-{
+static void draw_callback(Canvas* canvas, void* ctx) {
     UNUSED(ctx);
     Players* playersMutex = (Players*)acquire_mutex_block((ValueMutex*)ctx);
 
     canvas_draw_frame(canvas, 0, 0, 128, 64);
-    canvas_draw_box(canvas, playersMutex->player1_X, playersMutex->player1_Y, PAD_SIZE_X, PAD_SIZE_Y);
-    canvas_draw_box(canvas, playersMutex->player2_X, playersMutex->player2_Y, PAD_SIZE_X, PAD_SIZE_Y);
+    canvas_draw_box(
+        canvas, playersMutex->player1_X, playersMutex->player1_Y, PAD_SIZE_X, PAD_SIZE_Y);
+    canvas_draw_box(
+        canvas, playersMutex->player2_X, playersMutex->player2_Y, PAD_SIZE_X, PAD_SIZE_Y);
     canvas_draw_box(canvas, playersMutex->ball_X, playersMutex->ball_Y, BALL_SIZE, BALL_SIZE);
 
     canvas_set_font(canvas, FontPrimary);
     canvas_set_font_direction(canvas, CanvasDirectionBottomToTop);
     char buffer[16];
-    snprintf(buffer, sizeof(buffer), "%u - %u", playersMutex->player1_score, playersMutex->player2_score);
-    canvas_draw_str_aligned(canvas, SCREEN_SIZE_X/2+15, SCREEN_SIZE_Y/2+2, AlignCenter, AlignTop, buffer);
+    snprintf(
+        buffer,
+        sizeof(buffer),
+        "%u - %u",
+        playersMutex->player1_score,
+        playersMutex->player2_score);
+    canvas_draw_str_aligned(
+        canvas, SCREEN_SIZE_X / 2 + 15, SCREEN_SIZE_Y / 2 + 2, AlignCenter, AlignTop, buffer);
 
     release_mutex((ValueMutex*)ctx, playersMutex);
 }
 
-static void input_callback(InputEvent* input_event, void* ctx) 
-{
+static void input_callback(InputEvent* input_event, void* ctx) {
     furi_assert(ctx);
     FuriMessageQueue* event_queue = ctx;
     EventApp event = {.type = EventTypeInput, .input = *input_event};
@@ -70,48 +75,44 @@ static void clock_tick(void* ctx) {
     furi_message_queue_put(queue, &event, 0);
 }
 
-bool insidePad(uint8_t x, uint8_t y, uint8_t playerX, uint8_t playerY)
-{
-    if (x >= playerX && x <= playerX+PAD_SIZE_X && y >= playerY && y <= playerY+PAD_SIZE_Y) return true;
+bool insidePad(uint8_t x, uint8_t y, uint8_t playerX, uint8_t playerY) {
+    if(x >= playerX && x <= playerX + PAD_SIZE_X && y >= playerY && y <= playerY + PAD_SIZE_Y)
+        return true;
     return false;
 }
 
-uint8_t changeSpeed()
-{
+uint8_t changeSpeed() {
     uint8_t randomuint8[1];
-    while(1)
-    {
-        furi_hal_random_fill_buf(randomuint8,1);
-        randomuint8[0] &= 0b00000011;                
-        if (randomuint8[0] >= 1) break;
+    while(1) {
+        furi_hal_random_fill_buf(randomuint8, 1);
+        randomuint8[0] &= 0b00000011;
+        if(randomuint8[0] >= 1) break;
     }
     return randomuint8[0];
 }
 
-uint8_t changeDirection()
-{
+uint8_t changeDirection() {
     uint8_t randomuint8[1];
-    furi_hal_random_fill_buf(randomuint8,1);
+    furi_hal_random_fill_buf(randomuint8, 1);
     randomuint8[0] &= 0b1;
-    return randomuint8[0];            
+    return randomuint8[0];
 }
 
-int32_t flipper_pong_app() 
-{
+int32_t flipper_pong_app() {
     EventApp event;
     FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(EventApp));
 
     Players players;
-    players.player1_X = SCREEN_SIZE_X-PAD_SIZE_X-1;
-    players.player1_Y = SCREEN_SIZE_Y/2 - PAD_SIZE_Y/2;
+    players.player1_X = SCREEN_SIZE_X - PAD_SIZE_X - 1;
+    players.player1_Y = SCREEN_SIZE_Y / 2 - PAD_SIZE_Y / 2;
     players.player1_score = 0;
 
     players.player2_X = 1;
-    players.player2_Y = SCREEN_SIZE_Y/2 - PAD_SIZE_Y/2;
+    players.player2_Y = SCREEN_SIZE_Y / 2 - PAD_SIZE_Y / 2;
     players.player2_score = 0;
 
-    players.ball_X = SCREEN_SIZE_X/2 - BALL_SIZE/2;
-    players.ball_Y = SCREEN_SIZE_Y/2 - BALL_SIZE/2;
+    players.ball_X = SCREEN_SIZE_X / 2 - BALL_SIZE / 2;
+    players.ball_Y = SCREEN_SIZE_Y / 2 - BALL_SIZE / 2;
     players.ball_X_speed = 1;
     players.ball_Y_speed = 1;
     players.ball_X_direction = changeDirection();
@@ -128,120 +129,120 @@ int32_t flipper_pong_app()
     gui_add_view_port(gui, view_port, GuiLayerFullscreen);
 
     NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
-    if (players.ball_X_direction == 0) notification_message(notification, &sequence_set_only_red_255);
-    else notification_message(notification, &sequence_set_only_blue_255);
+    if(players.ball_X_direction == 0)
+        notification_message(notification, &sequence_set_only_red_255);
+    else
+        notification_message(notification, &sequence_set_only_blue_255);
 
     FuriTimer* timer = furi_timer_alloc(clock_tick, FuriTimerTypePeriodic, event_queue);
-    furi_timer_start(timer, 1000/FPS);
+    furi_timer_start(timer, 1000 / FPS);
 
-    while(1) 
-    {
+    while(1) {
         FuriStatus event_status = furi_message_queue_get(event_queue, &event, FuriWaitForever);
         Players* playersMutex = (Players*)acquire_mutex_block(&state_mutex);
 
-        if (event_status == FuriStatusOk)
-        {   
-            if(event.type == EventTypeInput) 
-            {
-                if(event.input.key == InputKeyBack) 
-                {
+        if(event_status == FuriStatusOk) {
+            if(event.type == EventTypeInput) {
+                if(event.input.key == InputKeyBack) {
                     release_mutex(&state_mutex, playersMutex);
                     notification_message(notification, &sequence_set_only_green_255);
                     break;
+                } else if(event.input.key == InputKeyUp) {
+                    if(playersMutex->player1_Y >= 1 + PLAYER1_PAD_SPEED)
+                        playersMutex->player1_Y -= PLAYER1_PAD_SPEED;
+                    else
+                        playersMutex->player1_Y = 1;
+                } else if(event.input.key == InputKeyDown) {
+                    if(playersMutex->player1_Y <=
+                       SCREEN_SIZE_Y - PAD_SIZE_Y - PLAYER1_PAD_SPEED - 1)
+                        playersMutex->player1_Y += PLAYER1_PAD_SPEED;
+                    else
+                        playersMutex->player1_Y = SCREEN_SIZE_Y - PAD_SIZE_Y - 1;
                 }
-                else if(event.input.key == InputKeyUp) 
-                {
-                    if (playersMutex->player1_Y >= 1+PLAYER1_PAD_SPEED) playersMutex->player1_Y -= PLAYER1_PAD_SPEED;
-                    else playersMutex->player1_Y = 1;
-                }
-                else if(event.input.key == InputKeyDown) 
-                {
-                    if (playersMutex->player1_Y <= SCREEN_SIZE_Y - PAD_SIZE_Y - PLAYER1_PAD_SPEED -1) playersMutex->player1_Y += PLAYER1_PAD_SPEED;
-                    else playersMutex->player1_Y = SCREEN_SIZE_Y - PAD_SIZE_Y - 1;
-                }
-            }
-            else if (event.type == ClockEventTypeTick)
-            {
-
-                if (playersMutex->ball_X + BALL_SIZE/2 <= SCREEN_SIZE_X*0.35 && playersMutex->ball_X_direction == 0)
-                {
-                    if (playersMutex->ball_Y + BALL_SIZE/2 < playersMutex->player2_Y + PAD_SIZE_Y/2)
-                    {
-                        if (playersMutex->player2_Y >= 1+PLAYER2_PAD_SPEED) playersMutex->player2_Y -= PLAYER2_PAD_SPEED;
-                        else playersMutex->player2_Y= 1;
-                    }
-                    else if (playersMutex->ball_Y + BALL_SIZE/2 > playersMutex->player2_Y + PAD_SIZE_Y/2)
-                    {
-                        if (playersMutex->player2_Y <= SCREEN_SIZE_Y - PAD_SIZE_Y - PLAYER2_PAD_SPEED -1) playersMutex->player2_Y += PLAYER2_PAD_SPEED;
-                        else playersMutex->player2_Y = SCREEN_SIZE_Y - PAD_SIZE_Y - 1;
+            } else if(event.type == ClockEventTypeTick) {
+                if(playersMutex->ball_X + BALL_SIZE / 2 <= SCREEN_SIZE_X * 0.35 &&
+                   playersMutex->ball_X_direction == 0) {
+                    if(playersMutex->ball_Y + BALL_SIZE / 2 <
+                       playersMutex->player2_Y + PAD_SIZE_Y / 2) {
+                        if(playersMutex->player2_Y >= 1 + PLAYER2_PAD_SPEED)
+                            playersMutex->player2_Y -= PLAYER2_PAD_SPEED;
+                        else
+                            playersMutex->player2_Y = 1;
+                    } else if(
+                        playersMutex->ball_Y + BALL_SIZE / 2 >
+                        playersMutex->player2_Y + PAD_SIZE_Y / 2) {
+                        if(playersMutex->player2_Y <=
+                           SCREEN_SIZE_Y - PAD_SIZE_Y - PLAYER2_PAD_SPEED - 1)
+                            playersMutex->player2_Y += PLAYER2_PAD_SPEED;
+                        else
+                            playersMutex->player2_Y = SCREEN_SIZE_Y - PAD_SIZE_Y - 1;
                     }
                 }
 
-                uint8_t ball_corner_X[4] = {playersMutex->ball_X, playersMutex->ball_X + BALL_SIZE, playersMutex->ball_X + BALL_SIZE, playersMutex->ball_X};
-                uint8_t ball_corner_Y[4] = {playersMutex->ball_Y, playersMutex->ball_Y, playersMutex->ball_Y + BALL_SIZE, playersMutex->ball_Y + BALL_SIZE};
+                uint8_t ball_corner_X[4] = {
+                    playersMutex->ball_X,
+                    playersMutex->ball_X + BALL_SIZE,
+                    playersMutex->ball_X + BALL_SIZE,
+                    playersMutex->ball_X};
+                uint8_t ball_corner_Y[4] = {
+                    playersMutex->ball_Y,
+                    playersMutex->ball_Y,
+                    playersMutex->ball_Y + BALL_SIZE,
+                    playersMutex->ball_Y + BALL_SIZE};
                 bool insidePlayer1 = false, insidePlayer2 = false;
 
-                for (int i=0;i<4;i++)
-                {
-                    if (insidePad(ball_corner_X[i], ball_corner_Y[i], playersMutex->player1_X, playersMutex->player1_Y) == true)
-                    {
+                for(int i = 0; i < 4; i++) {
+                    if(insidePad(
+                           ball_corner_X[i],
+                           ball_corner_Y[i],
+                           playersMutex->player1_X,
+                           playersMutex->player1_Y) == true) {
                         insidePlayer1 = true;
                         break;
                     }
 
-                    if (insidePad(ball_corner_X[i], ball_corner_Y[i], playersMutex->player2_X, playersMutex->player2_Y) == true)
-                    {
+                    if(insidePad(
+                           ball_corner_X[i],
+                           ball_corner_Y[i],
+                           playersMutex->player2_X,
+                           playersMutex->player2_Y) == true) {
                         insidePlayer2 = true;
                         break;
                     }
                 }
 
-                if (insidePlayer1 == true)
-                {
+                if(insidePlayer1 == true) {
                     playersMutex->ball_X_direction = 0;
                     playersMutex->ball_X -= playersMutex->ball_X_speed;
                     playersMutex->ball_X_speed = changeSpeed();
                     playersMutex->ball_Y_speed = changeSpeed();
                     notification_message(notification, &sequence_set_only_red_255);
-                }
-                else if (insidePlayer2 == true)
-                {
+                } else if(insidePlayer2 == true) {
                     playersMutex->ball_X_direction = 1;
                     playersMutex->ball_X += playersMutex->ball_X_speed;
                     playersMutex->ball_X_speed = changeSpeed();
                     playersMutex->ball_Y_speed = changeSpeed();
                     notification_message(notification, &sequence_set_only_blue_255);
-                }
-                else
-                {
-                    if (playersMutex->ball_X_direction == 1)
-                    {
-
-                        if (playersMutex->ball_X <= SCREEN_SIZE_X - BALL_SIZE - 1 - playersMutex->ball_X_speed)
-                        {
+                } else {
+                    if(playersMutex->ball_X_direction == 1) {
+                        if(playersMutex->ball_X <=
+                           SCREEN_SIZE_X - BALL_SIZE - 1 - playersMutex->ball_X_speed) {
                             playersMutex->ball_X += playersMutex->ball_X_speed;
-                        }
-                        else
-                        {
-                            playersMutex->ball_X = SCREEN_SIZE_X/2 - BALL_SIZE/2;
-                            playersMutex->ball_Y = SCREEN_SIZE_Y/2 - BALL_SIZE/2;
+                        } else {
+                            playersMutex->ball_X = SCREEN_SIZE_X / 2 - BALL_SIZE / 2;
+                            playersMutex->ball_Y = SCREEN_SIZE_Y / 2 - BALL_SIZE / 2;
                             playersMutex->ball_X_speed = 1;
                             playersMutex->ball_Y_speed = 1;
                             playersMutex->ball_X_direction = 0;
                             playersMutex->player2_score++;
                             notification_message(notification, &sequence_set_only_red_255);
                         }
-                    }
-                    else
-                    {
-                        if (playersMutex->ball_X >= 1 + playersMutex->ball_X_speed)
-                        {
+                    } else {
+                        if(playersMutex->ball_X >= 1 + playersMutex->ball_X_speed) {
                             playersMutex->ball_X -= playersMutex->ball_X_speed;
-                        }
-                        else
-                        {
-                            playersMutex->ball_X = SCREEN_SIZE_X/2 - BALL_SIZE/2;
-                            playersMutex->ball_Y = SCREEN_SIZE_Y/2 - BALL_SIZE/2;
+                        } else {
+                            playersMutex->ball_X = SCREEN_SIZE_X / 2 - BALL_SIZE / 2;
+                            playersMutex->ball_Y = SCREEN_SIZE_Y / 2 - BALL_SIZE / 2;
                             playersMutex->ball_X_speed = 1;
                             playersMutex->ball_Y_speed = 1;
                             playersMutex->ball_X_direction = 1;
@@ -251,28 +252,20 @@ int32_t flipper_pong_app()
                     }
                 }
 
-                if (playersMutex->ball_Y_direction == 1)
-                {
-                    if (playersMutex->ball_Y <= SCREEN_SIZE_Y - BALL_SIZE - 1 - playersMutex->ball_Y_speed)
-                    {
+                if(playersMutex->ball_Y_direction == 1) {
+                    if(playersMutex->ball_Y <=
+                       SCREEN_SIZE_Y - BALL_SIZE - 1 - playersMutex->ball_Y_speed) {
                         playersMutex->ball_Y += playersMutex->ball_Y_speed;
-                    }
-                    else
-                    {
+                    } else {
                         playersMutex->ball_Y = SCREEN_SIZE_Y - BALL_SIZE - 1;
                         playersMutex->ball_X_speed = changeSpeed();
                         playersMutex->ball_Y_speed = changeSpeed();
                         playersMutex->ball_Y_direction = 0;
                     }
-                }
-                else
-                {
-                    if (playersMutex->ball_Y >= 1 + playersMutex->ball_Y_speed)
-                    {
+                } else {
+                    if(playersMutex->ball_Y >= 1 + playersMutex->ball_Y_speed) {
                         playersMutex->ball_Y -= playersMutex->ball_Y_speed;
-                    }
-                    else
-                    {
+                    } else {
                         playersMutex->ball_Y = 1;
                         playersMutex->ball_X_speed = changeSpeed();
                         playersMutex->ball_Y_speed = changeSpeed();