Skip to content

armgit / flix

Public Imported from GitHub
0

Making an ESP32-based quadcopter from scratch

Simplify WIFI_ENABLED macro test

Oleg Kalachev3ed4143ba06a
diff --git a/flix/flix.ino b/flix/flix.ino
index 799db1d..61e9689 100644
--- a/flix/flix.ino
+++ b/flix/flix.ino
@@ -28,7 +28,7 @@ void setup() {
setupLED();
setupMotors();
setLED(true);
-#if WIFI_ENABLED == 1
+#if WIFI_ENABLED
setupWiFi();
#endif
setupIMU();
@@ -45,7 +45,7 @@ void loop() {
control();
sendMotors();
parseInput();
-#if WIFI_ENABLED == 1
+#if WIFI_ENABLED
processMavlink();
#endif
logData();
diff --git a/flix/mavlink.ino b/flix/mavlink.ino
index bcaeacd..94e8490 100644
--- a/flix/mavlink.ino
+++ b/flix/mavlink.ino
@@ -3,7 +3,7 @@
// MAVLink communication
-#if WIFI_ENABLED == 1
+#if WIFI_ENABLED
#include <MAVLink.h>
diff --git a/flix/parameters.ino b/flix/parameters.ino
index 80adeb3..acfe7e5 100644
--- a/flix/parameters.ino
+++ b/flix/parameters.ino
@@ -68,7 +68,7 @@ Parameter parameters[] = {
{"RC_MAX_5", &channelMax[5]},
{"RC_MAX_6", &channelMax[6]},
{"RC_MAX_7", &channelMax[7]},
-#if WIFI_ENABLED == 1
+#if WIFI_ENABLED
// MAVLink
{"MAV_CTRL_SCALE", &mavlinkControlScale},
#endif
diff --git a/flix/wifi.ino b/flix/wifi.ino
index 5516249..5343433 100644
--- a/flix/wifi.ino
+++ b/flix/wifi.ino
@@ -3,7 +3,7 @@
// Wi-Fi support
-#if WIFI_ENABLED == 1
+#if WIFI_ENABLED
#include <WiFi.h>
#include <WiFiAP.h>