From 31cae5266b25d18c5f6652de0a8ba04623f3c374 Mon Sep 17 00:00:00 2001
From: Tatsuya Fujita <tfujita@gmail.com>
Date: Sat, 16 Sep 2023 22:23:09 +0900
Subject: [PATCH] up

---
 .vscode/settings.json | 3 ++-
 src/file.cpp          | 6 ++++--
 src/keypad/keypad.hpp | 2 +-
 src/main.cpp          | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index eb52b60..e5641be 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,5 +4,6 @@
     "bmp.h": "c",
     "oledfont.h": "c",
     "limits": "cpp"
-  }
+  },
+  "cmake.configureOnOpen": false
 }
\ No newline at end of file
diff --git a/src/file.cpp b/src/file.cpp
index 2ce3545..a88d845 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1311,6 +1311,7 @@ void s98Process() {
 
     uint8_t addr;
     uint8_t data;
+    s98info.Sync = 0;
 
     if (timeUpdateFlag) {
       startTime = get_timer_value();
@@ -1341,10 +1342,10 @@ void s98Process() {
         s98info.Sync += 1;
         break;
       case 0xFE: {  // n sync wait
-        data = get_vgm_ui8();
         int s = 0, n = 0, i = 0;
         do {
           ++i;
+          data = get_vgm_ui8();
           n |= (data & 0x7f) << s;
           s += 7;
         } while (data & 0x80);
@@ -1373,7 +1374,8 @@ void s98Process() {
         break;
     }
 
-    if (s98info.Sync > 1) {
+
+    if (s98info.Sync > 0) {
       while ((get_timer_value() - startTime) <= s98info.Sync * s98info.OneCycle) {
         //if (s98info.Sync > 1) {
           switch (Keypad.checkButton()) {
diff --git a/src/keypad/keypad.hpp b/src/keypad/keypad.hpp
index e0eddfc..ab1c888 100644
--- a/src/keypad/keypad.hpp
+++ b/src/keypad/keypad.hpp
@@ -36,7 +36,7 @@ extern "C" {
 }
 #include "tick.hpp"
 
-#define BUTTON_INTERVAL 64   // ボタン取得間隔 ms
+#define BUTTON_INTERVAL 100   // ボタン取得間隔 ms
 #define REPEAT_DELAY 400     // ボタンリピート開始まで ms
 
 typedef enum { 
diff --git a/src/main.cpp b/src/main.cpp
index 9798969..0fbe690 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,15 +29,15 @@ void setup() {
 
   Tick.delay_ms(64);
 
-  LCD_ShowString(0, 0, (u8 *)("Initializing PT2257.     "), WHITE);
-  PT2257.begin();  // PT2257 初期化
-
   LCD_ShowString(0, 0, (u8 *)("Initializing SI5351.     "), WHITE);
   SI5351.begin();  // SI5351 起動
   SI5351.setFreq(SI5351_8000, 0);
   SI5351.setFreq(SI5351_3579, 1);
   SI5351.enableOutputs(true);
 
+  LCD_ShowString(0, 0, (u8 *)("Initializing PT2257.     "), WHITE);
+  PT2257.begin();  // PT2257 初期化
+
   LCD_ShowString(0, 0, (u8 *)("Starting FM.             "), WHITE);
   FM.begin();
   FM.reset();  // FMリセット