Updated inlcudes

The one thing my Java prof is right about when he hates against C, is that its includes are super annoying...
This commit is contained in:
Stefan Kremser
2018-04-01 16:31:53 +02:00
parent 157f3ff9d5
commit fab38e7c3f
14 changed files with 57 additions and 33 deletions

View File

@@ -3,9 +3,12 @@
#include "Arduino.h" #include "Arduino.h"
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#include "Names.h" extern "C" {
#include "user_interface.h"
}
#include "language.h" #include "language.h"
#include "SimpleList.h" #include "SimpleList.h"
#include "Names.h"
extern Names names; extern Names names;

View File

@@ -3,12 +3,15 @@
#include "Arduino.h" #include "Arduino.h"
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
extern "C" {
#include "user_interface.h"
}
#include "language.h"
#include "Accesspoints.h" #include "Accesspoints.h"
#include "Stations.h" #include "Stations.h"
#include "SSIDs.h" #include "SSIDs.h"
#include "Settings.h" #include "Settings.h"
#include "Scan.h" #include "Scan.h"
#include "language.h"
extern Settings settings; extern Settings settings;
extern SSIDs ssids; extern SSIDs ssids;

View File

@@ -2,11 +2,14 @@
#define DigitalLed_h #define DigitalLed_h
#include "Arduino.h" #include "Arduino.h"
extern "C" {
#include "user_interface.h"
}
#include "language.h"
#include "A_config.h"
#include "Settings.h" #include "Settings.h"
#include "Attack.h" #include "Attack.h"
#include "Scan.h" #include "Scan.h"
#include "language.h"
#include "A_config.h"
#define LED_MODE_OFF 0 #define LED_MODE_OFF 0
#define LED_MODE_SCAN 1 #define LED_MODE_SCAN 1

View File

@@ -4,18 +4,18 @@
#include "Arduino.h" #include "Arduino.h"
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#include <FS.h> #include <FS.h>
extern "C" {
#include "user_interface.h"
}
#include "language.h" #include "language.h"
#include "A_config.h"
#include "Settings.h" #include "Settings.h"
#include "Names.h" #include "Names.h"
#include "SSIDs.h" #include "SSIDs.h"
#include "Scan.h" #include "Scan.h"
#include "Attack.h" #include "Attack.h"
#include "A_config.h"
extern "C" {
#include "user_interface.h"
}
extern Settings settings; extern Settings settings;
extern Names names; extern Names names;

View File

@@ -2,10 +2,14 @@
#define Names_h #define Names_h
#include "Arduino.h" #include "Arduino.h"
#include "FS.h" #include <FS.h>
#include <ESP8266WiFi.h>
extern "C" {
#include "user_interface.h"
}
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include "SimpleList.h"
#include "language.h" #include "language.h"
#include "SimpleList.h"
#define NAME_LIST_SIZE 25 #define NAME_LIST_SIZE 25
#define NAME_MAX_LENGTH 16 #define NAME_MAX_LENGTH 16

View File

@@ -2,12 +2,16 @@
#define Neopixel_h #define Neopixel_h
#include "Arduino.h" #include "Arduino.h"
#include <ESP8266WiFi.h>
extern "C" {
#include "user_interface.h"
}
#include <Adafruit_NeoPixel.h>
#include "language.h"
#include "A_config.h"
#include "Settings.h" #include "Settings.h"
#include "Attack.h" #include "Attack.h"
#include "Scan.h" #include "Scan.h"
#include "language.h"
#include <Adafruit_NeoPixel.h>
#include "A_config.h"
#define LED_MODE_OFF 0 #define LED_MODE_OFF 0
#define LED_MODE_SCAN 1 #define LED_MODE_SCAN 1

View File

@@ -2,11 +2,15 @@
#define RGBLed_h #define RGBLed_h
#include "Arduino.h" #include "Arduino.h"
#include <ESP8266WiFi.h>
extern "C" {
#include "user_interface.h"
}
#include "language.h"
#include "A_config.h"
#include "Settings.h" #include "Settings.h"
#include "Attack.h" #include "Attack.h"
#include "Scan.h" #include "Scan.h"
#include "language.h"
#include "A_config.h"
#define LED_MODE_OFF 0 #define LED_MODE_OFF 0
#define LED_MODE_SCAN 1 #define LED_MODE_SCAN 1

