76498 not working as expected

start with other sound chip
frequency table for 76489AN
2024-04-09 18:14:31 +02:00 · 2024-04-09 10:32:19 +02:00 · 2024-04-07 13:37:42 +02:00 · 2024-03-29 18:08:37 +01:00 · 2024-03-29 15:52:12 +01:00
11 changed files with 419 additions and 119 deletions
--- a/sound-driver/Makefile
+++ b/sound-driver/Makefile
@@ -7,11 +7,11 @@ MCU=msp430g2553
 CFLAGS=-Wall -mmcu=$(MCU) -std=gnu99 -I $(TOOLCHAIN_PREFIX)/include -O1 -g0
 # for debugging
-#CFLAGS+= -g3 -ggdb -gdwarf-2
+CFLAGS+= -g3 -ggdb -gdwarf-2
 LDFLAGS=-mmcu=$(MCU) -L $(TOOLCHAIN_PREFIX)/include
-$(ARTIFACT).elf:	main.o scheduler.o spi.o psg.o sequencer.o melody.o
+$(ARTIFACT).elf:	main.o scheduler.o spi.o sequencer.o melody.o ay_3_8913.o
 	$(CC) -o $@ $(LDFLAGS) $^
 	$(OBJDUMP) -D $(ARTIFACT).elf > $(ARTIFACT).txt
