From 826c9d0faf5dd3051350515ffbaf4eb0d9705d3a Mon Sep 17 00:00:00 2001 From: "Victor R. Cardoso" Date: Mon, 18 Jul 2022 14:10:06 -0500 Subject: [PATCH] Tone32.h removed, using pitches.h file --- pitches.h | 93 +++++++++++++++++++++++++++++++++++++++++++++ ttgoGameConsole.ino | 50 ++++++++++++------------ 2 files changed, 118 insertions(+), 25 deletions(-) create mode 100644 pitches.h diff --git a/pitches.h b/pitches.h new file mode 100644 index 0000000..9f16b4d --- /dev/null +++ b/pitches.h @@ -0,0 +1,93 @@ +/************************************************* + * Public Constants + *************************************************/ + +#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 diff --git a/ttgoGameConsole.ino b/ttgoGameConsole.ino index bcad365..0c8ef45 100644 --- a/ttgoGameConsole.ino +++ b/ttgoGameConsole.ino @@ -18,7 +18,7 @@ -#include +#include "pitches.h" #define BUZZER_PIN 27 #define BUZZER_CHANNEL 0 @@ -355,8 +355,8 @@ if(digitalRead(2)==0 and x>0) //Move right { tft.pushImage(buletX[j], buletY[j], 12, 12, ex2); if(sound==1){ - tone(BUZZER_PIN, NOTE_C5, 12, BUZZER_CHANNEL); - noTone(BUZZER_PIN, BUZZER_CHANNEL);} else{delay(12);} + tone(BUZZER_PIN, NOTE_C5, 12); + noTone(BUZZER_PIN);} else{delay(12);} tft.fillRect(buletX[j], buletY[j],12,12,TFT_BLACK); buletX[j]=-50; brojac=brojac+1; @@ -369,12 +369,12 @@ if(digitalRead(2)==0 and x>0) //Move right if(eHealth<=0){ tft.pushImage(ex, ey, 55, 55, buum); - tone(BUZZER_PIN, NOTE_E4, 100, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_D4, 80, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_G5, 100, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_C3, 80, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_F4, 280, BUZZER_CHANNEL); - noTone(BUZZER_PIN, BUZZER_CHANNEL); + tone(BUZZER_PIN, NOTE_E4, 100); + tone(BUZZER_PIN, NOTE_D4, 80); + tone(BUZZER_PIN, NOTE_G5, 100); + tone(BUZZER_PIN, NOTE_C3, 80); + tone(BUZZER_PIN, NOTE_F4, 280); + noTone(BUZZER_PIN); delay(700); newLevel();} digitalWrite(25,1); @@ -393,8 +393,8 @@ if(digitalRead(2)==0 and x>0) //Move right { tft.pushImage(rocketX[j], rocketY[j], 24, 24, explosion); if(sound==1){ - tone(BUZZER_PIN, NOTE_C3, 40, BUZZER_CHANNEL); - noTone(BUZZER_PIN, BUZZER_CHANNEL); + tone(BUZZER_PIN, NOTE_C3, 40); + noTone(BUZZER_PIN); }else {delay(40);} tft.fillRect(rocketX[j], rocketY[j],24,24,TFT_BLACK); //delay(30); @@ -410,12 +410,12 @@ if(digitalRead(2)==0 and x>0) //Move right if(eHealth<=0){ tft.pushImage(ex, ey, 55, 55, buum); - tone(BUZZER_PIN, NOTE_E4, 100, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_D4, 80, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_G5, 100, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_C3, 80, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_F4, 280, BUZZER_CHANNEL); - noTone(BUZZER_PIN, BUZZER_CHANNEL); + tone(BUZZER_PIN, NOTE_E4, 100); + tone(BUZZER_PIN, NOTE_D4, 80); + tone(BUZZER_PIN, NOTE_G5, 100); + tone(BUZZER_PIN, NOTE_C3, 80); + tone(BUZZER_PIN, NOTE_F4, 280); + noTone(BUZZER_PIN); delay(700); newLevel();} digitalWrite(25,0); @@ -437,12 +437,12 @@ if(digitalRead(2)==0 and x>0) //Move right lives--; if(lives==0){ tft.pushImage(x, y, 55, 55, buum); - tone(BUZZER_PIN, NOTE_G4, 100, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_B4, 80, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_C5, 100, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_A4, 80, BUZZER_CHANNEL); - tone(BUZZER_PIN, NOTE_F4, 280, BUZZER_CHANNEL); - noTone(BUZZER_PIN, BUZZER_CHANNEL); + tone(BUZZER_PIN, NOTE_G4, 100); + tone(BUZZER_PIN, NOTE_B4, 80); + tone(BUZZER_PIN, NOTE_C5, 100); + tone(BUZZER_PIN, NOTE_A4, 80); + tone(BUZZER_PIN, NOTE_F4, 280); + noTone(BUZZER_PIN); delay(500); tft.fillScreen(TFT_BLACK); fase=2;} @@ -451,8 +451,8 @@ if(digitalRead(2)==0 and x>0) //Move right digitalWrite(33,1); blinkTime=1; if(sound==1){ - tone(BUZZER_PIN, NOTE_C6, 4, BUZZER_CHANNEL); - noTone(BUZZER_PIN, BUZZER_CHANNEL);}else {delay(4);} + tone(BUZZER_PIN, NOTE_C6, 4); + noTone(BUZZER_PIN);}else {delay(4);} }