Skip to content

Commit

Permalink
correct header file naming
Browse files Browse the repository at this point in the history
  • Loading branch information
merlinschumacher committed Sep 8, 2020
1 parent e11e428 commit 46dda44
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
build_tag = env['PIOENV']
print("converting web files to headers");
source_files = ["index.html", "main.js", "timezones.json", "water.css"]
target_files = ["index_html.h", "main_js.h", "timezones_json.h", "water_css.h"]
target_files = ["index_html.hpp", "main_js.hpp", "timezones_json.hpp", "water_css.hpp"]
i = 0
while i < len(source_files):
env.Execute("gzip -c -9 web/"+source_files[i]+"> web/"+source_files[i]+".gz")
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion include/webserver.h → include/webserver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <Update.h>
#include <SPIFFS.h>
#endif
#include "config.h"
#include "config.hpp"

class Webserver
{
Expand Down
2 changes: 1 addition & 1 deletion src/config.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "config.h"
#include "config.hpp"

Config::Config()
{
Expand Down
12 changes: 6 additions & 6 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
#include <WiFiManager.h>
#include <NeoPixelBus.h>
#include <ezTime.h>
#include "webserver.h"
#include "config.h"
#include "vars.h"
#include "timefunc.h"
#include "color.h"
#include "led.h"
#include "webserver.hpp"
#include "config.hpp"
#include "vars.hpp"
#include "timefunc.hpp"
#include "color.hpp"
#include "led.hpp"

void renderSecondHand()
{
Expand Down
10 changes: 5 additions & 5 deletions src/webserver.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "webserver.h"
#include "index_html.h"
#include "main_js.h"
#include "timezones_json.h"
#include "water_css.h"
#include "webserver.hpp"
#include "index_html.hpp"
#include "main_js.hpp"
#include "timezones_json.hpp"
#include "water_css.hpp"

#if defined(ESP8266)
ESP8266WebServer _server(80);
Expand Down

0 comments on commit 46dda44

Please sign in to comment.