Skip to content

Commit

Permalink
Merge pull request #194 from romanmashta/dev_upstream
Browse files Browse the repository at this point in the history
Fix build for MacOS and Linux.
  • Loading branch information
BitMaker-hub authored Oct 2, 2023
2 parents c93e884 + 096b9db commit 0f3661f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/drivers/displays/displayDriver.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef DISPLAYDRIVER_H_
#define DISPLAYDRIVER_H_

#include "..\devices\device.h"
#include "../devices/device.h"

typedef void (*AlternateFunction)(void);
typedef void (*DriverInitFunction)(void);
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/storage/SDCard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "storage.h"
#include "nvMemory.h"
#include "..\devices\device.h"
#include "../devices/device.h"
#include "SDCard.h"

#if defined (BUILD_SDMMC_1) || defined(BUILD_SDMMC_4)
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/storage/SDCard.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "storage.h"
#include "nvMemory.h"
#include "..\devices\device.h"
#include "../devices/device.h"

// configuration example and description in /devices/esp32cam.h

Expand Down
2 changes: 1 addition & 1 deletion src/drivers/storage/nvMemory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <FS.h>
#include <ArduinoJson.h>

#include "..\devices\device.h"
#include "../devices/device.h"
#include "storage.h"

nvMemory::nvMemory() : Initialized_(false){};
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/storage/nvMemory.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// we only have one implementation right now and nothing to choose from.
#define NVMEM_SPIFFS

#include "..\devices\device.h"
#include "../devices/device.h"
#include "storage.h"

// Handles load and store of user settings, except wifi credentials. Those are managed by the wifimanager.
Expand Down

0 comments on commit 0f3661f

Please sign in to comment.