Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change spiffs to spiffsb to enable compile on Windows with VSCode and PlatformIO #38

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change spiffs to spiffsb to enable compile on Windows with VSCode and PlatformIO #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.pio/
.git-commit-hash
.vscode/
2 changes: 1 addition & 1 deletion include/json-rpc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "config.h"
#include "logger.h"
#include "main.h"
#include "spiffs.h"
#include "spiffsb.h"

#include <ArduinoJson.h>
#include <string>
Expand Down
3 changes: 2 additions & 1 deletion include/logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
#define BLESKOMAT_LOGGER_H

#include "config.h"
#include "spiffs.h"
#include "spiffsb.h"

#include <Arduino.h>
#include <iostream>
#include <map>
Expand Down
1 change: 0 additions & 1 deletion include/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "json-rpc.h"
#include "logger.h"
#include "screen.h"
#include "spiffs.h"
#include "util.h"

#include <lnurl.h>
Expand Down
1 change: 1 addition & 0 deletions include/sdcard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "FS.h"
#include "SD.h"
#include "SPI.h"

#include <iostream>
#include <string>

Expand Down
1 change: 1 addition & 0 deletions include/spiffs.h → include/spiffsb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "FS.h"
#include "SPIFFS.h"

#include <iostream>
#include <string>

Expand Down
3 changes: 2 additions & 1 deletion platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ build_flags =
build_flags =
'-D FIRMWARE_NAME="Bleskomat DIY"'
'-D FIRMWARE_VERSION="v1.3.0"'
!echo "'-D FIRMWARE_COMMIT_HASH=\"$(head -1 .git-commit-hash 2>/dev/null || echo -n)\"'"
'-D FIRMWARE_COMMIT_HASH="win"'
; !echo "'-D FIRMWARE_COMMIT_HASH=\"$(git rev-parse HEAD)\"'"

[env:bleskomat32]
board = esp32dev
Expand Down
2 changes: 1 addition & 1 deletion src/spiffs.cpp → src/spiffsb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "spiffs.h"
#include "spiffsb.h"

namespace {

Expand Down