From 8b12d4008ebdf03187990caa7db14a8a5abe8a6e Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Sat, 3 Jan 2026 13:20:40 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=20Removes=20msgpack=20and=20json=20bu?= =?UTF-8?q?ild=20flags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.env | 4 +--- esp32/build_settings.ini | 5 +---- esp32/include/features.h | 17 +---------------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/app/.env b/app/.env index 8be835f..509b7f5 100644 --- a/app/.env +++ b/app/.env @@ -1,3 +1 @@ -PUBLIC_VITE_USE_HOST_NAME=true -PUBLIC_USE_JSON=true -PUBLIC_USE_MSGPACK=true \ No newline at end of file +PUBLIC_VITE_USE_HOST_NAME=true \ No newline at end of file diff --git a/esp32/build_settings.ini b/esp32/build_settings.ini index 53fd6ed..ebe71cc 100644 --- a/esp32/build_settings.ini +++ b/esp32/build_settings.ini @@ -2,7 +2,4 @@ build_flags = -D BUILD_TARGET=\"$PIOENV\" -D APPLICATION_CORE=0 - -D EMBED_WEBAPP=1 - - -D USE_MSGPACK=1 ; Use either msgpack or json - -D USE_JSON=0 ; Use either msgpack or json \ No newline at end of file + -D EMBED_WEBAPP=1 \ No newline at end of file diff --git a/esp32/include/features.h b/esp32/include/features.h index e566bd2..4ef7a31 100644 --- a/esp32/include/features.h +++ b/esp32/include/features.h @@ -1,5 +1,4 @@ -#ifndef Features_h -#define Features_h +#pragma once #include #include @@ -53,18 +52,6 @@ #define USE_MDNS 1 #endif -// ESP32 MSGPACK on by default -#ifndef USE_MSGPACK -#define USE_MSGPACK 1 -#endif - -// ESP32 JSON off by default -#ifndef USE_JSON -#define USE_JSON 0 -#endif - -static_assert(!(USE_JSON == 1 && USE_MSGPACK == 1), "Cannot set both USE_JSON and USE_MSGPACK to 1 simultaneously"); - #if defined(SPOTMICRO_ESP32) && defined(SPOTMICRO_ESP32_MINI) && defined(SPOTMICRO_YERTLE) #error "Only one kinematics variant must be defined" #endif @@ -94,5 +81,3 @@ void features_request(socket_message_FeaturesDataRequest& fd_req, socket_message esp_err_t getFeatures(PsychicRequest *request); } // namespace feature_service - -#endif