--- a/sound-driver/ay_3_8913.c
+++ b/sound-driver/ay_3_8913.c
@@ -24,6 +24,8 @@ const uint16_t frequencyCodes[8][12] = {
 #define BUS_CTRL_REG P1OUT
 #define BC1 BIT3
 #define BDIR BIT1
 #define _CS0 BIT2
 #define _CS1 BIT0
 #define R0 0
 #define CHANNEL_A_TONE_PERIOD_FINE_REG R0
@@ -66,7 +68,20 @@ inline static void BUS_OP_DWS() {
  BUS_CTRL_REG |= BDIR;
  BUS_CTRL_REG &= ~BC1;
 }
 inline static void BUS_OP_CS0_ENABLE() {
  BUS_CTRL_REG &= ~_CS0;
 }
 inline static void BUS_OP_CS0_DISABLE() {
  BUS_CTRL_REG |= _CS0;
 }
 inline static void BUS_OP_CS1_ENABLE() {
  BUS_CTRL_REG &= ~_CS1;
 }
 inline static void BUS_OP_CS1_DISABLE() {
  BUS_CTRL_REG |= _CS1;
 }
 #if 0
 static void delay() {
 asm volatile (
    "push r12\n"
@@ -77,16 +92,19 @@ asm volatile (
    "pop r12\n"
 );
 }
 #endif
-uint8_t psgReadShadow(uint8_t address) {
+static uint8_t psgReadShadow(uint8_t address) {
  return psgShadowRegisters[address];
 }
-void psgWrite(uint8_t address, uint8_t data) {
+static void psgWrite(uint8_t address, uint8_t data) {
  psgShadowRegisters[address] = data;
  // according to "State Timing" (p. 15) of datasheet
  BUS_OP_CS1_ENABLE();
  // put bus into inactive state
  BUS_OP_NACT();
@@ -107,18 +125,21 @@ void psgWrite(uint8_t address, uint8_t data) {
  // set inactive again
  BUS_OP_NACT();
  BUS_OP_CS1_DISABLE();
 }
-void psgWriteFrequency(uint8_t channel, uint16_t frequencyCode) {
+static void psgWriteFrequency(uint8_t channel, uint16_t frequencyCode) {
  psgWrite(CHANNEL_A_TONE_PERIOD_FINE_REG + (channel * 2), (frequencyCode & 0x00ff));
  psgWrite(CHANNEL_A_TONE_PERIOD_COARSE_REG + (channel * 2), ((frequencyCode >> 8) & 0x000f));
 }
-void psgPlayTone(uint8_t channel, t_octave octave, t_note note) {
+void psgPlayTone(uint8_t channel, uint8_t volume, t_octave octave, t_note note) {
  if (note == e_Pause) {
    psgWrite(_ENABLE_REG, psgReadShadow(_ENABLE_REG) | (1 << channel));
  } else {
    psgWrite(_ENABLE_REG, psgReadShadow(_ENABLE_REG) & ~(1 << channel));
    psgAmplitude(channel, volume);
    psgWriteFrequency(channel, frequencyCodes[octave][note]);
  }
 }
@@ -135,27 +156,33 @@ void psgInit() {
  // sound chip reset
  // BIT2: /RST
-  P1DIR |= BIT2;
+  // P1DIR |= BIT2;
 #if 0
  // put sound chip into reset state
  P1OUT &= ~BIT2;
  delay();
  delay();
  delay();
 #endif
  // bus control lines
  // BIT3: BC1
  // BIT1: BDIR
-  P1DIR |= BIT1 | BIT3;
+  // BIT0: _CS1
  // BIT2: _CS0
  P1DIR |= BIT0 | BIT1 | BIT2 | BIT3 ;
  // put bus into inactive state
  BUS_CTRL_REG &= ~(BDIR | BC1);
 #if 0
  // release sound chip from reset state
  P1OUT |= BIT2;
  delay();
  delay();
  delay();
 #endif
  // disable everything
  psgWrite(_ENABLE_REG, 0xff);
--- a/sound-driver/docs/Frequency-Codes-76489AN.xlsx
+++ b/sound-driver/docs/Frequency-Codes-76489AN.xlsx
--- a/sound-driver/main.c
+++ b/sound-driver/main.c
@@ -22,7 +22,7 @@ int main() {
  schInit();
-  spiInit();
+//  spiInit();
  psgInit();
  sequencerInit();
--- a/sound-driver/melody.c
+++ b/sound-driver/melody.c
@@ -73,13 +73,54 @@ const t_tone notes[] = {
 };
 */
 const t_tone tonleiter[] = {
  { .octave = e_O_6,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_6,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_6,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_6,    .note = e_F,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_6,    .note = e_G,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_6,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_6,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
 };
 const t_tone tonleiter2[] = {
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_F,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_G,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
 };
 const t_tone tonleiter3[] = {
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_F,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_G,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
 };
 /*
 * three voices theme from https://www.gamemusicthemes.com/sheetmusic/gameboy/tetris/themea/Tetris_-_Theme_A_by_Gori_Fater.pdf
 */
 const t_tone voice1[] = {
  // -------
-  // 1. beat
+  // 1. bar
  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -91,7 +132,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 2. beat
+  // 2. bar
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -101,7 +142,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 3. beat
+  // 3. bar
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_4,     .legato = true,  .staccato = false }, // diese und die naechste zusammen: ein punktiertes Viertel
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -110,14 +151,14 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 4. beat
+  // 4. bar
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 5. beat
+  // 5. bar
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_F,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -127,7 +168,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 6. beat
+  // 6. bar
  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_4,     .legato = true,  .staccato = false }, // punktiert
  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -137,7 +178,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 7. beat
+  // 7. bar
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -146,7 +187,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 8. beat
+  // 8. bar
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
@@ -155,7 +196,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  // -------
-  // 1. beat, repeat
+  // 1. bar, repeat
  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -167,7 +208,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 2. beat, repeat
+  // 2. bar, repeat
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -177,7 +218,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 3. beat, repeat
+  // 3. bar, repeat
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_4,     .legato = true,  .staccato = false }, // diese und die naechste zusammen: ein punktiertes Viertel
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -186,14 +227,14 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 4. beat, repeat
+  // 4. bar, repeat
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 5. beat, repeat
+  // 5. bar, repeat
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_F,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -203,7 +244,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 6. beat, repeat
+  // 6. bar, repeat
  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_4,     .legato = true,  .staccato = false }, // punktiert
  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -213,7 +254,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 7. beat, repeat
+  // 7. bar, repeat
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -222,7 +263,7 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 8. beat, repeat
+  // 8. bar, repeat
  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
@@ -231,99 +272,99 @@ const t_tone voice1[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  // -------
-  // 9. beat
+  // 9. bar
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 10. beat
+  // 10. bar
  { .octave = e_O_4,    .note = e_D,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 11. beat
+  // 11. bar
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 12. beat
+  // 12. bar
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 13. beat
+  // 13. bar
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 14. beat
+  // 14. bar
  { .octave = e_O_4,    .note = e_D,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 15. beat
+  // 15. bar
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 16. beat
+  // 16. bar
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1,       .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  // -------
-  // 9. beat, repeat
+  // 9. bar, repeat
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 10. beat, repeat
+  // 10. bar, repeat
  { .octave = e_O_4,    .note = e_D,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 11. beat, repeat
+  // 11. bar, repeat
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 12. beat, repeat
+  // 12. bar, repeat
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 13. beat, repeat
+  // 13. bar, repeat
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 14. beat, repeat
+  // 14. bar, repeat
  { .octave = e_O_4,    .note = e_D,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 15. beat, repeat
+  // 15. bar, repeat
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 16. beat, repeat
+  // 16. bar, repeat
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1,       .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
@@ -333,7 +374,7 @@ const t_tone voice1[] = {
 const t_tone voice2[] = {
  // -------
-  // 1. beat
+  // 1. bar
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -345,7 +386,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 2. beat
+  // 2. bar
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -355,7 +396,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 3. beat
+  // 3. bar
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -365,14 +406,14 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 4. beat
+  // 4. bar
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 5. beat
+  // 5. bar
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_F,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -384,7 +425,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 6. beat
+  // 6. bar
  { .octave = e_O_4,    .note = e_G,     .length = e_L_1_4,     .legato = true,  .staccato = false }, // punktiert
  { .octave = e_O_4,    .note = e_G,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -396,7 +437,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 7. beat
+  // 7. bar
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -408,7 +449,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 8. beat
+  // 8. bar
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
@@ -418,7 +459,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  // -------
-  // 1. beat, repeat
+  // 1. bar, repeat
  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -430,7 +471,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 2. beat, repeat
+  // 2. bar, repeat
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -440,7 +481,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 3. beat, repeat
+  // 3. bar, repeat
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -450,14 +491,14 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 4. beat, repeat
+  // 4. bar, repeat
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 5. beat, repeat
+  // 5. bar, repeat
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_F,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -469,7 +510,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 6. beat, repeat
+  // 6. bar, repeat
  { .octave = e_O_4,    .note = e_G,     .length = e_L_1_4,     .legato = true,  .staccato = false }, // punktiert
  { .octave = e_O_4,    .note = e_G,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -481,7 +522,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 7. beat, repeat
+  // 7. bar, repeat
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -493,7 +534,7 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 8. beat, repeat
+  // 8. bar, repeat
  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
@@ -503,99 +544,99 @@ const t_tone voice2[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  // -------
-  // 9. beat
+  // 9. bar
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 10. beat
+  // 10. bar
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 11. beat
+  // 11. bar
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 12. beat
+  // 12. bar
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 13. beat
+  // 13. bar
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 14. beat
+  // 14. bar
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 15. beat
+  // 15. bar
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 16. beat
+  // 16. bar
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1,       .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  // -------
-  // 9. beat, repeat
+  // 9. bar, repeat
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 10. beat, repeat
+  // 10. bar, repeat
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 11. beat, repeat
+  // 11. bar, repeat
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 12. beat, repeat
+  // 12. bar, repeat
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 13. beat, repeat
+  // 13. bar, repeat
  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 14. beat, repeat
+  // 14. bar, repeat
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 15. beat, repeat
+  // 15. bar, repeat
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_2,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 16. beat, repeat
+  // 16. bar, repeat
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1,       .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
@@ -605,7 +646,7 @@ const t_tone voice2[] = {
 const t_tone voice3[] = {
  // -------
-  // 1. beat
+  // 1. bar
  { .octave = e_O_2,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -617,7 +658,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 2. beat
+  // 2. bar
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -629,7 +670,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 3. beat
+  // 3. bar
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -641,7 +682,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 4. beat
+  // 4. bar
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -653,7 +694,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 5. beat
+  // 5. bar
  { .octave = e_O_3,    .note = e_D,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_D,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -665,7 +706,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 6. beat
+  // 6. bar
  { .octave = e_O_2,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -677,7 +718,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 7. beat
+  // 7. bar
  { .octave = e_O_2,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -689,7 +730,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 8. beat
+  // 8. bar
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -700,7 +741,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  // -------
-  // 1. beat,repeat
+  // 1. bar,repeat
  { .octave = e_O_2,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -712,7 +753,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 2. beat,repeat
+  // 2. bar,repeat
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -724,7 +765,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 3. beat,repeat
+  // 3. bar,repeat
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -736,7 +777,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 4. beat,repeat
+  // 4. bar,repeat
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -748,7 +789,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 5. beat,repeat
+  // 5. bar,repeat
  { .octave = e_O_3,    .note = e_D,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_D,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -760,7 +801,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 6. beat,repeat
+  // 6. bar,repeat
  { .octave = e_O_2,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_C,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -772,7 +813,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 7. beat,repeat
+  // 7. bar,repeat
  { .octave = e_O_2,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -784,7 +825,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 8. beat,repeat
+  // 8. bar,repeat
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -795,7 +836,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  // -------
-  // 9. beat
+  // 9. bar
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -807,7 +848,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 10. beat
+  // 10. bar
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -819,7 +860,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 11. beat
+  // 11. bar
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -831,7 +872,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 12. beat
+  // 12. bar
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -843,7 +884,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 13. beat
+  // 13. bar
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -855,7 +896,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 14. beat
+  // 14. bar
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -867,7 +908,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 15. beat
+  // 15. bar
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -879,7 +920,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 16. beat
+  // 16. bar
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -892,7 +933,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
  // -------
-  // 9. beat, repeat
+  // 9. bar, repeat
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -904,7 +945,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 10. beat, repeat
+  // 10. bar, repeat
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -916,7 +957,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 11. beat, repeat
+  // 11. bar, repeat
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -928,7 +969,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 12. beat, repeat
+  // 12. bar, repeat
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -940,7 +981,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 13. beat, repeat
+  // 13. bar, repeat
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -952,7 +993,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 14. beat, repeat
+  // 14. bar, repeat
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -964,7 +1005,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 15. beat, repeat
+  // 15. bar, repeat
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_A,     .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -976,7 +1017,7 @@ const t_tone voice3[] = {
  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
-  // 16. beat, repeat
+  // 16. bar, repeat
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_3,    .note = e_E,     .length = e_L_1_8,     .legato = false, .staccato = false },
  { .octave = e_O_2,    .note = e_Gis,   .length = e_L_1_8,     .legato = false, .staccato = false },
@@ -997,6 +1038,12 @@ t_melodies tetrisTheme = {
  .pace = 160
 };
 t_melodies tonleiterTheme = {
  .melodies = { { .amplitude = 3, .tones = tonleiter }, { .amplitude = 3, .tones = tonleiter2 }, { .amplitude = 3, .tones = tonleiter3 } },
  .numOfMelodies = 3,
  .pace = 160
 };
 void melodyInit() {
  sequencerPlayMelodies(&tetrisTheme);
 }
--- a/sound-driver/psg.h
+++ b/sound-driver/psg.h
@@ -39,14 +39,8 @@ typedef enum {
 void psgInit();
-void psgPlayTone(uint8_t channel, t_octave octave, t_note note);
+void psgPlayTone(uint8_t channel, uint8_t volume, t_octave octave, t_note note);
 void psgAmplitude(uint8_t channel, uint8_t volume);
 // low level
 void psgWriteFrequency(uint8_t channel, uint16_t frequencyCode);
 // very low level
 void psgWrite(uint8_t address, uint8_t data);
 uint8_t psgReadShadow(uint8_t address);
 #endif // _PSG_H_
--- a/sound-driver/scheduler.c
+++ b/sound-driver/scheduler.c
@@ -6,7 +6,6 @@ tTask tasks[MAX_NUM_OF_TASKS];
 void schInit() {
  P1DIR |= BIT0;
  TACCR0 = 19600;
  TACCTL0 = CCIE;
  TACTL = MC_1 | ID_0 | TASSEL_2 | TACLR;
@@ -21,7 +20,6 @@ void schInit() {
 }
 void __attribute__ ((interrupt (TIMER0_A0_VECTOR))) schUpdate() {
  P1OUT ^= BIT0;
  for (uint16_t i = 0; i < MAX_NUM_OF_TASKS; i++) {
    if (tasks[i].exec != NULL) {
      if (tasks[i].delay == 0) {
--- a/sound-driver/sequencer.c
+++ b/sound-driver/sequencer.c
@@ -34,7 +34,6 @@ void sequencerExec(void *handle) {
    switch (melody->state) {
      case e_Init:
        psgAmplitude(channel, melody->amplitude);
        melody->state = e_PlayTone;
        break;
      case e_PlayTone:
@@ -48,7 +47,7 @@ void sequencerExec(void *handle) {
          if (melody->tones[melody->idx].length == e_L_EndMark) {
            melody->idx = 0;
          }
-          psgPlayTone(channel, melody->tones[melody->idx].octave, melody->tones[melody->idx].note);
+          psgPlayTone(channel, melody->amplitude, melody->tones[melody->idx].octave, melody->tones[melody->idx].note);
          melody->lengthCnt = (melody->tones[melody->idx].staccato) ? (lengths[melody->tones[melody->idx].length] / 2) : lengths[melody->tones[melody->idx].length];
          melody->state = e_HoldTone;
        }
@@ -65,7 +64,7 @@ void sequencerExec(void *handle) {
        }
        break;
      case e_StaccatoBreak:
-        psgPlayTone(channel, e_O_Null, e_Pause);
+        psgPlayTone(channel, 0, e_O_Null, e_Pause);
        melody->lengthCnt = lengths[melody->tones[melody->idx].length] / 2;
        melody->state = e_HoldStaccatoBreak;
        break;
@@ -77,7 +76,7 @@ void sequencerExec(void *handle) {
        break;
      case e_SeparateTone:
        if (! (melody->tones[melody->idx].legato)) {
-          psgPlayTone(channel, e_O_Null, e_Pause);
+          psgPlayTone(channel, 0, e_O_Null, e_Pause);
        }
        melody->idx += 1;
        melody->state = e_PlayTone;
--- a/sound-driver/sequencer.h
+++ b/sound-driver/sequencer.h
@@ -38,7 +38,7 @@ typedef enum {
 typedef struct {
  uint16_t idx;
-  uint8_t lengthCnt;
+  uint16_t lengthCnt;
  t_sequencerState state;
  uint8_t amplitude;
  const t_tone *tones;
--- a/sound-driver/sn76489an.c
+++ b/sound-driver/sn76489an.c
@@ -0,0 +1,171 @@
 #include <msp430g2553.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include "psg.h"
 #include "scheduler.h"
 // generated using utils/calc-76489an.py
 const uint16_t frequencyCodes[8][12] = {
  { 3420, 3229, 3047, 2876, 2715, 2562, 2419, 2283, 2155, 2034, 1920, 1812 }, 
  { 1710, 1614, 1524, 1438, 1357, 1281, 1209, 1141, 1077, 1017, 960, 906 }, 
  { 855, 807, 762, 719, 679, 641, 605, 571, 539, 508, 480, 453 }, 
  { 428, 404, 381, 360, 339, 320, 302, 285, 269, 254, 240, 226 }, 
  { 214, 202, 190, 180, 170, 160, 151, 143, 135, 127, 120, 113 }, 
  { 107, 101, 95, 90, 85, 80, 76, 71, 67, 64, 60, 57 }, 
  { 53, 50, 48, 45, 42, 40, 38, 36, 34, 32, 30, 28 }, 
  { 27, 25, 24, 22, 21, 20, 19, 18, 17, 16, 15, 14 }
 };
 #define ADDR_DATA_REG P2OUT
 #define BUS_CTRL_REG P1OUT
 #define BUS_CTRL_IN_REG P1IN
 #define _CS0 BIT0
 #define _CS1 BIT1
 #define _WE BIT2
 #define READY BIT3
 #define CHANNEL_A_PERIOD_ADDR 0
 #define CHANNEL_A_ATTEN_ADDR 1
 #define CHANNEL_B_PERIOD_ADDR 2
 #define CHANNEL_B_ATTEN_ADDR 3
 #define CHANNEL_C_PERIOD_ADDR 4
 #define CHANNEL_C_ATTEN_ADDR 5
 #define IGNORE_OCTET 0xff
 uint8_t psgAmplitudeShadowValue[3];
 static void delay() {
  asm volatile (
      "push r12\n"
      "mov.w #5, r12\n"
      "loop:\n"
      "dec.w r12\n"
      "jnz loop\n"
      "pop r12\n"
  );
 }
 inline static void WRITE_CYCLE(uint8_t chipNo) {
  if (chipNo == 0) {
    BUS_CTRL_REG &= ~_CS0;
  } else {
    BUS_CTRL_REG &= ~_CS1;
  }
  BUS_CTRL_REG &= ~_WE;
  delay();
  while ((BUS_CTRL_IN_REG & READY) == 0);
  BUS_CTRL_REG |= _WE;
  if (chipNo == 0) {
    BUS_CTRL_REG |= _CS0;
  } else {
    BUS_CTRL_REG |= _CS1;
  }
  delay();
 }
 static void psgWrite(uint8_t chipNo, uint8_t value) {
  ADDR_DATA_REG = value;
  WRITE_CYCLE(chipNo);
 }
 static void psgWriteFrequency(uint8_t channel, uint16_t frequencyCode) {
  uint8_t chipNo = channel / 3;
  uint8_t regAddr = (channel % 3) * 2;
  // bit order in frequncyCode and order in octet on data bus are reversed
  // see datacheat cp. 1 and cp. 6
  uint8_t firstOctet = 0x01;
  firstOctet |= ((regAddr & 0x04) > 1);
  firstOctet |= ((regAddr & 0x02) < 1);
  firstOctet |= ((regAddr & 0x01) < 3);
  uint8_t lowerPart = frequencyCode & 0x0f;
  firstOctet |= ((lowerPart & 0x08) << 1);
  firstOctet |= ((lowerPart & 0x04) << 3);
  firstOctet |= ((lowerPart & 0x02) << 5);
  firstOctet |= ((lowerPart & 0x01) << 7);
  uint8_t secondOctet = 0;
  uint8_t upperPart = (frequencyCode & 0x03f0) >> 4;
  secondOctet |= ((upperPart & 0x20) >> 3);
  secondOctet |= ((upperPart & 0x10) >> 1);
  secondOctet |= ((upperPart & 0x08) << 1);
  secondOctet |= ((upperPart & 0x04) << 3);
  secondOctet |= ((upperPart & 0x02) << 5);
  secondOctet |= ((upperPart & 0x01) << 7);
  ADDR_DATA_REG = firstOctet;
  WRITE_CYCLE(chipNo);
  ADDR_DATA_REG = secondOctet;
  WRITE_CYCLE(chipNo);
 }
 void psgAmplitude(uint8_t channel, uint8_t volume) {
  psgAmplitudeShadowValue[channel] = volume;
  uint8_t chipNo = channel / 3;
  uint8_t regAddr = ((channel % 3) * 2) + 1;
  uint8_t attenuation = 15 - volume;
  uint8_t firstOctet = 0x01;
  firstOctet |= ((regAddr & 0x04) >> 1);
  firstOctet |= ((regAddr & 0x02) << 1);
  firstOctet |= ((regAddr & 0x01) << 3);
  firstOctet |= ((attenuation & 0x01) << 7);
  firstOctet |= ((attenuation & 0x02) << 5);
  firstOctet |= ((attenuation & 0x04) << 3);
  firstOctet |= ((attenuation & 0x08) << 1);
  ADDR_DATA_REG = firstOctet;
  WRITE_CYCLE(chipNo);
 }
 void psgPlayTone(uint8_t channel, uint8_t volume, t_octave octave, t_note note) {
  if (note == e_Pause) {
    psgAmplitude(channel, 0);
  } else {
 //    if (psgAmplitudeShadowValue[channel] == 0) {
      psgAmplitude(channel, volume);
 //    }
    psgWriteFrequency(channel, frequencyCodes[octave][note]);
  }
 }
 void psgInit() {
  // address/data bus
  P2DIR = 0xff;
  P2SEL = 0;
  P2SEL2 = 0;
  // bus control lines
  //   output:
  //     BIT0: /CS chip 0
  //     BIT1: /CS chip 1
  //     BIT2: /WE
  //   input:
  //     BIT3: READY
  P1DIR |= BIT0 | BIT1 | BIT2;
  P1DIR &= ~BIT3;
  // immediately disable all outputs, all are active low
  P1OUT |= BIT0 | BIT1 | BIT2;
  // shutdown all channels including noise
  psgWrite(0, 0b11111001);
  psgWrite(0, 0b11111101);
  psgWrite(0, 0b11111011);
  psgWrite(0, 0b11111111);
 //  psgPlayTone(0, 5, e_O_3, e_A);
  psgAmplitude(0, 3);
 }
--- a/sound-driver/utils/calc-76489an.py
+++ b/sound-driver/utils/calc-76489an.py
@@ -0,0 +1,64 @@
 N = 3579545.0
 factor = 1.0594631
 base = 440.0
 frequencies = []
 BEFORE_A = 46
 f = base
 for i in range (BEFORE_A):
    idx = BEFORE_A - i - 1
    print(f"{idx}: {f}")
    frequencies.append(f)
    f = base / factor
    base = f
 frequencies.reverse()
 AFTER_A = 50
 base = 440.0
 for i in range(AFTER_A):
    idx = BEFORE_A + i
    f = base * factor
    print(f"{idx}: {f}")
    frequencies.append(f)
    base = f
 # print(f"{frequencies}")
 codes = []
 for i in range(len(frequencies)):
    codes.append(round(N / (32.0 * frequencies[i])))
 #const uint16_t frequencyCodes[8][12] = {
 #  //    C,   Cis,     D,   Dis,     E,     F,   Fis,     G,   Gis,     A,   Ais,     H
 #  { 06535, 06234, 05747, 05474, 05233, 05002, 04563, 04353, 04153, 03762, 03600, 03424 },  // Octave 1
 #  { 03256, 03116, 02764, 02636, 02515, 02401, 02271, 02165, 02065, 01771, 01700, 01612 },  // Octave 2
 #  { 01527, 01447, 01372, 01317, 01247, 01201, 01135, 01073, 01033, 00774, 00740, 00705 },  // Octave 3
 #  { 00654, 00624, 00575, 00550, 00523, 00500, 00456, 00435, 00415, 00376, 00360, 00342 },  // Octave 4
 #  { 00326, 00312, 00276, 00264, 00252, 00240, 00227, 00217, 00207, 00177, 00170, 00161 },  // Octave 5
 #  { 00153, 00145, 00137, 00132, 00125, 00120, 00114, 00107, 00103, 00100, 00074, 00071 },  // Octave 6
 #  { 00065, 00062, 00060, 00055, 00052, 00050, 00046, 00044, 00042, 00040, 00036, 00034 },  // Octave 7
 #  { 00033, 00031, 00030, 00026, 00025, 00024, 00023, 00022, 00021, 00020, 00017, 00016 }   // Octave 8
 #};
 print("const uint16_t frequencyCodes[8][12] = {")
 step = 12
 for i in range(len(codes)):
    if (i % step == 0):
        print("  { ", end='')
    print(f"{codes[i]}", end='')
    if ((i+1) % step != 0):
        print(", ", end='')
    if ((i+1) % step == 0):
        print(" }", end='')
        if ((i+1) != len(codes)):
            print(", ")
        else:
            print()
 print("};")
Author	SHA1	Message	Date
Wolfgang Hottgenroth	8f777c9ac4	76498 not working as expected	2024-04-09 18:14:31 +02:00
Wolfgang Hottgenroth	aeb7aeb7f2	start with other sound chip	2024-04-09 10:32:19 +02:00
Wolfgang Hottgenroth	20c01f2efa	frequency table for 76489AN	2024-04-07 13:37:42 +02:00
Wolfgang Hottgenroth	40cb04bde5	fix wording	2024-03-29 18:08:37 +01:00
Wolfgang Hottgenroth	a1457e6a69	lengthCnt must be 16 Bit, one full tone for 160/4 has 375	2024-03-29 15:52:12 +01:00