Browse Source

move http and ota to lib/ for testing, add #pragma once include guards

tags/FSM1.0
Simon Schmidt 3 years ago
parent
commit
014aa028d7

+ 2
- 1
.vscode/settings.json View File

@@ -48,5 +48,6 @@
"streambuf": "cpp",
"cinttypes": "cpp",
"typeinfo": "cpp"
}
},
"python.pythonPath": "C:\\Users\\simon\\AppData\\Local\\Programs\\Python\\Python37\\python.exe"
}

+ 2
- 6
include/ota.h View File

@@ -1,5 +1,4 @@
#ifndef __OTA_H
#define __OTA_H
#pragma once

#include <ESP8266WiFi.h>
#include <WiFiUdp.h>
@@ -46,7 +45,4 @@ void ota_setup() {
});
ArduinoOTA.begin();

}


#endif // __OTA_H
}

src/filesys.cpp → lib/httpserver/filesys.cpp View File


include/filesys.h → lib/httpserver/filesys.h View File

@@ -1,5 +1,4 @@
#ifndef __FILESYS_H
#define __FILESYS_H
#pragma once

#include <LittleFS.h>

@@ -12,5 +11,3 @@ void writeFile(const char * path, const char * message);
void appendFile(const char * path, const char * message);
void renameFile(const char * path1, const char * path2);
void deleteFile(const char * path);

#endif // __FILESYS_H

src/httpserver.cpp → lib/httpserver/httpserver.cpp View File


include/httpserver.h → lib/httpserver/httpserver.h View File

@@ -1,10 +1,8 @@
#ifndef __HTTPSERVER_H
#define __HTTPSERVER_H
#pragma once

#include "filesys.h"
#include <ESP8266WebServer.h>


class HTTPServer : public ESP8266WebServer {
private:
const char* rootDir;
@@ -44,5 +42,3 @@ public:
return false;
}
};

#endif // __HTTPSERVER_H

+ 1
- 1
src/main.cpp View File

@@ -9,8 +9,8 @@ extern "C" {
#include "user_interface.h"
}
// OTA & WEB
#include "ota.h"
#include "wifi_credentials.h"
#include "ota.h"
#include "httpserver.h"

// BOARD

Loading…
Cancel
Save