View File

@@ -2,11 +2,15 @@
#define SSIDs_h #define SSIDs_h
#include "Arduino.h" #include "Arduino.h"
#include "FS.h" #include <ESP8266WiFi.h>
#include <FS.h>
extern "C" {
#include "user_interface.h"
}
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include "language.h"
#include "SimpleList.h" #include "SimpleList.h"
#include "Settings.h" #include "Settings.h"
#include "language.h"
#include "Accesspoints.h" #include "Accesspoints.h"
#define SSID_LIST_SIZE 60 #define SSID_LIST_SIZE 60

View File

@@ -2,15 +2,14 @@
#define SerialInterface_h #define SerialInterface_h
#include "Arduino.h" #include "Arduino.h"
#include "pgmspace.h"
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#include <FS.h> #include <FS.h>
extern "C" { extern "C" {
#include "user_interface.h" #include "user_interface.h"
} }
#include "language.h" #include "language.h"
#include "A_config.h"
#include "SimpleList.h"
#include "Settings.h" #include "Settings.h"
#include "Names.h" #include "Names.h"
#include "SSIDs.h" #include "SSIDs.h"
@@ -20,8 +19,6 @@ extern "C" {
#include "DigitalLed.h" #include "DigitalLed.h"
#include "RGBLed.h" #include "RGBLed.h"
#include "Neopixel.h" #include "Neopixel.h"
#include "A_config.h"
#include "SimpleList.h"
#ifdef DIGITAL_LED #ifdef DIGITAL_LED
extern DigitalLed led; extern DigitalLed led;

View File

@@ -2,14 +2,13 @@
#define Settings_h #define Settings_h
#include "Arduino.h" #include "Arduino.h"
#include "FS.h" #include <FS.h>
#include <ArduinoJson.h>
#include "language.h"
#include "A_config.h"
extern "C" { extern "C" {
#include "user_interface.h" #include "user_interface.h"
} }
#include <ArduinoJson.h>
#include "language.h"
#include "A_config.h"
#define VERSION "v2.0.1" #define VERSION "v2.0.1"

View File

@@ -44,7 +44,6 @@ class SimpleList{
Node<T>* getNode(int index); Node<T>* getNode(int index);
}; };
// Initialize LinkedList with default values
template<typename T> template<typename T>
SimpleList<T>::SimpleList(){ SimpleList<T>::SimpleList(){
listBegin = NULL; listBegin = NULL;

View File

@@ -5,10 +5,10 @@
extern "C" { extern "C" {
#include "user_interface.h" #include "user_interface.h"
} }
#include "Accesspoints.h"
#include "Names.h"
#include "language.h" #include "language.h"
#include "SimpleList.h" #include "SimpleList.h"
#include "Accesspoints.h"
#include "Names.h"
#define STATION_LIST_SIZE 60 #define STATION_LIST_SIZE 60
extern Accesspoints accesspoints; extern Accesspoints accesspoints;

View File

@@ -1,12 +1,12 @@
#ifndef functions_h #ifndef functions_h
#define functions_h #define functions_h
#include "Arduino.h"
#include <FS.h> #include <FS.h>
#include "ArduinoJson.h"
extern "C" { extern "C" {
#include "user_interface.h" #include "user_interface.h"
} }
#include <ArduinoJson.h>
/* /*
Here is a collection of useful functions and variables. Here is a collection of useful functions and variables.

View File

@@ -1,12 +1,16 @@
#ifndef WifiManager_h #ifndef WifiManager_h
#define WifiManager_h #define WifiManager_h
#include "Arduino.h"
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#include <WiFiClient.h> #include <WiFiClient.h>
#include <ESP8266WebServer.h> #include <ESP8266WebServer.h>
#include <DNSServer.h> #include <DNSServer.h>
#include <ESP8266mDNS.h> #include <ESP8266mDNS.h>
#include <FS.h> #include <FS.h>
extern "C" {
#include "user_interface.h"
}
#define WIFI_MODE_OFF 0 #define WIFI_MODE_OFF 0
#define WIFI_MODE_AP 1 #define WIFI_MODE_AP 1