firmware working on rev4 boards

Author: tcsullivan

noisemeter-device/access-point.cpp

@@ -79,11 +79,6 @@ void AccessPoint::run()
     }
 }
 
-bool AccessPoint::canHandle(HTTPMethod, const String&)
-{
-    return true;
-}
-
 void AccessPoint::taskOnCredentialsReceived(void *param)
 {
     auto ap = reinterpret_cast<AccessPoint *>(param);
@@ -123,6 +118,11 @@ static String waitingHtml()
     return html;
 }
 
+bool AccessPoint::canHandle(WebServer&, HTTPMethod, const String&)
+{
+    return true;
+}
+
 bool AccessPoint::handle(WebServer& server, HTTPMethod method, const String& uri)
 {
     if (method == HTTP_POST) {

noisemeter-device/access-point.h

@@ -63,6 +63,11 @@ class AccessPoint : public RequestHandler
      */
     void run();
 
+    /** Determines which HTTP requests should be handled. */
+    virtual bool canHandle(WebServer&, HTTPMethod, const String&) override;
+    /** Handles requests by redirecting to the setup page. */
+    virtual bool handle(WebServer&, HTTPMethod, const String&) override;
+
 private:
 
     unsigned long timeout;
@@ -86,11 +91,6 @@ class AccessPoint : public RequestHandler
     /** Provides HTML for an error page with the given message. */
     static String htmlFromMsg(const char *msg, const char *extra = nullptr);
 
-    /** Determines which HTTP requests should be handled. */
-    virtual bool canHandle(HTTPMethod, const String&) override;
-    /** Handles requests by redirecting to the setup page. */
-    virtual bool handle(WebServer&, HTTPMethod, const String&) override;
-
     static void taskOnCredentialsReceived(void *param);
 };
 

noisemeter-device/board.h

@@ -28,13 +28,13 @@
 #if defined(BOARD_ESP32_PCB)
 
 /** Pin number for the board's LED. */
-#define PIN_LED1    GPIO_NUM_0
+#define PIN_LED1    GPIO_NUM_17
 /** Pin number for the board's factory reset button. */
-#define PIN_BUTTON  GPIO_NUM_1
+#define PIN_BUTTON  GPIO_NUM_15
 /** Pin number for the microphone's clock pin. */
-#define I2S_SCK     GPIO_NUM_4
+#define I2S_SCK     GPIO_NUM_5
 /** Pin number for the microphone's data out pin. */
-#define I2S_SD      GPIO_NUM_5
+#define I2S_SD      GPIO_NUM_6
 
 /** I2S peripheral instance to be used. */
 #define I2S_PORT    I2S_NUM_0
@@ -43,7 +43,7 @@
 #define I2S_FORMAT  I2S_CHANNEL_FMT_ONLY_LEFT
 
 /** Serial instance to use for logging output. */
-#define SERIAL      Serial
+#define SERIAL      USBSerial
 
 #include <HWCDC.h>
 extern HWCDC USBSerial;

noisemeter-device/noisemeter-device.ino

@@ -245,7 +245,7 @@ void measurementHandler(void *)
 
   while (1) {
     if (const auto db = SPL.readMicrophoneData(); db) {
-      //packets.front().add(*db);
+      packets.front().add(*db);
       printReadingToConsole(*db);
     }
   }

platformio.ini

@@ -16,7 +16,7 @@ default_envs = esp32-pcb
 [env]
 extra_scripts = build_hooks.py
 framework = arduino
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.35/platform-espressif32.zip
 board_build.partitions = nmpartitions.csv
 lib_deps = 
 	bblanchon/ArduinoJson@^7.0.2
@@ -26,9 +26,8 @@ build_unflags =
 build_flags = 
 	-std=gnu++17
 	-DNO_GLOBAL_EEPROM
-        -DNOISEMETER_VERSION=\"0.3.0\"
+        -DNOISEMETER_VERSION=\"0.4.0\"
 	-Wall -Wextra
-	-DUPLOAD_DISABLED
 
 # Optional build flags:
 #   Print credentials over serial (for debugging):
@@ -40,7 +39,7 @@ build_flags =
 
 [env:esp32-pcb]
 extra_scripts = build_hooks.py
-board = seeed_xiao_esp32s3
+board = esp32-s3-devkitm-1
 board_build.f_cpu = 80000000L
 build_flags = ${env.build_flags} -DBOARD_ESP32_PCB