notes refactored

sound-driver/Makefile

@@ -11,7 +11,7 @@ CFLAGS+= -g3 -ggdb -gdwarf-2
 
 LDFLAGS=-mmcu=$(MCU) -L $(TOOLCHAIN_PREFIX)/include
 
-$(ARTIFACT).elf:	main.o scheduler.o
+$(ARTIFACT).elf:	main.o scheduler.o notes.o
 	$(CC) -o $@ $(LDFLAGS) $^
 	$(OBJDUMP) -D $(ARTIFACT).elf > $(ARTIFACT).txt
 

sound-driver/main.c

@@ -96,12 +96,12 @@ void playSomething(void *handle) {
       // no break;
     
     case 1:
-      writeFrequency(0, C5);
+      writeFrequency(0, frequencyCodes[e_O_5][e_C]);
       state = 2;
       break;
 
     case 2:
-      writeFrequency(0, E5);
+      writeFrequency(0, frequencyCodes[e_O_5][e_E]);
       state = 1;
       break;
   }

sound-driver/notes.h

@@ -1,114 +1,45 @@
 #ifndef _NOTES_H_
 #define _NOTES_H_
 
-// frequency codes according to AY3-8910 datasheet
 typedef enum {
-  C1  = 06535,
+  e_O_1 = 0,
-  C_1 = 06234,
+  e_O_2,
-  D1  = 05747,
+  e_O_3,
-  D_1 = 05474,
+  e_O_4,
-  E1  = 05233,
+  e_O_5,
-  F1  = 05002,
+  e_O_6,
-  F_1 = 04563,
+  e_O_7,
-  G1  = 04353,
+  e_O_8
-  G_1 = 04153,
+} t_octaves;
-  A1  = 03762,
+
-  A_1 = 03600,
+typedef enum {
-  B1  = 03424,
+  e_C = 0,
-  C2  = 03256,
+  e_Cis,
-  C_2 = 03116,
+  e_D,
-  D2  = 02764,
+  e_Dis,
-  D_2 = 02636,
+  e_E,
-  E2  = 02515,
+  e_F,
-  F2  = 02401,
+  e_Fis,
-  F_2 = 02271,
+  e_G,
-  G2  = 02165,
+  e_Gis,
-  G_2 = 02065,
+  e_A,
-  A2  = 01771,
+  e_Ais,
-  A_2 = 01700,
+  e_H
-  B2  = 01612,
+} t_notes;
-  C3  = 01527,
+
-  C_3 = 01447,
+    
-  D3  = 01372,
-  D_3 = 01317,
-  E3  = 01247,
-  F3  = 01201,
-  F_3 = 01135,
-  G3  = 01073,
-  G_3 = 01033,
-  A3  = 00774,
-  A_3 = 00740,
-  B3  = 00705,
-  C4  = 00654,
-  C_4 = 00624,
-  D4  = 00575,
-  D_4 = 00550,
-  E4  = 00523,
-  F4  = 00500,
-  F_4 = 00456,
-  G4  = 00435,
-  G_4 = 00415,
-  A4  = 00376,
-  A_4 = 00360,
-  B_4 = 00342,
-  C5  = 00326,
-  C_5 = 00312,
-  D5  = 00276,
-  D_5 = 00264,
-  E5  = 00252,
-  F5  = 00240,
-  F_5 = 00227,
-  G5  = 00217,
-  G_5 = 00207,
-  A5  = 00177,
-  A_5 = 00170,
-  B5  = 00161,
-  C6  = 00153,
-  C_6 = 00145,
-  D6  = 00137,
-  D_6 = 00132,
-  E6  = 00125,
-  F6  = 00120,
-  F_6 = 00114,
-  G6  = 00107,
-  G_6 = 00103,
-  A6  = 00100,
-  A_6 = 00074,
-  B6  = 00071,
-  C7  = 00065,
-  C_7 = 00062,
-  D7  = 00060,
-  D_7 = 00055,
-  E7  = 00052,
-  F7  = 00050,
-  F_7 = 00046,
-  G7  = 00044,
-  G_7 = 00042,
-  A7  = 00040,
-  A_7 = 00036,
-  B7  = 00034,
-  C8  = 00033,
-  C_8 = 00031,
-  D8  = 00030,
-  D_8 = 00026,
-  E8  = 00025,
-  F8  = 00024,
-  F_8 = 00023,
-  G8  = 00022,
-  G_8 = 00021,
-  A8  = 00020,
-  A_8 = 00017,
-  B8  = 00016
-} t_note;
 
 // length of notes in multiples of 25ms
 typedef enum {
-  L_1 = 80,
+  e_L_1 = 80,
-  L_1_2 = 40,
+  e_L_1_2 = 40,
-  L_1_4 = 20,
+  e_L_1_4 = 20,
-  L_1_8 = 10,
+  e_L_1_8 = 10,
-  L_1_16 = 5
+  e_L_1_16 = 5
 } t_noteLength;
 
 
+
+extern const uint16_t frequencyCodes[8][12];
+
 #endif // _NOTES_H_