fix: sdfat warning about redefinition of macro (#1135)

## Summary

Fix redefinition of `FILE_*` macro.

Note that there will still be 2 warning:

```
.pio/libdeps/default/WebSockets/src/WebSocketsClient.cpp: In member function 'void WebSocketsClient::clientDisconnect(WSclient_t*, const char*)':
.pio/libdeps/default/WebSockets/src/WebSocketsClient.cpp:573:31: warning: 'virtual void NetworkClient::flush()' is deprecated: Use clear() instead. [-Wdeprecated-declarations]
  573 |             client->tcp->flush();
      |             ~~~~~~~~~~~~~~~~~~^~
```

--> I assume the upstream library need to fix it

And:

```
src/activities/Activity.cpp:8:1: warning: 'noreturn' function does return
    8 | }
      | ^
```

Will be fixed in #1016 

---

### AI Usage

While CrossPoint doesn't have restrictions on AI tools in contributing,
please be transparent about their usage as it
helps set the right context for reviewers.

Did you use AI tools to help write this code? **NO**
This commit is contained in:
Xuan-Son Nguyen
2026-02-23 19:52:25 +01:00
committed by GitHub
parent 04e72a9ede
commit ae94e97fb8
6 changed files with 5 additions and 7 deletions

View File

@@ -2,7 +2,6 @@
#include <GfxRenderer.h> #include <GfxRenderer.h>
#include <Logging.h> #include <Logging.h>
#include <SDCardManager.h>
#include <Serialization.h> #include <Serialization.h>
#include "../converters/DitherUtils.h" #include "../converters/DitherUtils.h"

View File

@@ -1,5 +1,5 @@
#pragma once #pragma once
#include <SdFat.h> #include <HalStorage.h>
#include <memory> #include <memory>
#include <string> #include <string>

View File

@@ -1,5 +1,5 @@
#pragma once #pragma once
#include <SdFat.h> #include <HalStorage.h>
#include <memory> #include <memory>
#include <string> #include <string>

View File

@@ -1,9 +1,8 @@
#include "JpegToFramebufferConverter.h" #include "JpegToFramebufferConverter.h"
#include <GfxRenderer.h> #include <GfxRenderer.h>
#include <HalStorage.h>
#include <Logging.h> #include <Logging.h>
#include <SDCardManager.h>
#include <SdFat.h>
#include <picojpeg.h> #include <picojpeg.h>
#include <cstdio> #include <cstdio>

View File

@@ -1,10 +1,9 @@
#include "PngToFramebufferConverter.h" #include "PngToFramebufferConverter.h"
#include <GfxRenderer.h> #include <GfxRenderer.h>
#include <HalStorage.h>
#include <Logging.h> #include <Logging.h>
#include <PNGdec.h> #include <PNGdec.h>
#include <SDCardManager.h>
#include <SdFat.h>
#include <cstdlib> #include <cstdlib>
#include <new> #include <new>

View File

@@ -1,5 +1,6 @@
#pragma once #pragma once
#include <FS.h> // need to be included before SdFat.h for compatibility with FS.h's File class
#include <SDCardManager.h> #include <SDCardManager.h>
#include <vector> #include <vector>