WantClue/NerdNos-Firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #194 from romanmashta/dev_upstream

Browse Source 
Fix build for MacOS and Linux.
This commit is contained in:
BitMaker 2023-10-02 22:24:06 +02:00 committed by GitHub
commit 0f3661f556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/displays/displayDriver.h
View File

@ -1,7 +1,7 @@
#ifndef DISPLAYDRIVER_H_ #ifndef DISPLAYDRIVER_H_
#define DISPLAYDRIVER_H_ #define DISPLAYDRIVER_H_
#include "..\devices\device.h" #include "../devices/device.h"
typedef void (*AlternateFunction)(void); typedef void (*AlternateFunction)(void);
typedef void (*DriverInitFunction)(void); typedef void (*DriverInitFunction)(void);

2
src/drivers/storage/SDCard.cpp
View File

@ -4,7 +4,7 @@
#include "storage.h" #include "storage.h"
#include "nvMemory.h" #include "nvMemory.h"
#include "..\devices\device.h" #include "../devices/device.h"
#include "SDCard.h" #include "SDCard.h"
#if defined (BUILD_SDMMC_1) || defined(BUILD_SDMMC_4) #if defined (BUILD_SDMMC_1) || defined(BUILD_SDMMC_4)

2
src/drivers/storage/SDCard.h
View File

@ -3,7 +3,7 @@
#include "storage.h" #include "storage.h"
#include "nvMemory.h" #include "nvMemory.h"
#include "..\devices\device.h" #include "../devices/device.h"
// configuration example and description in /devices/esp32cam.h // configuration example and description in /devices/esp32cam.h

2
src/drivers/storage/nvMemory.cpp
View File

@ -6,7 +6,7 @@
#include <FS.h> #include <FS.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include "..\devices\device.h" #include "../devices/device.h"
#include "storage.h" #include "storage.h"
nvMemory::nvMemory() : Initialized_(false){}; nvMemory::nvMemory() : Initialized_(false){};

2
src/drivers/storage/nvMemory.h
View File

@ -4,7 +4,7 @@
// we only have one implementation right now and nothing to choose from. // we only have one implementation right now and nothing to choose from.
#define NVMEM_SPIFFS #define NVMEM_SPIFFS
#include "..\devices\device.h" #include "../devices/device.h"
#include "storage.h" #include "storage.h"
// Handles load and store of user settings, except wifi credentials. Those are managed by the wifimanager. // Handles load and store of user settings, except wifi credentials. Those are managed by the wifimanager.