From ae692f67af13d9d3b1e3db282716c743f6f2b38c Mon Sep 17 00:00:00 2001 From: Koichi Ito Date: Sun, 20 Sep 2026 19:51:29 +0900 Subject: [PATCH] =?UTF-8?q?CSV=E4=BF=9D=E5=AD=98=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- firmware/SensorLogger.cpp | 4 ++-- firmware/SensorLogger.h | 2 +- firmware/firmware.ino | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/SensorLogger.cpp b/firmware/SensorLogger.cpp index 98ee1d6..58bf167 100644 --- a/firmware/SensorLogger.cpp +++ b/firmware/SensorLogger.cpp @@ -12,6 +12,7 @@ namespace { constexpr char kNusServiceUuid[] = "6E400001-B5A3-F393-E0A9-E50E24DCCA9E"; constexpr char kNusRxUuid[] = "6E400002-B5A3-F393-E0A9-E50E24DCCA9E"; constexpr char kNusTxUuid[] = "6E400003-B5A3-F393-E0A9-E50E24DCCA9E"; +constexpr char kBleDeviceNamePrefix[] = "EnvLog"; constexpr int64_t kInitialYear = 1700; constexpr int64_t kSecondsPerDay = 86400; @@ -66,7 +67,7 @@ void SensorLogger::begin(uint8_t soilPin) { uint64_t mac = ESP.getEfuseMac(); char name[14]; - snprintf(name, sizeof(name), "EnvLog-%05llX", mac & 0xFFFFF); + snprintf(name, sizeof(name), "%s-%05llX", kBleDeviceNamePrefix, mac & 0xFFFFF); bluetoothName_ = name; BLEDevice::init(bluetoothName_.c_str()); @@ -298,7 +299,6 @@ void SensorLogger::processCommand(const String& command) { } void SensorLogger::sendLog() { - sendNotification("タイムスタンプ,温度,湿度,土壌水分,光量,デバイス名\n"); for (size_t index = 0; index < logCount_; ++index) { size_t logIndex = (logStart_ + index) % kMaxLogEntries; const SensorReading& reading = log_[logIndex]; diff --git a/firmware/SensorLogger.h b/firmware/SensorLogger.h index 67d3ad2..8710819 100644 --- a/firmware/SensorLogger.h +++ b/firmware/SensorLogger.h @@ -29,7 +29,7 @@ public: bool isBluetoothConnected() const; private: - static constexpr unsigned long kMeasureIntervalMs = 10000UL; + static constexpr unsigned long kMeasureIntervalMs = 3600000UL; static constexpr unsigned long kAdvertiseRetryIntervalMs = 500UL; void readAndStore(); diff --git a/firmware/firmware.ino b/firmware/firmware.ino index 37f25b0..d974a8e 100644 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -4,7 +4,7 @@ #include "NeoPixelController.h" #include "SensorLogger.h" -const char kBluetoothName[] = "BT_Speaker5.4"; +const char kA2dpDeviceName[] = "BT_Speaker5.4"; // I2C接続のOLED設定 (SSD1306 128x64) U8G2_SSD1306_128X64_NONAME_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); @@ -169,7 +169,7 @@ void setup() { a2dp_sink.set_on_connection_state_changed(connection_state_changed_callback); // Bluetooth起動 - a2dp_sink.start(kBluetoothName); + a2dp_sink.start(kA2dpDeviceName); } void loop() {