From 5654db27b575784dc28619bae728aca4e2dfaa26 Mon Sep 17 00:00:00 2001 From: VirtuallyAverage Date: Sun, 6 Oct 2024 23:43:13 -0500 Subject: [PATCH] Clean up, and pass mac address when responding to ping --- VRC-Haptics-Firmware-ESP/src/OSC/osc.cpp | 1 + VRC-Haptics-Firmware-ESP/src/PWM/PCA/pca.cpp | 1 - VRC-Haptics-Firmware-ESP/src/PWM/pwmConfig.hpp | 3 --- 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 VRC-Haptics-Firmware-ESP/src/PWM/pwmConfig.hpp diff --git a/VRC-Haptics-Firmware-ESP/src/OSC/osc.cpp b/VRC-Haptics-Firmware-ESP/src/OSC/osc.cpp index 5f9afa3..d2b3709 100644 --- a/VRC-Haptics-Firmware-ESP/src/OSC/osc.cpp +++ b/VRC-Haptics-Firmware-ESP/src/OSC/osc.cpp @@ -78,6 +78,7 @@ void handlePing(const OscMessage& message){ // Respond to ping OscMessage pingResponse(PING_ADDRESS); pingResponse.pushInt32(RECIEVE_PORT); + pingResponse.pushString(WiFi.macAddress()); oscClient.send(hostIP, sendPort, pingResponse); if (!heartbeatPublisher){ diff --git a/VRC-Haptics-Firmware-ESP/src/PWM/PCA/pca.cpp b/VRC-Haptics-Firmware-ESP/src/PWM/PCA/pca.cpp index 763396a..fd1e39f 100644 --- a/VRC-Haptics-Firmware-ESP/src/PWM/PCA/pca.cpp +++ b/VRC-Haptics-Firmware-ESP/src/PWM/PCA/pca.cpp @@ -3,7 +3,6 @@ #include "config.h" #include "globals.h" -#include "PWM/pwmConfig.hpp" #include "pca.h" #include "Adafruit_PWMServoDriver.h" diff --git a/VRC-Haptics-Firmware-ESP/src/PWM/pwmConfig.hpp b/VRC-Haptics-Firmware-ESP/src/PWM/pwmConfig.hpp deleted file mode 100644 index b28b04f..0000000 --- a/VRC-Haptics-Firmware-ESP/src/PWM/pwmConfig.hpp +++ /dev/null @@ -1,3 +0,0 @@ - - -