diff --git a/firmware/NeoPixelController.cpp b/firmware/NeoPixelController.cpp index b67c73a..5624ebb 100644 --- a/firmware/NeoPixelController.cpp +++ b/firmware/NeoPixelController.cpp @@ -3,7 +3,6 @@ #include namespace { -constexpr uint8_t kPin = 18; constexpr uint16_t kCount = 1; constexpr uint32_t kColors[] = { 0xFF0000, 0xFF8000, 0xFFFF00, 0x00FF00, @@ -11,10 +10,11 @@ constexpr uint32_t kColors[] = { }; constexpr uint8_t kColorCount = sizeof(kColors) / sizeof(kColors[0]); -Adafruit_NeoPixel pixels(kCount, kPin, NEO_GRB + NEO_KHZ800); +Adafruit_NeoPixel pixels(kCount, 0, NEO_GRB + NEO_KHZ800); } -void NeoPixelController::begin() { +void NeoPixelController::begin(uint8_t pin) { + pixels.setPin(pin); pixels.begin(); pixels.setBrightness(255); pixels.setPixelColor(0, kColors[kStoppedColorIndex]); diff --git a/firmware/NeoPixelController.h b/firmware/NeoPixelController.h index d9004f4..f091f81 100644 --- a/firmware/NeoPixelController.h +++ b/firmware/NeoPixelController.h @@ -4,7 +4,7 @@ class NeoPixelController { public: - void begin(); + void begin(uint8_t pin); void setPlaying(bool playing); void update(); diff --git a/firmware/firmware.ino b/firmware/firmware.ino index d7f224f..b311f48 100644 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -3,6 +3,8 @@ #include #include "NeoPixelController.h" +const char kBluetoothName[] = "BT_Speaker5.31"; + // I2C接続のOLED設定 (SSD1306 128x64) U8G2_SSD1306_128X64_NONAME_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); @@ -83,7 +85,7 @@ void audio_state_changed_callback(esp_a2d_audio_state_t state, void *) { void setup() { Serial.begin(115200); - neoPixelController.begin(); + neoPixelController.begin(18); // SDAをGPIO 19、SCLをGPIO 32 に設定 // (配線に合わせて Wire.begin(SDA_PIN, SCL_PIN) の順で指定します) @@ -96,7 +98,7 @@ void setup() { // 初期画面 u8g2.clearBuffer(); u8g2.setFont(u8g2_font_unifont_t_japanese1); - u8g2.drawUTF8(0, 20, "BTスピーカー5.3"); + u8g2.drawUTF8(0, 20, kBluetoothName); u8g2.setFont(u8g2_font_6x10_tf); u8g2.drawStr(0, 40, "Ready..."); u8g2.sendBuffer(); @@ -117,7 +119,7 @@ void setup() { a2dp_sink.set_on_audio_state_changed(audio_state_changed_callback); // Bluetooth起動 - a2dp_sink.start("BT_Speaker5.3"); + a2dp_sink.start(kBluetoothName); } void loop() {