GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-15 00:36:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code formating using astyle --style=otbs *.h *.cpp *.ino

Browse Source 
To get nice looking code with a minimum effort
This commit is contained in:
Luc 2016-01-25 23:38:26 +08:00
parent 0c306a2aff
commit 70228adb3d
12 changed files with 3832 additions and 3639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
esp8266/LinkedList.h
View File

@ -15,14 +15,14 @@
#define LinkedList_h #define LinkedList_h
template<class T> template<class T>
struct ListNode struct ListNode {
{
T data; T data;
ListNode<T> *next; ListNode<T> *next;
}; };
template <typename T> template <typename T>
class LinkedList{ class LinkedList
{
protected: protected:
int _size; int _size;
@ -113,8 +113,7 @@ template<typename T>
LinkedList<T>::~LinkedList() LinkedList<T>::~LinkedList()
{ {
ListNode<T>* tmp; ListNode<T>* tmp;
while(root!=NULL) while(root!=NULL) {
{
tmp=root; tmp=root;
root=root->next; root=root->next;
delete tmp; delete tmp;
@ -129,7 +128,8 @@ LinkedList<T>::~LinkedList()
*/ */
template<typename T> template<typename T>
ListNode<T>* LinkedList<T>::getNode(int index){ ListNode<T>* LinkedList<T>::getNode(int index)
{
int _pos = 0; int _pos = 0;
ListNode<T>* current = root; ListNode<T>* current = root;
@ -160,18 +160,22 @@ ListNode<T>* LinkedList<T>::getNode(int index){
} }
template<typename T> template<typename T>
int LinkedList<T>::size(){ int LinkedList<T>::size()
{
return _size; return _size;
} }
template<typename T> template<typename T>
bool LinkedList<T>::add(int index, T _t){ bool LinkedList<T>::add(int index, T _t)
{
if(index >= _size) if(index >= _size) {
return add(_t); return add(_t);
}
if(index == 0) if(index == 0) {
return unshift(_t); return unshift(_t);
}
ListNode<T> *tmp = new ListNode<T>(), ListNode<T> *tmp = new ListNode<T>(),
*_prev = getNode(index-1); *_prev = getNode(index-1);
@ -186,7 +190,8 @@ bool LinkedList<T>::add(int index, T _t){
} }
template<typename T> template<typename T>
bool LinkedList<T>::add(T _t){ bool LinkedList<T>::add(T _t)
{
ListNode<T> *tmp = new ListNode<T>(); ListNode<T> *tmp = new ListNode<T>();
tmp->data = _t; tmp->data = _t;
@ -209,10 +214,12 @@ bool LinkedList<T>::add(T _t){
} }
template<typename T> template<typename T>
bool LinkedList<T>::unshift(T _t){ bool LinkedList<T>::unshift(T _t)
{
if(_size == 0) if(_size == 0) {
return add(_t); return add(_t);
}
ListNode<T> *tmp = new ListNode<T>(); ListNode<T> *tmp = new ListNode<T>();
tmp->next = root; tmp->next = root;
@ -226,19 +233,23 @@ bool LinkedList<T>::unshift(T _t){
} }
template<typename T> template<typename T>
bool LinkedList<T>::set(int index, T _t){ bool LinkedList<T>::set(int index, T _t)
{
// Check if index position is in bounds // Check if index position is in bounds
if(index < 0 || index >= _size) if(index < 0 || index >= _size) {
return false; return false;
}
getNode(index)->data = _t; getNode(index)->data = _t;
return true; return true;
} }
template<typename T> template<typename T>
T LinkedList<T>::pop(){ T LinkedList<T>::pop()
if(_size <= 0) {
if(_size <= 0) {
return T(); return T();
}
isCached = false; isCached = false;
@ -262,9 +273,11 @@ T LinkedList<T>::pop(){
} }
template<typename T> template<typename T>
T LinkedList<T>::shift(){ T LinkedList<T>::shift()
if(_size <= 0) {
if(_size <= 0) {
return T(); return T();
}
if(_size > 1) { if(_size > 1) {
ListNode<T> *_next = root->next; ListNode<T> *_next = root->next;
@ -283,17 +296,17 @@ T LinkedList<T>::shift(){
} }
template<typename T> template<typename T>
T LinkedList<T>::remove(int index){ T LinkedList<T>::remove(int index)
if (index < 0 || index >= _size)
{ {
if (index < 0 || index >= _size) {
return T(); return T();
} }
if(index == 0) if(index == 0) {
return shift(); return shift();
}
if (index == _size-1) if (index == _size-1) {
{
return pop(); return pop();
} }
@ -309,16 +322,19 @@ T LinkedList<T>::remove(int index){
template<typename T> template<typename T>
T LinkedList<T>::get(int index){ T LinkedList<T>::get(int index)
{
ListNode<T> *tmp = getNode(index); ListNode<T> *tmp = getNode(index);
return (tmp ? tmp->data : T()); return (tmp ? tmp->data : T());
} }
template<typename T> template<typename T>
void LinkedList<T>::clear(){ void LinkedList<T>::clear()
while(size() > 0) {
while(size() > 0) {
shift(); shift();
} }
}
#endif #endif

198
esp8266/command.cpp
View File

@ -34,38 +34,57 @@ void COMMAND::execute_command(int cmd,String cmd_params)
{ {
//manage parameters //manage parameters
switch(cmd) switch(cmd) {
{
byte mode; byte mode;
case 800: case 800:
Serial.println("\nCommand received"); Serial.println("\nCommand received");
break; break;
case 100: case 100:
if(!CONFIG::write_string(EP_SSID,cmd_params.c_str()))Serial.println("\nError"); if(!CONFIG::write_string(EP_SSID,cmd_params.c_str())) {
else Serial.println("\nOk"); Serial.println("\nError");
} else {
Serial.println("\nOk");
}
break; break;
case 101: case 101:
if(!CONFIG::write_string(EP_PASSWORD,cmd_params.c_str()))Serial.println("\nError"); if(!CONFIG::write_string(EP_PASSWORD,cmd_params.c_str())) {
else Serial.println("\nOk"); Serial.println("\nError");
} else {
Serial.println("\nOk");
}
break; break;
case 103: case 103:
if (cmd_params=="STA")mode = CLIENT_MODE; if (cmd_params=="STA") {
else mode=AP_MODE; mode = CLIENT_MODE;
if(!CONFIG::write_byte(EP_WIFI_MODE,mode))Serial.println("\nError"); } else {
else Serial.println("\nOk"); mode=AP_MODE;
}
if(!CONFIG::write_byte(EP_WIFI_MODE,mode)) {
Serial.println("\nError");
} else {
Serial.println("\nOk");
}
break; break;
case 104: case 104:
if (cmd_params=="STATIC")mode = STATIC_IP_MODE; if (cmd_params=="STATIC") {
else mode=DHCP_MODE; mode = STATIC_IP_MODE;
if(!CONFIG::write_byte(EP_IP_MODE,mode))Serial.println("\nError"); } else {
else Serial.println("\nOk"); mode=DHCP_MODE;
}
if(!CONFIG::write_byte(EP_IP_MODE,mode)) {
Serial.println("\nError");
} else {
Serial.println("\nOk");
}
break; break;
case 111: case 111: {
{
String currentIP ; String currentIP ;
if (wifi_get_opmode()==WIFI_STA)currentIP=WiFi.localIP().toString(); if (wifi_get_opmode()==WIFI_STA) {
else currentIP=WiFi.softAPIP().toString(); currentIP=WiFi.localIP().toString();
} else {
currentIP=WiFi.softAPIP().toString();
}
Serial.print("\n\r"); Serial.print("\n\r");
Serial.print(cmd_params); Serial.print(cmd_params);
Serial.println(currentIP); Serial.println(currentIP);
@ -73,22 +92,18 @@ void COMMAND::execute_command(int cmd,String cmd_params)
} }
break; break;
case 444: case 444:
if (cmd_params=="RESET") if (cmd_params=="RESET") {
{
CONFIG::reset_config(); CONFIG::reset_config();
} }
if (cmd_params=="SAFEMODE") if (cmd_params=="SAFEMODE") {
{
wifi_config.Safe_Setup(); wifi_config.Safe_Setup();
} }
if (cmd_params=="CONFIG") if (cmd_params=="CONFIG") {
{
CONFIG::print_config(); CONFIG::print_config();
} }
break; break;
case 888: case 888:
if (cmd_params=="RESTART") if (cmd_params=="RESTART") {
{
Serial.print("\r"); Serial.print("\r");
Serial.print(cmd_params); Serial.print(cmd_params);
web_interface->restartmodule=true; web_interface->restartmodule=true;
@ -96,20 +111,13 @@ void COMMAND::execute_command(int cmd,String cmd_params)
} }
break; break;
case 999: case 999:
if (cmd_params=="ERROR") if (cmd_params=="ERROR") {
{
web_interface->error_msg.clear(); web_interface->error_msg.clear();
} } else if (cmd_params=="INFO") {
else if (cmd_params=="INFO")
{
web_interface->info_msg.clear(); web_interface->info_msg.clear();
} } else if (cmd_params=="STATUS") {
else if (cmd_params=="STATUS")
{
web_interface->status_msg.clear(); web_interface->status_msg.clear();
} } else if (cmd_params=="ALL") {
else if (cmd_params=="ALL")
{
web_interface->error_msg.clear(); web_interface->error_msg.clear();
web_interface->status_msg.clear(); web_interface->status_msg.clear();
web_interface->info_msg.clear(); web_interface->info_msg.clear();
@ -125,11 +133,9 @@ void COMMAND::check_command(String buffer)
String ESP_Command; String ESP_Command;
static bool bfileslist=false; static bool bfileslist=false;
static uint32_t start_list=0; static uint32_t start_list=0;
if (!bfileslist) if (!bfileslist) {
{
int filesstart = buffer.indexOf("Begin file list"); int filesstart = buffer.indexOf("Begin file list");
if (filesstart>-1) if (filesstart>-1) {
{
Serial.print("Starting"); Serial.print("Starting");
start_list=system_get_time(); start_list=system_get_time();
bfileslist=true; bfileslist=true;
@ -145,65 +151,68 @@ void COMMAND::check_command(String buffer)
int Errorpos= buffer.indexOf("Error:"); int Errorpos= buffer.indexOf("Error:");
int Infopos= buffer.indexOf("Info:"); int Infopos= buffer.indexOf("Info:");
int Statuspos= buffer.indexOf("Status:"); int Statuspos= buffer.indexOf("Status:");
if (ESPpos>-1) if (ESPpos>-1) {
{//is there the second part? //is there the second part?
int ESPpos2 = buffer.indexOf("]",ESPpos); int ESPpos2 = buffer.indexOf("]",ESPpos);
if (ESPpos2>-1) if (ESPpos2>-1) {
{ //Split in command and parameters //Split in command and parameters
String cmd_part1=buffer.substring(ESPpos+4,ESPpos2); String cmd_part1=buffer.substring(ESPpos+4,ESPpos2);
String cmd_part2=""; String cmd_part2="";
//is there space for parameters? //is there space for parameters?
if (ESPpos2<buffer.length()) if (ESPpos2<buffer.length()) {
{
cmd_part2=buffer.substring(ESPpos2+1); cmd_part2=buffer.substring(ESPpos2+1);
} }
//if command is a valid number then execute command //if command is a valid number then execute command
if(cmd_part1.toInt()!=0)execute_command(cmd_part1.toInt(),cmd_part2); if(cmd_part1.toInt()!=0) {
execute_command(cmd_part1.toInt(),cmd_part2);
}
//if not is not a valid [ESPXXX] command //if not is not a valid [ESPXXX] command
} }
} }
//check for temperature //check for temperature
if (Tpos>-1) if (Tpos>-1) {
{
//look for valid temperature answer //look for valid temperature answer
int slashpos = buffer.indexOf(" /",Tpos); int slashpos = buffer.indexOf(" /",Tpos);
int spacepos = buffer.indexOf(" ",slashpos+1); int spacepos = buffer.indexOf(" ",slashpos+1);
//if match mask T:xxx.xx /xxx.xx //if match mask T:xxx.xx /xxx.xx
if(spacepos-Tpos < 17) if(spacepos-Tpos < 17) {
{
web_interface->answer4M105=buffer; //do not interprete just need when requested so store it web_interface->answer4M105=buffer; //do not interprete just need when requested so store it
web_interface->last_temp=system_get_time(); web_interface->last_temp=system_get_time();
} }
} }
//Position of axis //Position of axis
if (Xpos>-1 && Ypos>-1 && Zpos>-1)web_interface->answer4M114=buffer; if (Xpos>-1 && Ypos>-1 && Zpos>-1) {
//Speed web_interface->answer4M114=buffer;
if (Speedpos>-1)web_interface->answer4M220=buffer.substring(Speedpos+14);
//Flow
if (Flowpos>-1)web_interface->answer4M221=buffer.substring(Flowpos+13);
//Error
if (Errorpos>-1 && !(buffer.indexOf("Format error")!=-1 || buffer.indexOf("wait")==Errorpos+6) )(web_interface->error_msg).add(buffer.substring(Errorpos+6).c_str());
//Info
if (Infopos>-1)(web_interface->info_msg).add(buffer.substring(Infopos+5).c_str());
//Status
if (Statuspos>-1)(web_interface->status_msg).add(buffer.substring(Statuspos+7).c_str());
} }
else //Speed
{ if (Speedpos>-1) {
if ((system_get_time()-start_list)>30000000) //timeout in case of problem web_interface->answer4M220=buffer.substring(Speedpos+14);
{ }
//Flow
if (Flowpos>-1) {
web_interface->answer4M221=buffer.substring(Flowpos+13);
}
//Error
if (Errorpos>-1 && !(buffer.indexOf("Format error")!=-1 || buffer.indexOf("wait")==Errorpos+6) ) {
(web_interface->error_msg).add(buffer.substring(Errorpos+6).c_str());
}
//Info
if (Infopos>-1) {
(web_interface->info_msg).add(buffer.substring(Infopos+5).c_str());
}
//Status
if (Statuspos>-1) {
(web_interface->status_msg).add(buffer.substring(Statuspos+7).c_str());
}
} else {
if ((system_get_time()-start_list)>30000000) { //timeout in case of problem
bfileslist=false; bfileslist=false;
Serial.print("time out"); Serial.print("time out");
} } else {
else if (buffer.indexOf("End file list")>-1) {
{
if (buffer.indexOf("End file list")>-1)
{
Serial.print("Ending"); Serial.print("Ending");
bfileslist=false; bfileslist=false;
} } else {
else
{
Serial.print(buffer); Serial.print(buffer);
web_interface->fileslist.add(buffer); web_interface->fileslist.add(buffer);
} }
@ -215,8 +224,7 @@ void COMMAND::check_command(String buffer)
//read a buffer in an array //read a buffer in an array
void COMMAND::read_buffer_serial(uint8_t *b, size_t len) void COMMAND::read_buffer_serial(uint8_t *b, size_t len)
{ {
for (long i; i< len;i++) for (long i; i< len; i++) {
{
read_buffer_serial(*b); read_buffer_serial(*b);
*b++; *b++;
} }
@ -227,45 +235,45 @@ void COMMAND::read_buffer_tcp(uint8_t b)
{ {
static bool previous_was_char=false; static bool previous_was_char=false;
//to ensure it is continuous string, no char separated by binaries //to ensure it is continuous string, no char separated by binaries
if (!previous_was_char)buffer_tcp=""; if (!previous_was_char) {
buffer_tcp="";
}
//it is a char so add it to buffer //it is a char so add it to buffer
if (isPrintable(b)) if (isPrintable(b)) {
{
previous_was_char=true; previous_was_char=true;
buffer_tcp+=char(b); buffer_tcp+=char(b);
} } else {
else
{
previous_was_char=false; //next call will reset the buffer previous_was_char=false; //next call will reset the buffer
} }
//this is not printable but end of command check if need to handle it //this is not printable but end of command check if need to handle it
if (b==13 ||b==10) if (b==13 ||b==10) {
{//Minimum is something like M10 so 3 char //Minimum is something like M10 so 3 char
if (buffer_tcp.length()>3) if (buffer_tcp.length()>3) {
check_command(buffer_tcp); check_command(buffer_tcp);
} }
} }
}
//read buffer as char //read buffer as char
void COMMAND::read_buffer_serial(uint8_t b) void COMMAND::read_buffer_serial(uint8_t b)
{ {
static bool previous_was_char=false; static bool previous_was_char=false;
//to ensure it is continuous string, no char separated by binaries //to ensure it is continuous string, no char separated by binaries
if (!previous_was_char)buffer_serial=""; if (!previous_was_char) {
buffer_serial="";
}
//it is a char so add it to buffer //it is a char so add it to buffer
if (isPrintable(b)) if (isPrintable(b)) {
{
previous_was_char=true; previous_was_char=true;
buffer_serial+=char(b); buffer_serial+=char(b);
} } else {
else
{
previous_was_char=false; //next call will reset the buffer previous_was_char=false; //next call will reset the buffer
} }
//this is not printable but end of command check if need to handle it //this is not printable but end of command check if need to handle it
if (b==13 ||b==10) if (b==13 ||b==10) {
{//Minimum is something like M10 so 3 char //Minimum is something like M10 so 3 char
if (buffer_serial.length()>3) if (buffer_serial.length()>3) {
check_command(buffer_serial); check_command(buffer_serial);
} }
} }
}

314
esp8266/config.cpp
View File

@ -29,21 +29,24 @@ extern "C" {
bool CONFIG::read_string(int pos, char byte_buffer[], int size_max) bool CONFIG::read_string(int pos, char byte_buffer[], int size_max)
{ {
//check if parameters are acceptable //check if parameters are acceptable
if (size_max==0 || pos+size_max+1 > EEPROM_SIZE || byte_buffer== NULL)return false; if (size_max==0 || pos+size_max+1 > EEPROM_SIZE || byte_buffer== NULL) {
return false;
}
EEPROM.begin(EEPROM_SIZE); EEPROM.begin(EEPROM_SIZE);
byte b = 13; // non zero for the while loop below byte b = 13; // non zero for the while loop below
int i=0; int i=0;
//read until max size is reached or \0 is found //read until max size is reached or \0 is found
while (i < size_max && b != 0) while (i < size_max && b != 0) {
{
b = EEPROM.read(pos+i); b = EEPROM.read(pos+i);
byte_buffer[i]=b; byte_buffer[i]=b;
i++; i++;
} }
// Be sure there is a 0 at the end. // Be sure there is a 0 at the end.
if (b!=0)byte_buffer[i-1]=0x00; if (b!=0) {
byte_buffer[i-1]=0x00;
}
EEPROM.end(); EEPROM.end();
return true; return true;
@ -52,15 +55,16 @@ bool CONFIG::read_string(int pos, char byte_buffer[], int size_max)
bool CONFIG::read_string(int pos, String & sbuffer, int size_max) bool CONFIG::read_string(int pos, String & sbuffer, int size_max)
{ {
//check if parameters are acceptable //check if parameters are acceptable
if (size_max==0 || pos+size_max+1 > EEPROM_SIZE )return false; if (size_max==0 || pos+size_max+1 > EEPROM_SIZE ) {
return false;
}
byte b = 13; // non zero for the while loop below byte b = 13; // non zero for the while loop below
int i=0; int i=0;
sbuffer=""; sbuffer="";
EEPROM.begin(EEPROM_SIZE); EEPROM.begin(EEPROM_SIZE);
//read until max size is reached or \0 is found //read until max size is reached or \0 is found
while (i < size_max && b != 0) while (i < size_max && b != 0) {
{
b = EEPROM.read(pos+i); b = EEPROM.read(pos+i);
sbuffer+=char(b); sbuffer+=char(b);
i++; i++;
@ -74,12 +78,13 @@ bool CONFIG::read_string(int pos, String & sbuffer, int size_max)
bool CONFIG::read_buffer(int pos, byte byte_buffer[], int size_buffer) bool CONFIG::read_buffer(int pos, byte byte_buffer[], int size_buffer)
{ {
//check if parameters are acceptable //check if parameters are acceptable
if (size_buffer==0 || pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL)return false; if (size_buffer==0 || pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL) {
return false;
}
int i=0; int i=0;
EEPROM.begin(EEPROM_SIZE); EEPROM.begin(EEPROM_SIZE);
//read until max size is reached //read until max size is reached
while (i<size_buffer ) while (i<size_buffer ) {
{
byte_buffer[i]=EEPROM.read(pos+i); byte_buffer[i]=EEPROM.read(pos+i);
i++; i++;
} }
@ -91,7 +96,9 @@ bool CONFIG::read_buffer(int pos, byte byte_buffer[], int size_buffer)
bool CONFIG::read_byte(int pos, byte * value) bool CONFIG::read_byte(int pos, byte * value)
{ {
//check if parameters are acceptable //check if parameters are acceptable
if (pos+1 > EEPROM_SIZE)return false; if (pos+1 > EEPROM_SIZE) {
return false;
}
EEPROM.begin(EEPROM_SIZE); EEPROM.begin(EEPROM_SIZE);
value[0] = EEPROM.read(pos); value[0] = EEPROM.read(pos);
EEPROM.end(); EEPROM.end();
@ -110,7 +117,9 @@ bool CONFIG::write_string(int pos, const char * byte_buffer)
int size_buffer; int size_buffer;
size_buffer= strlen(byte_buffer); size_buffer= strlen(byte_buffer);
//check if parameters are acceptable //check if parameters are acceptable
if (size_buffer==0 || pos+size_buffer+1 > EEPROM_SIZE || byte_buffer== NULL)return false; if (size_buffer==0 || pos+size_buffer+1 > EEPROM_SIZE || byte_buffer== NULL) {
return false;
}
//copy the value(s) //copy the value(s)
EEPROM.begin(EEPROM_SIZE); EEPROM.begin(EEPROM_SIZE);
for (int i = 0; i < size_buffer; i++) { for (int i = 0; i < size_buffer; i++) {
@ -128,7 +137,9 @@ bool CONFIG::write_string(int pos, const char * byte_buffer)
bool CONFIG::write_buffer(int pos, const byte * byte_buffer, int size_buffer) bool CONFIG::write_buffer(int pos, const byte * byte_buffer, int size_buffer)
{ {
//check if parameters are acceptable //check if parameters are acceptable
if (size_buffer==0 || pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL)return false; if (size_buffer==0 || pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL) {
return false;
}
EEPROM.begin(EEPROM_SIZE); EEPROM.begin(EEPROM_SIZE);
//copy the value(s) //copy the value(s)
for (int i = 0; i < size_buffer; i++) { for (int i = 0; i < size_buffer; i++) {
@ -143,7 +154,9 @@ bool CONFIG::write_buffer(int pos, const byte * byte_buffer, int size_buffer)
bool CONFIG::write_byte(int pos, const byte value) bool CONFIG::write_byte(int pos, const byte value)
{ {
//check if parameters are acceptable //check if parameters are acceptable
if (pos+1 > EEPROM_SIZE)return false; if (pos+1 > EEPROM_SIZE) {
return false;
}
EEPROM.begin(EEPROM_SIZE); EEPROM.begin(EEPROM_SIZE);
EEPROM.write(pos, value); EEPROM.write(pos, value);
EEPROM.commit(); EEPROM.commit();
@ -153,27 +166,69 @@ bool CONFIG::write_byte(int pos, const byte value)
bool CONFIG::reset_config() bool CONFIG::reset_config()
{ {
if(!CONFIG::write_byte(EP_WIFI_MODE,DEFAULT_WIFI_MODE))return false; if(!CONFIG::write_byte(EP_WIFI_MODE,DEFAULT_WIFI_MODE)) {
if(!CONFIG::write_string(EP_SSID,FPSTR(DEFAULT_SSID)))return false; return false;
if(!CONFIG::write_string(EP_PASSWORD,FPSTR(DEFAULT_PASSWORD)))return false; }
if(!CONFIG::write_byte(EP_IP_MODE,DEFAULT_IP_MODE))return false; if(!CONFIG::write_string(EP_SSID,FPSTR(DEFAULT_SSID))) {
if(!CONFIG::write_buffer(EP_IP_VALUE,DEFAULT_IP_VALUE,IP_LENGTH))return false; return false;
if(!CONFIG::write_buffer(EP_MASK_VALUE,DEFAULT_MASK_VALUE,IP_LENGTH))return false; }
if(!CONFIG::write_buffer(EP_GATEWAY_VALUE,DEFAULT_GATEWAY_VALUE,IP_LENGTH))return false; if(!CONFIG::write_string(EP_PASSWORD,FPSTR(DEFAULT_PASSWORD))) {
if(!CONFIG::write_buffer(EP_BAUD_RATE,(const byte *)&DEFAULT_BAUD_RATE,INTEGER_LENGTH))return false; return false;
if(!CONFIG::write_byte(EP_PHY_MODE,DEFAULT_PHY_MODE))return false; }
if(!CONFIG::write_byte(EP_SLEEP_MODE,DEFAULT_SLEEP_MODE))return false; if(!CONFIG::write_byte(EP_IP_MODE,DEFAULT_IP_MODE)) {
if(!CONFIG::write_byte(EP_CHANNEL,DEFAULT_CHANNEL))return false; return false;
if(!CONFIG::write_byte(EP_AUTH_TYPE,DEFAULT_AUTH_TYPE))return false; }
if(!CONFIG::write_byte(EP_SSID_VISIBLE,DEFAULT_SSID_VISIBLE))return false; if(!CONFIG::write_buffer(EP_IP_VALUE,DEFAULT_IP_VALUE,IP_LENGTH)) {
if(!CONFIG::write_buffer(EP_WEB_PORT,(const byte *)&DEFAULT_WEB_PORT,INTEGER_LENGTH))return false; return false;
if(!CONFIG::write_buffer(EP_DATA_PORT,(const byte *)&DEFAULT_DATA_PORT,INTEGER_LENGTH))return false; }
if(!CONFIG::write_byte(EP_REFRESH_PAGE_TIME,DEFAULT_REFRESH_PAGE_TIME))return false; if(!CONFIG::write_buffer(EP_MASK_VALUE,DEFAULT_MASK_VALUE,IP_LENGTH)) {
if(!CONFIG::write_string(EP_HOSTNAME,wifi_config.get_default_hostname()))return false; return false;
if(!CONFIG::write_buffer(EP_XY_FEEDRATE,(const byte *)&DEFAULT_XY_FEEDRATE,INTEGER_LENGTH))return false; }
if(!CONFIG::write_buffer(EP_Z_FEEDRATE,(const byte *)&DEFAULT_Z_FEEDRATE,INTEGER_LENGTH))return false; if(!CONFIG::write_buffer(EP_GATEWAY_VALUE,DEFAULT_GATEWAY_VALUE,IP_LENGTH)) {
if(!CONFIG::write_buffer(EP_E_FEEDRATE,(const byte *)&DEFAULT_E_FEEDRATE,INTEGER_LENGTH))return false; return false;
if(!CONFIG::write_string(EP_ADMIN_PWD,FPSTR(DEFAULT_ADMIN)))return false; }
if(!CONFIG::write_buffer(EP_BAUD_RATE,(const byte *)&DEFAULT_BAUD_RATE,INTEGER_LENGTH)) {
return false;
}
if(!CONFIG::write_byte(EP_PHY_MODE,DEFAULT_PHY_MODE)) {
return false;
}
if(!CONFIG::write_byte(EP_SLEEP_MODE,DEFAULT_SLEEP_MODE)) {
return false;
}
if(!CONFIG::write_byte(EP_CHANNEL,DEFAULT_CHANNEL)) {
return false;
}
if(!CONFIG::write_byte(EP_AUTH_TYPE,DEFAULT_AUTH_TYPE)) {
return false;
}
if(!CONFIG::write_byte(EP_SSID_VISIBLE,DEFAULT_SSID_VISIBLE)) {
return false;
}
if(!CONFIG::write_buffer(EP_WEB_PORT,(const byte *)&DEFAULT_WEB_PORT,INTEGER_LENGTH)) {
return false;
}
if(!CONFIG::write_buffer(EP_DATA_PORT,(const byte *)&DEFAULT_DATA_PORT,INTEGER_LENGTH)) {
return false;
}
if(!CONFIG::write_byte(EP_REFRESH_PAGE_TIME,DEFAULT_REFRESH_PAGE_TIME)) {
return false;
}
if(!CONFIG::write_string(EP_HOSTNAME,wifi_config.get_default_hostname())) {
return false;
}
if(!CONFIG::write_buffer(EP_XY_FEEDRATE,(const byte *)&DEFAULT_XY_FEEDRATE,INTEGER_LENGTH)) {
return false;
}
if(!CONFIG::write_buffer(EP_Z_FEEDRATE,(const byte *)&DEFAULT_Z_FEEDRATE,INTEGER_LENGTH)) {
return false;
}
if(!CONFIG::write_buffer(EP_E_FEEDRATE,(const byte *)&DEFAULT_E_FEEDRATE,INTEGER_LENGTH)) {
return false;
}
if(!CONFIG::write_string(EP_ADMIN_PWD,FPSTR(DEFAULT_ADMIN))) {
return false;
}
return true; return true;
} }
@ -183,156 +238,185 @@ void CONFIG::print_config()
char sbuf[MAX_PASSWORD_LENGTH+1]; char sbuf[MAX_PASSWORD_LENGTH+1];
byte bbuf=0; byte bbuf=0;
int ibuf=0; int ibuf=0;
if (CONFIG::read_byte(EP_WIFI_MODE, &bbuf )) if (CONFIG::read_byte(EP_WIFI_MODE, &bbuf )) {
{
Serial.print(F("Mode: ")); Serial.print(F("Mode: "));
if (byte(bbuf) == CLIENT_MODE) Serial.println(F("Station")); if (byte(bbuf) == CLIENT_MODE) {
else if (byte(bbuf)==AP_MODE) Serial.println(F("Access Point")); Serial.println(F("Station"));
else Serial.println("???"); } else if (byte(bbuf)==AP_MODE) {
Serial.println(F("Access Point"));
} else {
Serial.println("???");
}
} else {
Serial.println(F("Error reading mode"));
} }
else Serial.println(F("Error reading mode"));
if (CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH)) if (CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH)) {
{
Serial.print(F("SSID: ")); Serial.print(F("SSID: "));
Serial.println(sbuf); Serial.println(sbuf);
} else {
Serial.println(F("Error reading SSID"));
} }
else Serial.println(F("Error reading SSID"));
//if (CONFIG::read_string(EP_PASSWORD, sbuf , MAX_PASSWORD_LENGTH))Serial.println(sbuf); //if (CONFIG::read_string(EP_PASSWORD, sbuf , MAX_PASSWORD_LENGTH))Serial.println(sbuf);
if (CONFIG::read_byte(EP_IP_MODE, &bbuf )) if (CONFIG::read_byte(EP_IP_MODE, &bbuf )) {
{
Serial.print(F("IP Mode: ")); Serial.print(F("IP Mode: "));
if (byte(bbuf)==STATIC_IP_MODE) Serial.println(F("Static")); if (byte(bbuf)==STATIC_IP_MODE) {
else if (byte(bbuf)==DHCP_MODE) Serial.println(F("DHCP")); Serial.println(F("Static"));
else Serial.println(F("???")); } else if (byte(bbuf)==DHCP_MODE) {
Serial.println(F("DHCP"));
} else {
Serial.println(F("???"));
}
} else {
Serial.println(F("Error reading IP mode"));
} }
else Serial.println(F("Error reading IP mode"));
if (CONFIG::read_buffer(EP_IP_VALUE,(byte *)sbuf , IP_LENGTH)) if (CONFIG::read_buffer(EP_IP_VALUE,(byte *)sbuf , IP_LENGTH)) {
{
Serial.print(F("IP: ")); Serial.print(F("IP: "));
Serial.println(wifi_config.ip2str((byte *)sbuf)); Serial.println(wifi_config.ip2str((byte *)sbuf));
} else {
Serial.println(F("Error reading IP"));
} }
else Serial.println(F("Error reading IP"));
if (CONFIG::read_buffer(EP_MASK_VALUE, (byte *)sbuf , IP_LENGTH)) if (CONFIG::read_buffer(EP_MASK_VALUE, (byte *)sbuf , IP_LENGTH)) {
{
Serial.print(F("Subnet: ")); Serial.print(F("Subnet: "));
Serial.println(wifi_config.ip2str((byte *)sbuf)); Serial.println(wifi_config.ip2str((byte *)sbuf));
} else {
Serial.println(F("Error reading subnet"));
} }
else Serial.println(F("Error reading subnet"));
if (CONFIG::read_buffer(EP_GATEWAY_VALUE, (byte *)sbuf , IP_LENGTH)) if (CONFIG::read_buffer(EP_GATEWAY_VALUE, (byte *)sbuf , IP_LENGTH)) {
{
Serial.print(F("Gateway: ")); Serial.print(F("Gateway: "));
Serial.println(wifi_config.ip2str((byte *)sbuf)); Serial.println(wifi_config.ip2str((byte *)sbuf));
} else {
Serial.println(F("Error reading gateway"));
} }
else Serial.println(F("Error reading gateway"));
if (CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&ibuf , INTEGER_LENGTH)) if (CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&ibuf , INTEGER_LENGTH)) {
{
Serial.print(F("Baud rate: ")); Serial.print(F("Baud rate: "));
Serial.println(ibuf); Serial.println(ibuf);
} else {
Serial.println(F("Error reading baud rate"));
} }
else Serial.println(F("Error reading baud rate"));
if (CONFIG::read_byte(EP_PHY_MODE, &bbuf )) if (CONFIG::read_byte(EP_PHY_MODE, &bbuf )) {
{
Serial.print(F("Phy mode: ")); Serial.print(F("Phy mode: "));
if (byte(bbuf)==PHY_MODE_11B) Serial.println(F("11b")); if (byte(bbuf)==PHY_MODE_11B) {
else if (byte(bbuf)==PHY_MODE_11G) Serial.println(F("11g")); Serial.println(F("11b"));
else if (byte(bbuf)==PHY_MODE_11N) Serial.println(F("11n")); } else if (byte(bbuf)==PHY_MODE_11G) {
else Serial.println(F("???")); Serial.println(F("11g"));
} else if (byte(bbuf)==PHY_MODE_11N) {
Serial.println(F("11n"));
} else {
Serial.println(F("???"));
}
} else {
Serial.println(F("Error reading phy mode"));
} }
else Serial.println(F("Error reading phy mode"));
if (CONFIG::read_byte(EP_SLEEP_MODE, &bbuf )) if (CONFIG::read_byte(EP_SLEEP_MODE, &bbuf )) {
{
Serial.print(F("Sleep mode: ")); Serial.print(F("Sleep mode: "));
if (byte(bbuf)==NONE_SLEEP_T) Serial.println(F("None")); if (byte(bbuf)==NONE_SLEEP_T) {
else if (byte(bbuf)==LIGHT_SLEEP_T) Serial.println(F("Light")); Serial.println(F("None"));
else if (byte(bbuf)==MODEM_SLEEP_T) Serial.println(F("Modem")); } else if (byte(bbuf)==LIGHT_SLEEP_T) {
else Serial.println(F("???")); Serial.println(F("Light"));
} else if (byte(bbuf)==MODEM_SLEEP_T) {
Serial.println(F("Modem"));
} else {
Serial.println(F("???"));
}
} else {
Serial.println(F("Error reading sleep mode"));
} }
else Serial.println(F("Error reading sleep mode"));
if (CONFIG::read_byte(EP_CHANNEL, &bbuf )) if (CONFIG::read_byte(EP_CHANNEL, &bbuf )) {
{
Serial.print(F("Channel: ")); Serial.print(F("Channel: "));
Serial.println(byte(bbuf)); Serial.println(byte(bbuf));
} else {
Serial.println(F("Error reading channel"));
} }
else Serial.println(F("Error reading channel"));
if (CONFIG::read_byte(EP_AUTH_TYPE, &bbuf )) if (CONFIG::read_byte(EP_AUTH_TYPE, &bbuf )) {
{
Serial.print(F("Authentification: ")); Serial.print(F("Authentification: "));
if (byte(bbuf)==AUTH_OPEN) Serial.println(F("None")); if (byte(bbuf)==AUTH_OPEN) {
else if (byte(bbuf)==AUTH_WEP) Serial.println(F("WEP")); Serial.println(F("None"));
else if (byte(bbuf)==AUTH_WPA_PSK) Serial.println(F("WPA")); } else if (byte(bbuf)==AUTH_WEP) {
else if (byte(bbuf)==AUTH_WPA2_PSK) Serial.println(F("WPA2")); Serial.println(F("WEP"));
else if (byte(bbuf)==AUTH_WPA_WPA2_PSK) Serial.println(F("WPA/WPA2")); } else if (byte(bbuf)==AUTH_WPA_PSK) {
else Serial.println(F("???")); Serial.println(F("WPA"));
} else if (byte(bbuf)==AUTH_WPA2_PSK) {
Serial.println(F("WPA2"));
} else if (byte(bbuf)==AUTH_WPA_WPA2_PSK) {
Serial.println(F("WPA/WPA2"));
} else {
Serial.println(F("???"));
}
} else {
Serial.println(F("Error reading authentification"));
} }
else Serial.println(F("Error reading authentification"));
if (CONFIG::read_byte(EP_SSID_VISIBLE, &bbuf )) if (CONFIG::read_byte(EP_SSID_VISIBLE, &bbuf )) {
{
Serial.print(F("SSID visibility: ")); Serial.print(F("SSID visibility: "));
if (bbuf==0) Serial.println(F("Hidden")); if (bbuf==0) {
else if (bbuf==1) Serial.println(F("Visible")); Serial.println(F("Hidden"));
else Serial.println(bbuf); } else if (bbuf==1) {
Serial.println(F("Visible"));
} else {
Serial.println(bbuf);
}
} else {
Serial.println(F("Error reading SSID visibility"));
} }
else Serial.println(F("Error reading SSID visibility"));
if (CONFIG::read_buffer(EP_WEB_PORT, (byte *)&ibuf , INTEGER_LENGTH)) if (CONFIG::read_buffer(EP_WEB_PORT, (byte *)&ibuf , INTEGER_LENGTH)) {
{
Serial.print(F("Web port: ")); Serial.print(F("Web port: "));
Serial.println(ibuf); Serial.println(ibuf);
} else {
Serial.println(F("Error reading web port"));
} }
else Serial.println(F("Error reading web port"));
if (CONFIG::read_buffer(EP_DATA_PORT, (byte *)&ibuf , INTEGER_LENGTH)) if (CONFIG::read_buffer(EP_DATA_PORT, (byte *)&ibuf , INTEGER_LENGTH)) {
{
Serial.print(F("Data port: ")); Serial.print(F("Data port: "));
Serial.println(ibuf); Serial.println(ibuf);
} else {
Serial.println(F("Error reading data port"));
} }
else Serial.println(F("Error reading data port"));
if (CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &bbuf )) if (CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &bbuf )) {
{
Serial.print(F("Web page refresh time: ")); Serial.print(F("Web page refresh time: "));
Serial.println(byte(bbuf)); Serial.println(byte(bbuf));
} else {
Serial.println(F("Error reading refresh page"));
} }
else Serial.println(F("Error reading refresh page"));
if (CONFIG::read_string(EP_HOSTNAME, sbuf , MAX_HOSTNAME_LENGTH)) if (CONFIG::read_string(EP_HOSTNAME, sbuf , MAX_HOSTNAME_LENGTH)) {
{
Serial.print(F("Hostname: ")); Serial.print(F("Hostname: "));
Serial.println(sbuf); Serial.println(sbuf);
} else {
Serial.println(F("Error reading hostname"));
} }
else Serial.println(F("Error reading hostname"));
if (CONFIG::read_buffer(EP_XY_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH)) if (CONFIG::read_buffer(EP_XY_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH)) {
{
Serial.print(F("XY feed rate: ")); Serial.print(F("XY feed rate: "));
Serial.println(ibuf); Serial.println(ibuf);
} else {
Serial.println(F("Error reading XY feed rate"));
} }
else Serial.println(F("Error reading XY feed rate"));
if (CONFIG::read_buffer(EP_Z_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH)) if (CONFIG::read_buffer(EP_Z_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH)) {
{
Serial.print(F("Z feed rate: ")); Serial.print(F("Z feed rate: "));
Serial.println(ibuf); Serial.println(ibuf);
} else {
Serial.println(F("Error reading Z feed rate"));
} }
else Serial.println(F("Error reading Z feed rate"));
if (CONFIG::read_buffer(EP_E_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH)) if (CONFIG::read_buffer(EP_E_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH)) {
{
Serial.print(F("E feed rate: ")); Serial.print(F("E feed rate: "));
Serial.println(ibuf); Serial.println(ibuf);
} else {
Serial.println(F("Error reading E feed rate"));
} }
else Serial.println(F("Error reading E feed rate"));
Serial.print(F("Captive portal: ")); Serial.print(F("Captive portal: "));
#ifdef CAPTIVE_PORTAL_FEATURE #ifdef CAPTIVE_PORTAL_FEATURE

58
esp8266/esp8266.ino
View File

@ -55,7 +55,8 @@ extern "C" {
WiFiServer * data_server; WiFiServer * data_server;
WiFiClient serverClients[MAX_SRV_CLIENTS]; WiFiClient serverClients[MAX_SRV_CLIENTS];
void setup() { void setup()
{
// init: // init:
web_interface = NULL; web_interface = NULL;
data_server = NULL; data_server = NULL;
@ -65,24 +66,29 @@ void setup() {
bool breset_config=false; bool breset_config=false;
//check if reset config is requested //check if reset config is requested
pinMode(RESET_CONFIG_PIN, INPUT); pinMode(RESET_CONFIG_PIN, INPUT);
if (digitalRead(RESET_CONFIG_PIN)==0)breset_config=true;//if requested =>reset settings if (digitalRead(RESET_CONFIG_PIN)==0) {
breset_config=true; //if requested =>reset settings
}
//default baud rate //default baud rate
long baud_rate=0; long baud_rate=0;
//check if EEPROM has value //check if EEPROM has value
if ( CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&baud_rate , INTEGER_LENGTH)&&CONFIG::read_buffer(EP_WEB_PORT, (byte *)&(wifi_config.iweb_port) , INTEGER_LENGTH)&&CONFIG::read_buffer(EP_DATA_PORT, (byte *)&(wifi_config.idata_port) , INTEGER_LENGTH)) if ( CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&baud_rate , INTEGER_LENGTH)&&CONFIG::read_buffer(EP_WEB_PORT, (byte *)&(wifi_config.iweb_port) , INTEGER_LENGTH)&&CONFIG::read_buffer(EP_DATA_PORT, (byte *)&(wifi_config.idata_port) , INTEGER_LENGTH)) {
{
//check if baud value is one of allowed ones //check if baud value is one of allowed ones
if ( ! (baud_rate==9600 || baud_rate==19200 ||baud_rate==38400 ||baud_rate==57600 ||baud_rate==115200 ||baud_rate==230400 ||baud_rate==250000) )breset_config=true;//baud rate is incorrect =>reset settings if ( ! (baud_rate==9600 || baud_rate==19200 ||baud_rate==38400 ||baud_rate==57600 ||baud_rate==115200 ||baud_rate==230400 ||baud_rate==250000) ) {
if (wifi_config.iweb_port<1 ||wifi_config.iweb_port>65001 || wifi_config.idata_port <1 || wifi_config.idata_port >65001)breset_config=true; //out of range =>reset settings breset_config=true; //baud rate is incorrect =>reset settings
}
if (wifi_config.iweb_port<1 ||wifi_config.iweb_port>65001 || wifi_config.idata_port <1 || wifi_config.idata_port >65001) {
breset_config=true; //out of range =>reset settings
}
} else {
breset_config=true; //cannot access to config settings=> reset settings
} }
else breset_config=true;//cannot access to config settings=> reset settings
//reset is requested //reset is requested
if(breset_config) if(breset_config) {
{
//update EEPROM with default settings //update EEPROM with default settings
Serial.begin(9600); Serial.begin(9600);
delay(2000); delay(2000);
@ -98,14 +104,18 @@ void setup() {
delay(100); delay(100);
//restart once reset config is done //restart once reset config is done
ESP.restart(); ESP.restart();
while (1){delay(1);}; while (1) {
delay(1);
};
} }
//setup serial //setup serial
Serial.begin(baud_rate); Serial.begin(baud_rate);
delay(1000); delay(1000);
wifi_config.baud_rate=baud_rate; wifi_config.baud_rate=baud_rate;
//setup wifi according settings //setup wifi according settings
if (!wifi_config.Setup()) wifi_config.Safe_Setup(); if (!wifi_config.Setup()) {
wifi_config.Safe_Setup();
}
delay(1000); delay(1000);
//start interfaces //start interfaces
web_interface = new WEBINTERFACE_CLASS(wifi_config.iweb_port); web_interface = new WEBINTERFACE_CLASS(wifi_config.iweb_port);
@ -125,8 +135,7 @@ void setup() {
#endif #endif
#ifdef CAPTIVE_PORTAL_FEATURE #ifdef CAPTIVE_PORTAL_FEATURE
if (wifi_get_opmode()!=WIFI_STA ) if (wifi_get_opmode()!=WIFI_STA ) {
{
// if DNSServer is started with "*" for domain name, it will reply with // if DNSServer is started with "*" for domain name, it will reply with
// provided IP to all DNS request // provided IP to all DNS request
dnsServer.setErrorReplyCode(DNSReplyCode::NoError); dnsServer.setErrorReplyCode(DNSReplyCode::NoError);
@ -138,7 +147,9 @@ void setup() {
String stmp; String stmp;
SSDP.setSchemaURL("description.xml"); SSDP.setSchemaURL("description.xml");
SSDP.setHTTPPort( wifi_config.iweb_port); SSDP.setHTTPPort( wifi_config.iweb_port);
if (!CONFIG::read_string(EP_HOSTNAME, stmp , MAX_HOSTNAME_LENGTH))stmp=wifi_config.get_default_hostname(); if (!CONFIG::read_string(EP_HOSTNAME, stmp , MAX_HOSTNAME_LENGTH)) {
stmp=wifi_config.get_default_hostname();
}
SSDP.setName(stmp.c_str()); SSDP.setName(stmp.c_str());
stmp=String(system_get_chip_id()); stmp=String(system_get_chip_id());
SSDP.setSerialNumber(stmp.c_str()); SSDP.setSerialNumber(stmp.c_str());
@ -155,10 +166,10 @@ SPIFFS.begin();
//main loop //main loop
void loop() { void loop()
#ifdef CAPTIVE_PORTAL_FEATURE
if (wifi_get_opmode()!=WIFI_STA )
{ {
#ifdef CAPTIVE_PORTAL_FEATURE
if (wifi_get_opmode()!=WIFI_STA ) {
dnsServer.processNextRequest(); dnsServer.processNextRequest();
} }
#endif #endif
@ -171,7 +182,9 @@ uint8_t i,data;
for(i = 0; i < MAX_SRV_CLIENTS; i++) { for(i = 0; i < MAX_SRV_CLIENTS; i++) {
//find free/disconnected spot //find free/disconnected spot
if (!serverClients[i] || !serverClients[i].connected()) { if (!serverClients[i] || !serverClients[i].connected()) {
if(serverClients[i]) serverClients[i].stop(); if(serverClients[i]) {
serverClients[i].stop();
}
serverClients[i] = data_server->available(); serverClients[i] = data_server->available();
continue; continue;
} }
@ -207,13 +220,14 @@ uint8_t i,data;
COMMAND::read_buffer_serial(sbuf, len); COMMAND::read_buffer_serial(sbuf, len);
} }
} }
if (web_interface->restartmodule) if (web_interface->restartmodule) {
{
Serial.flush(); Serial.flush();
delay(500); delay(500);
Serial.swap(); Serial.swap();
delay(100); delay(100);
ESP.restart(); ESP.restart();
while (1){delay(1);}; while (1) {
delay(1);
};
} }
} }

58
esp8266/storestrings.cpp
View File

@ -19,17 +19,21 @@
*/ */
#include "storestrings.h" #include "storestrings.h"
//Constructor //Constructor
STORESTRINGS_CLASS::STORESTRINGS_CLASS (int maxsize , int maxstringlength){ STORESTRINGS_CLASS::STORESTRINGS_CLASS (int maxsize , int maxstringlength)
{
//for rolling buffer //for rolling buffer
//if max size is reached then remove oldest one and add the new one //if max size is reached then remove oldest one and add the new one
_maxsize=maxsize; _maxsize=maxsize;
//to limit the storage space //to limit the storage space
_maxstringlength=maxstringlength; _maxstringlength=maxstringlength;
//need space for the "..." //need space for the "..."
if (_maxstringlength<4 && _maxstringlength!=-1)_maxstringlength=4; if (_maxstringlength<4 && _maxstringlength!=-1) {
_maxstringlength=4;
}
} }
//Destructor //Destructor
STORESTRINGS_CLASS::~STORESTRINGS_CLASS (){ STORESTRINGS_CLASS::~STORESTRINGS_CLASS ()
{
// clear list and content // clear list and content
clear(); clear();
} }
@ -41,13 +45,16 @@ bool STORESTRINGS_CLASS::setsize(int size)
} }
bool STORESTRINGS_CLASS::setlength(int len) bool STORESTRINGS_CLASS::setlength(int len)
{ {
if (len < 4) return false; if (len < 4) {
return false;
}
_maxstringlength = len; _maxstringlength = len;
return true; return true;
} }
//Clear list and content //Clear list and content
void STORESTRINGS_CLASS::clear(){ void STORESTRINGS_CLASS::clear()
{
//while list is not empty //while list is not empty
while(_charlist.size()) { while(_charlist.size()) {
//remove element //remove element
@ -64,10 +71,11 @@ bool STORESTRINGS_CLASS::add (const __FlashStringHelper *str)
return add(stmp.c_str()); return add(stmp.c_str());
} }
//Add element in storage //Add element in storage
bool STORESTRINGS_CLASS::add (const char * string){ bool STORESTRINGS_CLASS::add (const char * string)
{
//if we reach max size //if we reach max size
if (_maxsize==_charlist.size()) if (_maxsize==_charlist.size()) {
{//remove oldest one //remove oldest one
char * str = _charlist.shift(); char * str = _charlist.shift();
delete str; delete str;
} }
@ -75,21 +83,19 @@ bool STORESTRINGS_CLASS::add (const char * string){
//get size including \0 at the end //get size including \0 at the end
size_t size = strlen(string)+1; size_t size = strlen(string)+1;
bool need_resize=false; bool need_resize=false;
if ( (_maxstringlength!=-1) && (size >_maxstringlength+1 )) if ( (_maxstringlength!=-1) && (size >_maxstringlength+1 )) {
{
need_resize = true; need_resize = true;
size=_maxstringlength+1; size=_maxstringlength+1;
} }
//reserve memory //reserve memory
char * ptr = new char[size*sizeof(char)]; char * ptr = new char[size*sizeof(char)];
//copy string to storage //copy string to storage
if (need_resize) if (need_resize) {
{ //copy maximum length minus 3 //copy maximum length minus 3
strncpy(ptr,string,_maxstringlength-3); strncpy(ptr,string,_maxstringlength-3);
strcpy(ptr+_maxstringlength-3,"..."); strcpy(ptr+_maxstringlength-3,"...");
} } else {
else //copy as it is
{ //copy as it is
strcpy(ptr,string); strcpy(ptr,string);
} }
//add storage to list //add storage to list
@ -98,8 +104,11 @@ bool STORESTRINGS_CLASS::add (const char * string){
} }
//Remove element at pos position //Remove element at pos position
bool STORESTRINGS_CLASS::remove(int pos) bool STORESTRINGS_CLASS::remove(int pos)
{ //be sure index is in range {
if (pos<0 && pos>(_charlist.size()-1)) return false; //be sure index is in range
if (pos<0 && pos>(_charlist.size()-1)) {
return false;
}
//remove item from list //remove item from list
char * str = _charlist.remove(pos); char * str = _charlist.remove(pos);
//destroy item //destroy item
@ -108,16 +117,21 @@ bool STORESTRINGS_CLASS::remove(int pos)
} }
//Get element at pos position //Get element at pos position
const char * STORESTRINGS_CLASS::get(int pos) const char * STORESTRINGS_CLASS::get(int pos)
{ //be sure index is in range {
if (pos<0 && pos>(_charlist.size()-1)) return NULL; //be sure index is in range
if (pos<0 && pos>(_charlist.size()-1)) {
return NULL;
}
return (const char *) _charlist.get(pos); return (const char *) _charlist.get(pos);
} }
//Get index for defined string //Get index for defined string
int STORESTRINGS_CLASS::get_index(const char * string) int STORESTRINGS_CLASS::get_index(const char * string)
{//parse the list until it is found
for (int p=0;p<_charlist.size();p++)
{ {
if (strcmp ( _charlist.get(p), string)==0)return p; //parse the list until it is found
for (int p=0; p<_charlist.size(); p++) {
if (strcmp ( _charlist.get(p), string)==0) {
return p;
}
} }
//if not found return -1 //if not found return -1
return -1; return -1;

20
esp8266/storestrings.h
View File

@ -28,17 +28,29 @@ class STORESTRINGS_CLASS
STORESTRINGS_CLASS (int maxsize = -1, int maxstringlength=-1); STORESTRINGS_CLASS (int maxsize = -1, int maxstringlength=-1);
~STORESTRINGS_CLASS (); ~STORESTRINGS_CLASS ();
bool add (const char * string); bool add (const char * string);
inline bool add (String & string) {return add(string.c_str());}; inline bool add (String & string)
{
return add(string.c_str());
};
bool add (const __FlashStringHelper *str); bool add (const __FlashStringHelper *str);
bool remove(int pos); bool remove(int pos);
const char * get(int pos); const char * get(int pos);
int get_index(const char * string); int get_index(const char * string);
void clear(); void clear();
inline int size() {return _charlist.size();}; inline int size()
{
return _charlist.size();
};
bool setsize(int size); bool setsize(int size);
bool setlength(int len); bool setlength(int len);
inline int getsize() {return _maxsize;}; inline int getsize()
inline int getlength() {return _maxstringlength;}; {
return _maxsize;
};
inline int getlength()
{
return _maxstringlength;
};
private: private:
int _maxsize; int _maxsize;

1224
esp8266/webinterface.cpp
View File

File diff suppressed because it is too large Load Diff

115
esp8266/wifi.cpp
View File

@ -42,12 +42,15 @@ WIFI_CONFIG::WIFI_CONFIG()
_hostname[0]=0; _hostname[0]=0;
} }
const char * WIFI_CONFIG::get_hostname(){ const char * WIFI_CONFIG::get_hostname()
if (WiFi.hostname().length()==0)
{ {
if (!CONFIG::read_string(EP_HOSTNAME, _hostname , MAX_HOSTNAME_LENGTH))strcpy(_hostname,get_default_hostname()); if (WiFi.hostname().length()==0) {
if (!CONFIG::read_string(EP_HOSTNAME, _hostname , MAX_HOSTNAME_LENGTH)) {
strcpy(_hostname,get_default_hostname());
}
} else {
strcpy(_hostname,WiFi.hostname().c_str());
} }
else strcpy(_hostname,WiFi.hostname().c_str());
return _hostname; return _hostname;
} }
@ -56,7 +59,9 @@ const char * WIFI_CONFIG::get_default_hostname()
static char hostname[13]; static char hostname[13];
uint8_t mac [WL_MAC_ADDR_LENGTH]; uint8_t mac [WL_MAC_ADDR_LENGTH];
WiFi.macAddress(mac); WiFi.macAddress(mac);
if (0>sprintf(hostname,"ESP_%02X%02X%02X",mac[3],mac[4],mac[5])) strcpy (hostname, "ESP8266"); if (0>sprintf(hostname,"ESP_%02X%02X%02X",mac[3],mac[4],mac[5])) {
strcpy (hostname, "ESP8266");
}
return hostname; return hostname;
} }
@ -64,8 +69,7 @@ const char * WIFI_CONFIG::get_default_hostname()
//return number of part //return number of part
byte WIFI_CONFIG::split_ip (const char * ptr,byte * part) byte WIFI_CONFIG::split_ip (const char * ptr,byte * part)
{ {
if (strlen(ptr)>15 || strlen(ptr)< 7) if (strlen(ptr)>15 || strlen(ptr)< 7) {
{
part[0]=0; part[0]=0;
part[1]=0; part[1]=0;
part[2]=0; part[2]=0;
@ -79,12 +83,9 @@ byte WIFI_CONFIG::split_ip (const char * ptr,byte * part)
ptr2 = pstart; ptr2 = pstart;
byte i = strlen(pstart); byte i = strlen(pstart);
byte pos = 0; byte pos = 0;
for (byte j=0;j<i;j++) for (byte j=0; j<i; j++) {
{ if (pstart[j]=='.') {
if (pstart[j]=='.') if (pos==4) {
{
if (pos==4)
{
part[0]=0; part[0]=0;
part[1]=0; part[1]=0;
part[2]=0; part[2]=0;
@ -105,7 +106,9 @@ byte WIFI_CONFIG::split_ip (const char * ptr,byte * part)
char * WIFI_CONFIG::mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH]) char * WIFI_CONFIG::mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH])
{ {
static char macstr [18]; static char macstr [18];
if (0>sprintf(macstr,"%02X:%02X:%02X:%02X:%02X:%02X",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5])) strcpy (macstr, "00:00:00:00:00:00"); if (0>sprintf(macstr,"%02X:%02X:%02X:%02X:%02X:%02X",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5])) {
strcpy (macstr, "00:00:00:00:00:00");
}
return macstr; return macstr;
} }
@ -113,7 +116,9 @@ char * WIFI_CONFIG::mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH])
char * WIFI_CONFIG::ip2str(IPAddress Ip ) char * WIFI_CONFIG::ip2str(IPAddress Ip )
{ {
static char ipstr [16]; static char ipstr [16];
if (0>sprintf(ipstr, "%i.%i.%i.%i",Ip[0],Ip[1],Ip[2],Ip[3])) strcpy (ipstr, "0.0.0.0"); if (0>sprintf(ipstr, "%i.%i.%i.%i",Ip[0],Ip[1],Ip[2],Ip[3])) {
strcpy (ipstr, "0.0.0.0");
}
return ipstr; return ipstr;
} }
@ -150,29 +155,27 @@ bool WIFI_CONFIG::Setup()
byte bflag=0; byte bflag=0;
//set the sleep mode //set the sleep mode
if (!CONFIG::read_byte(EP_SLEEP_MODE, &bflag )) if (!CONFIG::read_byte(EP_SLEEP_MODE, &bflag )) {
{
return false; return false;
} }
wifi_set_sleep_type ((sleep_type)bflag); wifi_set_sleep_type ((sleep_type)bflag);
sleep_mode=bflag; sleep_mode=bflag;
//AP or client ? //AP or client ?
if (!CONFIG::read_byte(EP_WIFI_MODE, &bflag ) || !CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH) ||!CONFIG::read_string(EP_PASSWORD, pwd , MAX_PASSWORD_LENGTH)) if (!CONFIG::read_byte(EP_WIFI_MODE, &bflag ) || !CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH) ||!CONFIG::read_string(EP_PASSWORD, pwd , MAX_PASSWORD_LENGTH)) {
{
return false; return false;
} }
if (!CONFIG::read_string(EP_HOSTNAME, hostname , MAX_HOSTNAME_LENGTH))strcpy(hostname,get_default_hostname()); if (!CONFIG::read_string(EP_HOSTNAME, hostname , MAX_HOSTNAME_LENGTH)) {
strcpy(hostname,get_default_hostname());
}
//disconnect if connected //disconnect if connected
WiFi.disconnect(); WiFi.disconnect();
//this is AP mode //this is AP mode
if (bflag==AP_MODE) if (bflag==AP_MODE) {
{
//setup Soft AP //setup Soft AP
WiFi.mode(WIFI_AP); WiFi.mode(WIFI_AP);
WiFi.softAP(sbuf, pwd); WiFi.softAP(sbuf, pwd);
//setup PHY_MODE //setup PHY_MODE
if (!CONFIG::read_byte(EP_PHY_MODE, &bflag )) if (!CONFIG::read_byte(EP_PHY_MODE, &bflag )) {
{
return false; return false;
} }
wifi_set_phy_mode((phy_mode)bflag); wifi_set_phy_mode((phy_mode)bflag);
@ -180,37 +183,42 @@ bool WIFI_CONFIG::Setup()
struct softap_config apconfig; struct softap_config apconfig;
wifi_softap_get_config(&apconfig); wifi_softap_get_config(&apconfig);
//set the chanel //set the chanel
if (!CONFIG::read_byte(EP_CHANNEL, &bflag ))return false; if (!CONFIG::read_byte(EP_CHANNEL, &bflag )) {
return false;
}
apconfig.channel=bflag; apconfig.channel=bflag;
//set Authentification type //set Authentification type
if (!CONFIG::read_byte(EP_AUTH_TYPE, &bflag ))return false; if (!CONFIG::read_byte(EP_AUTH_TYPE, &bflag )) {
return false;
}
apconfig.authmode=(AUTH_MODE)bflag; apconfig.authmode=(AUTH_MODE)bflag;
//set the visibility of SSID //set the visibility of SSID
if (!CONFIG::read_byte(EP_SSID_VISIBLE, &bflag ))return false; if (!CONFIG::read_byte(EP_SSID_VISIBLE, &bflag )) {
return false;
}
apconfig.ssid_hidden=!bflag; apconfig.ssid_hidden=!bflag;
//no need to add these settings to configuration just use default ones //no need to add these settings to configuration just use default ones
apconfig.max_connection=DEFAULT_MAX_CONNECTIONS; apconfig.max_connection=DEFAULT_MAX_CONNECTIONS;
apconfig.beacon_interval=DEFAULT_BEACON_INTERVAL; apconfig.beacon_interval=DEFAULT_BEACON_INTERVAL;
//apply settings to current and to default //apply settings to current and to default
if (!wifi_softap_set_config(&apconfig) || !wifi_softap_set_config_current(&apconfig)) if (!wifi_softap_set_config(&apconfig) || !wifi_softap_set_config_current(&apconfig)) {
{
Serial.println(F("M117 Error Wifi AP!")); Serial.println(F("M117 Error Wifi AP!"));
delay(1000); delay(1000);
} }
} } else {
else //setup station mode
{//setup station mode
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.begin(sbuf, pwd); WiFi.begin(sbuf, pwd);
delay(500); delay(500);
//setup PHY_MODE //setup PHY_MODE
if (!CONFIG::read_byte(EP_PHY_MODE, &bflag ))return false; if (!CONFIG::read_byte(EP_PHY_MODE, &bflag )) {
return false;
}
wifi_set_phy_mode((phy_mode)bflag); wifi_set_phy_mode((phy_mode)bflag);
byte i=0; byte i=0;
//try to connect //try to connect
while (WiFi.status() != WL_CONNECTED && i<40) { while (WiFi.status() != WL_CONNECTED && i<40) {
switch(WiFi.status()) switch(WiFi.status()) {
{
case 1: case 1:
Serial.print(FPSTR(M117_)); Serial.print(FPSTR(M117_));
Serial.println(F("No SSID found!")); Serial.println(F("No SSID found!"));
@ -229,27 +237,39 @@ bool WIFI_CONFIG::Setup()
delay(500); delay(500);
i++; i++;
} }
if (WiFi.status() != WL_CONNECTED) return false; if (WiFi.status() != WL_CONNECTED) {
return false;
}
WiFi.hostname(hostname); WiFi.hostname(hostname);
} }
//DHCP or Static IP ? //DHCP or Static IP ?
if (!CONFIG::read_byte(EP_IP_MODE, &bflag )) return false; if (!CONFIG::read_byte(EP_IP_MODE, &bflag )) {
if (bflag==STATIC_IP_MODE) return false;
{ }
if (bflag==STATIC_IP_MODE) {
byte ip_buf[4]; byte ip_buf[4];
//get the IP //get the IP
if (!CONFIG::read_buffer(EP_IP_VALUE,ip_buf , IP_LENGTH))return false; if (!CONFIG::read_buffer(EP_IP_VALUE,ip_buf , IP_LENGTH)) {
return false;
}
IPAddress local_ip (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]); IPAddress local_ip (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]);
//get the gateway //get the gateway
if (!CONFIG::read_buffer(EP_GATEWAY_VALUE,ip_buf , IP_LENGTH))return false; if (!CONFIG::read_buffer(EP_GATEWAY_VALUE,ip_buf , IP_LENGTH)) {
return false;
}
IPAddress gateway (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]); IPAddress gateway (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]);
//get the mask //get the mask
if (!CONFIG::read_buffer(EP_MASK_VALUE,ip_buf , IP_LENGTH))return false; if (!CONFIG::read_buffer(EP_MASK_VALUE,ip_buf , IP_LENGTH)) {
return false;
}
IPAddress subnet (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]); IPAddress subnet (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]);
//apply according active wifi mode //apply according active wifi mode
if (wifi_get_opmode()==WIFI_AP || wifi_get_opmode()==WIFI_AP_STA) WiFi.softAPConfig( local_ip, gateway, subnet); if (wifi_get_opmode()==WIFI_AP || wifi_get_opmode()==WIFI_AP_STA) {
else WiFi.config( local_ip, gateway, subnet); WiFi.softAPConfig( local_ip, gateway, subnet);
} else {
WiFi.config( local_ip, gateway, subnet);
}
} }
#ifdef MDNS_FEATURE #ifdef MDNS_FEATURE
// Set up mDNS responder: // Set up mDNS responder:
@ -260,8 +280,11 @@ bool WIFI_CONFIG::Setup()
} }
#endif #endif
//Get IP //Get IP
if (wifi_get_opmode()==WIFI_STA)currentIP=WiFi.localIP(); if (wifi_get_opmode()==WIFI_STA) {
else currentIP=WiFi.softAPIP(); currentIP=WiFi.localIP();
} else {
currentIP=WiFi.softAPIP();
}
Serial.print(FPSTR(M117_)); Serial.print(FPSTR(M117_));
Serial.println(currentIP); Serial.println(currentIP);
return true; return true;