kithub
/
arduino_esp32_a2dp
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CSV保存調整

This commit is contained in:
Koichi Ito 2026-09-20 19:51:29 +09:00
parent e83a7cff80
commit ae692f67af
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/SensorLogger.cpp
View File

@ -12,6 +12,7 @@ namespace {
constexpr char kNusServiceUuid[] = "6E400001-B5A3-F393-E0A9-E50E24DCCA9E"; constexpr char kNusServiceUuid[] = "6E400001-B5A3-F393-E0A9-E50E24DCCA9E";
constexpr char kNusRxUuid[] = "6E400002-B5A3-F393-E0A9-E50E24DCCA9E"; constexpr char kNusRxUuid[] = "6E400002-B5A3-F393-E0A9-E50E24DCCA9E";
constexpr char kNusTxUuid[] = "6E400003-B5A3-F393-E0A9-E50E24DCCA9E"; constexpr char kNusTxUuid[] = "6E400003-B5A3-F393-E0A9-E50E24DCCA9E";
constexpr char kBleDeviceNamePrefix[] = "EnvLog";
constexpr int64_t kInitialYear = 1700; constexpr int64_t kInitialYear = 1700;
constexpr int64_t kSecondsPerDay = 86400; constexpr int64_t kSecondsPerDay = 86400;
@ -66,7 +67,7 @@ void SensorLogger::begin(uint8_t soilPin) {
uint64_t mac = ESP.getEfuseMac(); uint64_t mac = ESP.getEfuseMac();
char name[14]; char name[14];
snprintf(name, sizeof(name), "EnvLog-%05llX", mac & 0xFFFFF); snprintf(name, sizeof(name), "%s-%05llX", kBleDeviceNamePrefix, mac & 0xFFFFF);
bluetoothName_ = name; bluetoothName_ = name;
BLEDevice::init(bluetoothName_.c_str()); BLEDevice::init(bluetoothName_.c_str());
@ -298,7 +299,6 @@ void SensorLogger::processCommand(const String& command) {
} }
void SensorLogger::sendLog() { void SensorLogger::sendLog() {
sendNotification("タイムスタンプ,温度,湿度,土壌水分,光量,デバイス名\n");
for (size_t index = 0; index < logCount_; ++index) { for (size_t index = 0; index < logCount_; ++index) {
size_t logIndex = (logStart_ + index) % kMaxLogEntries; size_t logIndex = (logStart_ + index) % kMaxLogEntries;
const SensorReading& reading = log_[logIndex]; const SensorReading& reading = log_[logIndex];

2
firmware/SensorLogger.h
View File

@ -29,7 +29,7 @@ public:
bool isBluetoothConnected() const; bool isBluetoothConnected() const;
private: private:
static constexpr unsigned long kMeasureIntervalMs = 10000UL; static constexpr unsigned long kMeasureIntervalMs = 3600000UL;
static constexpr unsigned long kAdvertiseRetryIntervalMs = 500UL; static constexpr unsigned long kAdvertiseRetryIntervalMs = 500UL;
void readAndStore(); void readAndStore();

4
firmware/firmware.ino
View File

@ -4,7 +4,7 @@
#include "NeoPixelController.h" #include "NeoPixelController.h"
#include "SensorLogger.h" #include "SensorLogger.h"
const char kBluetoothName[] = "BT_Speaker5.4"; const char kA2dpDeviceName[] = "BT_Speaker5.4";
// I2C接続のOLED設定 (SSD1306 128x64) // I2C接続のOLED設定 (SSD1306 128x64)
U8G2_SSD1306_128X64_NONAME_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); 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); a2dp_sink.set_on_connection_state_changed(connection_state_changed_callback);
// Bluetooth起動 // Bluetooth起動
a2dp_sink.start(kBluetoothName); a2dp_sink.start(kA2dpDeviceName);
} }
void loop() { void loop() {