From 20db20b7045f867bba91c4bde0a86d7dd0b37477 Mon Sep 17 00:00:00 2001 From: Dmitry Maylarov Date: Thu, 12 Aug 2021 12:32:22 +0300 Subject: [PATCH] groom and move notes to .h --- Core/Inc/main.h | 11 +++-- Core/Inc/music.h | 103 ++++++++++++++++++++++++++++++++++++++++++++++- Core/Src/game.c | 6 +-- Core/Src/main.c | 8 ++-- Core/Src/music.c | 101 ---------------------------------------------- 5 files changed, 117 insertions(+), 112 deletions(-) diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 41daf63..645a453 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -77,20 +77,23 @@ void vTimerCallback(TimerHandle_t xTimer); /* USER CODE END EFP */ /* Private defines -----------------------------------------------------------*/ +#define LED1_Pin GPIO_PIN_3 +#define LED1_GPIO_Port GPIOA #define LED2_Pin GPIO_PIN_0 #define LED2_GPIO_Port GPIOA + #define SPK1_Pin GPIO_PIN_1 #define SPK1_GPIO_Port GPIOA -#define BigButton_Pin GPIO_PIN_2 -#define BigButton_GPIO_Port GPIOA -#define LED1_Pin GPIO_PIN_3 -#define LED1_GPIO_Port GPIOA #define SPK2_Pin GPIO_PIN_7 #define SPK2_GPIO_Port GPIOA + #define MinusButton_Pin GPIO_PIN_12 #define MinusButton_GPIO_Port GPIOB #define PlusButton_Pin GPIO_PIN_15 #define PlusButton_GPIO_Port GPIOB +#define BigButton_Pin GPIO_PIN_2 +#define BigButton_GPIO_Port GPIOA + /* USER CODE BEGIN Private defines */ /* USER CODE END Private defines */ diff --git a/Core/Inc/music.h b/Core/Inc/music.h index 64fe50f..f79c7cf 100644 --- a/Core/Inc/music.h +++ b/Core/Inc/music.h @@ -6,6 +6,107 @@ #define MAX_TONEGENS 6 #define MAX_CHANNELS 2 +#define NOTE_C0 16 +#define NOTE_CS0 17 +#define NOTE_D0 18 +#define NOTE_DS0 19 +#define NOTE_E0 21 +#define NOTE_F0 22 +#define NOTE_FS0 23 +#define NOTE_G0 24 +#define NOTE_GS0 26 +#define NOTE_A0 28 +#define NOTE_AS0 29 +#define NOTE_B0 31 +#define NOTE_C1 33 +#define NOTE_CS1 35 +#define NOTE_D1 37 +#define NOTE_DS1 39 +#define NOTE_E1 41 +#define NOTE_F1 44 +#define NOTE_FS1 46 +#define NOTE_G1 49 +#define NOTE_GS1 52 +#define NOTE_A1 55 +#define NOTE_AS1 58 +#define NOTE_B1 62 +#define NOTE_C2 65 +#define NOTE_CS2 69 +#define NOTE_D2 73 +#define NOTE_DS2 78 +#define NOTE_E2 82 +#define NOTE_F2 87 +#define NOTE_FS2 93 +#define NOTE_G2 98 +#define NOTE_GS2 104 +#define NOTE_A2 110 +#define NOTE_AS2 117 +#define NOTE_B2 123 +#define NOTE_C3 131 +#define NOTE_CS3 139 +#define NOTE_D3 147 +#define NOTE_DS3 156 +#define NOTE_E3 165 +#define NOTE_F3 175 +#define NOTE_FS3 185 +#define NOTE_G3 196 +#define NOTE_GS3 208 +#define NOTE_A3 220 +#define NOTE_AS3 233 +#define NOTE_B3 247 +#define NOTE_C4 262 +#define NOTE_CS4 277 +#define NOTE_D4 294 +#define NOTE_DS4 311 +#define NOTE_E4 330 +#define NOTE_F4 349 +#define NOTE_FS4 370 +#define NOTE_G4 392 +#define NOTE_GS4 415 +#define NOTE_A4 440 +#define NOTE_AS4 466 +#define NOTE_B4 494 +#define NOTE_C5 523 +#define NOTE_CS5 554 +#define NOTE_D5 587 +#define NOTE_DS5 622 +#define NOTE_E5 659 +#define NOTE_F5 698 +#define NOTE_FS5 740 +#define NOTE_G5 784 +#define NOTE_GS5 831 +#define NOTE_A5 880 +#define NOTE_AS5 932 +#define NOTE_B5 988 +#define NOTE_C6 1047 +#define NOTE_CS6 1109 +#define NOTE_D6 1175 +#define NOTE_DS6 1245 +#define NOTE_E6 1319 +#define NOTE_F6 1397 +#define NOTE_FS6 1480 +#define NOTE_G6 1568 +#define NOTE_GS6 1661 +#define NOTE_A6 1760 +#define NOTE_AS6 1865 +#define NOTE_B6 1976 +#define NOTE_C7 2093 +#define NOTE_CS7 2217 +#define NOTE_D7 2349 +#define NOTE_DS7 2489 +#define NOTE_E7 2637 +#define NOTE_F7 2794 +#define NOTE_FS7 2960 +#define NOTE_G7 3136 +#define NOTE_GS7 3322 +#define NOTE_A7 3520 +#define NOTE_AS7 3729 +#define NOTE_B7 3951 +#define NOTE_C8 4186 +#define NOTE_CS8 4435 +#define NOTE_D8 4699 +#define NOTE_DS8 4978 + typedef enum returnCodes { OK, STOPPED, @@ -21,4 +122,4 @@ typedef struct { RET_CODE MusicPlay(Track *track); void MusicStop(void); -#endif \ No newline at end of file +#endif diff --git a/Core/Src/game.c b/Core/Src/game.c index fc0ed85..40c1645 100644 --- a/Core/Src/game.c +++ b/Core/Src/game.c @@ -18,7 +18,7 @@ void DecrementTurnTime() { game.turnTime -= TIMER_STEP; else game.turnTime = TIMER_MAX; - game.timerValue = game.turnTime; + ResetTurnTimer(); } void IncrementTurnTime() { @@ -26,7 +26,7 @@ void IncrementTurnTime() { game.turnTime += TIMER_STEP; else game.turnTime = TIMER_STEP; - game.timerValue = game.turnTime; + ResetTurnTimer(); } void AddPlayer() { @@ -54,4 +54,4 @@ void NextPlayer() { game.currentPlayer = ((game.currentPlayer + 1) % game.activePlayers); game.currentPlayer++; ResetTurnTimer(); -} \ No newline at end of file +} diff --git a/Core/Src/main.c b/Core/Src/main.c index d66d3df..ca7de5e 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -518,7 +518,7 @@ void vTaskConfig(void *parameter) { if (plusButton->pressed) game.countScores = !game.countScores; if (minusButton->pressed) - // show round number or change the way it counts + // TODO: show round number or change the way it counts game.countScores = !game.countScores; if (bigButton->pressed) { break; @@ -540,9 +540,9 @@ void vTaskTimerSetup(void *parameter) { LCD_SendString(&hlcd, lcdBuffer); xSemaphoreGive( xLCD ); } + ResetTurnTimer(); while (1) { - ResetTurnTimer(); xTaskNotifyGive(xLCDUpdaterHandle); vTaskDelay(1); if (xSemaphoreTake(xButtonPressed, portMAX_DELAY) == pdPASS ) @@ -700,7 +700,9 @@ void vTaskOvertime(void *parameter) { HAL_GPIO_WritePin(LED2_GPIO_Port, LED1_Pin, GPIO_PIN_RESET); vTaskDelay(1000); } */ - while (1) {}; + while (1) { + vTaskDelay(1000); + }; } void vTimerCallback(TimerHandle_t xTimer) { diff --git a/Core/Src/music.c b/Core/Src/music.c index 67785a4..c32730d 100644 --- a/Core/Src/music.c +++ b/Core/Src/music.c @@ -3,107 +3,6 @@ #include "task.h" #include -#define NOTE_C0 16 -#define NOTE_CS0 17 -#define NOTE_D0 18 -#define NOTE_DS0 19 -#define NOTE_E0 21 -#define NOTE_F0 22 -#define NOTE_FS0 23 -#define NOTE_G0 24 -#define NOTE_GS0 26 -#define NOTE_A0 28 -#define NOTE_AS0 29 -#define NOTE_B0 31 -#define NOTE_C1 33 -#define NOTE_CS1 35 -#define NOTE_D1 37 -#define NOTE_DS1 39 -#define NOTE_E1 41 -#define NOTE_F1 44 -#define NOTE_FS1 46 -#define NOTE_G1 49 -#define NOTE_GS1 52 -#define NOTE_A1 55 -#define NOTE_AS1 58 -#define NOTE_B1 62 -#define NOTE_C2 65 -#define NOTE_CS2 69 -#define NOTE_D2 73 -#define NOTE_DS2 78 -#define NOTE_E2 82 -#define NOTE_F2 87 -#define NOTE_FS2 93 -#define NOTE_G2 98 -#define NOTE_GS2 104 -#define NOTE_A2 110 -#define NOTE_AS2 117 -#define NOTE_B2 123 -#define NOTE_C3 131 -#define NOTE_CS3 139 -#define NOTE_D3 147 -#define NOTE_DS3 156 -#define NOTE_E3 165 -#define NOTE_F3 175 -#define NOTE_FS3 185 -#define NOTE_G3 196 -#define NOTE_GS3 208 -#define NOTE_A3 220 -#define NOTE_AS3 233 -#define NOTE_B3 247 -#define NOTE_C4 262 -#define NOTE_CS4 277 -#define NOTE_D4 294 -#define NOTE_DS4 311 -#define NOTE_E4 330 -#define NOTE_F4 349 -#define NOTE_FS4 370 -#define NOTE_G4 392 -#define NOTE_GS4 415 -#define NOTE_A4 440 -#define NOTE_AS4 466 -#define NOTE_B4 494 -#define NOTE_C5 523 -#define NOTE_CS5 554 -#define NOTE_D5 587 -#define NOTE_DS5 622 -#define NOTE_E5 659 -#define NOTE_F5 698 -#define NOTE_FS5 740 -#define NOTE_G5 784 -#define NOTE_GS5 831 -#define NOTE_A5 880 -#define NOTE_AS5 932 -#define NOTE_B5 988 -#define NOTE_C6 1047 -#define NOTE_CS6 1109 -#define NOTE_D6 1175 -#define NOTE_DS6 1245 -#define NOTE_E6 1319 -#define NOTE_F6 1397 -#define NOTE_FS6 1480 -#define NOTE_G6 1568 -#define NOTE_GS6 1661 -#define NOTE_A6 1760 -#define NOTE_AS6 1865 -#define NOTE_B6 1976 -#define NOTE_C7 2093 -#define NOTE_CS7 2217 -#define NOTE_D7 2349 -#define NOTE_DS7 2489 -#define NOTE_E7 2637 -#define NOTE_F7 2794 -#define NOTE_FS7 2960 -#define NOTE_G7 3136 -#define NOTE_GS7 3322 -#define NOTE_A7 3520 -#define NOTE_AS7 3729 -#define NOTE_B7 3951 -#define NOTE_C8 4186 -#define NOTE_CS8 4435 -#define NOTE_D8 4699 -#define NOTE_DS8 4978 - bool playing; uint16_t pitches[110];