From 79ba3419c4511cba1685d323e41baeb5446fd6aa Mon Sep 17 00:00:00 2001
From: Mark Mentovai <mark@mentovai.com>
Date: Sun, 28 Dec 2025 13:47:08 -0500
Subject: [PATCH] =?UTF-8?q?emulator:=20Don=E2=80=99t=20require=20config.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

37d7d51ac3ae (2021-07-22) made it so that config.h was only required if
necessary to override config_defaults.h, and ae525053e7cb (2022-10-19)
documented that. However, the emulator build still required the presence
of config.h. This updates remaining files to `#include
"config_defaults.h"`, which has the responsibility for conditionally
further including "config.h" if present, just like the non-emulator
build.
---
 src/apps/_experiments/dnatilt.cpp                    | 2 +-
 src/apps/tools/OswAppBLEMediaCtrl.cpp                | 2 +-
 src/apps/tools/OswAppTimeConfig.cpp                  | 2 +-
 src/apps/watchfaces/OswAppWatchfaceDual.cpp          | 2 +-
 src/apps/watchfaces/OswAppWatchfaceFitness.cpp       | 2 +-
 src/apps/watchfaces/OswAppWatchfaceFitnessAnalog.cpp | 2 +-
 src/apps/watchfaces/OswAppWatchfaceMix.cpp           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/apps/_experiments/dnatilt.cpp b/src/apps/_experiments/dnatilt.cpp
index 585b141c0..c2977be55 100644
--- a/src/apps/_experiments/dnatilt.cpp
+++ b/src/apps/_experiments/dnatilt.cpp
@@ -2,7 +2,7 @@
 #if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1
 #include "./apps/_experiments/dnatilt.h"
 
-#include <config.h>
+#include "config_defaults.h"
 #include <gfx_util.h>
 #include <OswAppV1.h>
 #include <osw_hal.h>
diff --git a/src/apps/tools/OswAppBLEMediaCtrl.cpp b/src/apps/tools/OswAppBLEMediaCtrl.cpp
index 6f0271e7b..88aac7492 100644
--- a/src/apps/tools/OswAppBLEMediaCtrl.cpp
+++ b/src/apps/tools/OswAppBLEMediaCtrl.cpp
@@ -2,7 +2,7 @@
 #ifdef OSW_FEATURE_BLE_MEDIA_CTRL
 #include "./apps/tools/OswAppBLEMediaCtrl.h"
 
-#include <config.h>
+#include "config_defaults.h"
 #include <gfx_util.h>
 #include <OswAppV1.h>
 #include <osw_hal.h>
diff --git a/src/apps/tools/OswAppTimeConfig.cpp b/src/apps/tools/OswAppTimeConfig.cpp
index eccda97fd..e03bf0462 100644
--- a/src/apps/tools/OswAppTimeConfig.cpp
+++ b/src/apps/tools/OswAppTimeConfig.cpp
@@ -1,6 +1,6 @@
 #include "./apps/tools/OswAppTimeConfig.h"
 
-#include <config.h>
+#include "config_defaults.h"
 #include <gfx_util.h>
 #include <OswAppV1.h>
 #include <osw_config_keys.h>
diff --git a/src/apps/watchfaces/OswAppWatchfaceDual.cpp b/src/apps/watchfaces/OswAppWatchfaceDual.cpp
index d665c73bf..cb572a79d 100644
--- a/src/apps/watchfaces/OswAppWatchfaceDual.cpp
+++ b/src/apps/watchfaces/OswAppWatchfaceDual.cpp
@@ -1,6 +1,6 @@
 #include "./apps/watchfaces/OswAppWatchfaceDual.h"
 
-#include <config.h>
+#include "config_defaults.h"
 #include <gfx_util.h>
 #include <OswAppV1.h>
 #include <osw_config_keys.h>
diff --git a/src/apps/watchfaces/OswAppWatchfaceFitness.cpp b/src/apps/watchfaces/OswAppWatchfaceFitness.cpp
index 10867f208..c5f7ad53d 100644
--- a/src/apps/watchfaces/OswAppWatchfaceFitness.cpp
+++ b/src/apps/watchfaces/OswAppWatchfaceFitness.cpp
@@ -5,7 +5,7 @@
 #include "apps/watchfaces/OswAppWatchfaceDigital.h"
 #include "apps/watchfaces/OswAppWatchface.h"
 
-#include <config.h>
+#include "config_defaults.h"
 #include <gfx_util.h>
 #include <OswAppV1.h>
 #include <osw_config_keys.h>
diff --git a/src/apps/watchfaces/OswAppWatchfaceFitnessAnalog.cpp b/src/apps/watchfaces/OswAppWatchfaceFitnessAnalog.cpp
index 4ecaa1b7a..52967bdea 100644
--- a/src/apps/watchfaces/OswAppWatchfaceFitnessAnalog.cpp
+++ b/src/apps/watchfaces/OswAppWatchfaceFitnessAnalog.cpp
@@ -8,7 +8,7 @@
 #include "./apps/_experiments/gif_player.h"
 #endif
 
-#include <config.h>
+#include "config_defaults.h"
 #include <gfx_util.h>
 #include <OswAppV1.h>
 #include <osw_config_keys.h>
diff --git a/src/apps/watchfaces/OswAppWatchfaceMix.cpp b/src/apps/watchfaces/OswAppWatchfaceMix.cpp
index 266a69712..aafd9d66a 100644
--- a/src/apps/watchfaces/OswAppWatchfaceMix.cpp
+++ b/src/apps/watchfaces/OswAppWatchfaceMix.cpp
@@ -3,7 +3,7 @@
 #include "./apps/watchfaces/OswAppWatchfaceMix.h"
 #include "./apps/watchfaces/OswAppWatchface.h"
 
-#include <config.h>
+#include "config_defaults.h"
 #include <gfx_util.h>
 #include <OswAppV1.h>
 #include <osw_config_keys.h>