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

Change EEPROM begin/end to be sure it is open

Browse Source 
Update print_config
This commit is contained in:
luc 2015-10-22 21:38:52 +08:00
parent fa9b87f734
commit b2f8ab93bc
3 changed files with 169 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
esp8266/command.cpp
View File

@ -76,7 +76,6 @@ void COMMAND::execute_command(int cmd,String cmd_params)
if (cmd_params=="RESET") if (cmd_params=="RESET")
{ {
CONFIG::reset_config(); CONFIG::reset_config();
web_interface->restartmodule=true;
} }
if (cmd_params=="SAFEMODE") if (cmd_params=="SAFEMODE")
{ {

188
esp8266/config.cpp
View File

@ -20,6 +20,9 @@
#include "config.h" #include "config.h"
#include <EEPROM.h> #include <EEPROM.h>
#include "wifi.h" #include "wifi.h"
extern "C" {
#include "user_interface.h"
}
//read a string //read a string
//a string is multibyte + \0, this is won't work if 1 char is multibyte like chinese char //a string is multibyte + \0, this is won't work if 1 char is multibyte like chinese char
@ -27,6 +30,7 @@ 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);
byte b=0; byte b=0;
int i=0; int i=0;
//read first byte //read first byte
@ -42,6 +46,7 @@ bool CONFIG::read_string(int pos, char byte_buffer[], int size_max)
} }
//if it is a string be sure there is an 0 at the end //if it is a string be sure there is an 0 at the end
if (b!=0)byte_buffer[i-1]=0x00; if (b!=0)byte_buffer[i-1]=0x00;
EEPROM.end();
return true; return true;
} }
@ -52,6 +57,7 @@ bool CONFIG::read_string(int pos, String & sbuffer, int size_max)
byte b=0; byte b=0;
int i=0; int i=0;
sbuffer=""; sbuffer="";
EEPROM.begin(EEPROM_SIZE);
//read first byte //read first byte
b = EEPROM.read(pos + i); b = EEPROM.read(pos + i);
sbuffer+=char(b); sbuffer+=char(b);
@ -63,6 +69,7 @@ bool CONFIG::read_string(int pos, String & sbuffer, int size_max)
sbuffer+=char(b); sbuffer+=char(b);
i++; i++;
} }
EEPROM.end();
return true; return true;
} }
@ -72,12 +79,14 @@ 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);
//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++;
} }
EEPROM.end();
return true; return true;
} }
@ -86,7 +95,9 @@ 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);
value[0] = EEPROM.read(pos); value[0] = EEPROM.read(pos);
EEPROM.end();
return true; return true;
} }
@ -104,6 +115,7 @@ bool CONFIG::write_string(int pos, const char * 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);
for (int i = 0; i < size_buffer; i++) { for (int i = 0; i < size_buffer; i++) {
EEPROM.write(pos + i, byte_buffer[i]); EEPROM.write(pos + i, byte_buffer[i]);
} }
@ -111,6 +123,7 @@ bool CONFIG::write_string(int pos, const char * byte_buffer)
//0 terminal //0 terminal
EEPROM.write(pos + size_buffer, 0x00); EEPROM.write(pos + size_buffer, 0x00);
EEPROM.commit(); EEPROM.commit();
EEPROM.end();
return true; return true;
} }
@ -119,11 +132,13 @@ 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);
//copy the value(s) //copy the value(s)
for (int i = 0; i < size_buffer; i++) { for (int i = 0; i < size_buffer; i++) {
EEPROM.write(pos + i, byte_buffer[i]); EEPROM.write(pos + i, byte_buffer[i]);
} }
EEPROM.commit(); EEPROM.commit();
EEPROM.end();
return true; return true;
} }
@ -132,8 +147,10 @@ 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.write(pos, value); EEPROM.write(pos, value);
EEPROM.commit(); EEPROM.commit();
EEPROM.end();
return true; return true;
} }
@ -168,24 +185,157 @@ 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 ))Serial.println(byte(bbuf)); if (CONFIG::read_byte(EP_WIFI_MODE, &bbuf ))
if (CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH))Serial.println(sbuf); {
if (byte(bbuf)==CLIENT_MODE) Serial.println("Mode: Station");
else if (byte(bbuf)==AP_MODE) Serial.println("Mode: Access Point");
else Serial.println("Mode: ???");
}
else Serial.println("Error reading mode");
if (CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH))
{
Serial.print("SSID: ");
Serial.println(sbuf);
}
else Serial.println("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 ))Serial.println(byte(bbuf));
if (CONFIG::read_buffer(EP_IP_VALUE,(byte *)sbuf , IP_LENGTH))Serial.println(wifi_config.ip2str((byte *)sbuf)); if (CONFIG::read_byte(EP_IP_MODE, &bbuf ))
if (CONFIG::read_buffer(EP_MASK_VALUE, (byte *)sbuf , IP_LENGTH))Serial.println(wifi_config.ip2str((byte *)sbuf)); {
if (CONFIG::read_buffer(EP_GATEWAY_VALUE, (byte *)sbuf , IP_LENGTH))Serial.println(wifi_config.ip2str((byte *)sbuf)); if (byte(bbuf)==STATIC_IP_MODE) Serial.println("IP Mode: Static");
if (CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&ibuf , INTEGER_LENGTH))Serial.println(ibuf); else if (byte(bbuf)==DHCP_MODE) Serial.println("IP Mode: DHCP");
if (CONFIG::read_byte(EP_PHY_MODE, &bbuf ))Serial.println(byte(bbuf)); else Serial.println("IP mode: ???");
if (CONFIG::read_byte(EP_SLEEP_MODE, &bbuf ))Serial.println(byte(bbuf)); }
if (CONFIG::read_byte(EP_CHANNEL, &bbuf ))Serial.println(byte(bbuf)); else Serial.println("Error reading IP mode");
if (CONFIG::read_byte(EP_AUTH_TYPE, &bbuf ))Serial.println(byte(bbuf)); if (CONFIG::read_buffer(EP_IP_VALUE,(byte *)sbuf , IP_LENGTH))
if (CONFIG::read_byte(EP_SSID_VISIBLE, &bbuf ))Serial.println(byte(bbuf)); {
if (CONFIG::read_buffer(EP_WEB_PORT, (byte *)&ibuf , INTEGER_LENGTH))Serial.println(ibuf); Serial.print("IP: ");
if (CONFIG::read_buffer(EP_DATA_PORT, (byte *)&ibuf , INTEGER_LENGTH))Serial.println(ibuf); Serial.println(wifi_config.ip2str((byte *)sbuf));
if (CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &bbuf ))Serial.println(byte(bbuf)); }
if (CONFIG::read_string(EP_HOSTNAME, sbuf , MAX_HOSTNAME_LENGTH))Serial.println(sbuf); else Serial.println("Error reading IP");
if (CONFIG::read_buffer(EP_XY_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH))Serial.println(ibuf); if (CONFIG::read_buffer(EP_MASK_VALUE, (byte *)sbuf , IP_LENGTH))
if (CONFIG::read_buffer(EP_Z_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH))Serial.println(ibuf); {
if (CONFIG::read_buffer(EP_E_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH))Serial.println(ibuf); Serial.print("Subnet: ");
Serial.println(wifi_config.ip2str((byte *)sbuf));
}
else Serial.println("Error reading subnet");
if (CONFIG::read_buffer(EP_GATEWAY_VALUE, (byte *)sbuf , IP_LENGTH))
{
Serial.print("Gateway : ");
Serial.println(wifi_config.ip2str((byte *)sbuf));
}
else Serial.println("Error reading gateway");
if (CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&ibuf , INTEGER_LENGTH))
{
Serial.print("Baud rate : ");
Serial.println(ibuf);
}
else Serial.println("Error reading baud rate");
if (CONFIG::read_byte(EP_PHY_MODE, &bbuf ))
{
Serial.print("Phy mode : ");
if (byte(bbuf)==PHY_MODE_11B)Serial.println("11b");
else if (byte(bbuf)==PHY_MODE_11G)Serial.println("11g");
else if (byte(bbuf)==PHY_MODE_11N)Serial.println("11n");
else Serial.println("???");
}
else Serial.println("Error reading phy mode");
if (CONFIG::read_byte(EP_SLEEP_MODE, &bbuf ))
{
Serial.print("Sleep mode : ");
if (byte(bbuf)==NONE_SLEEP_T)Serial.println("None");
else if (byte(bbuf)==LIGHT_SLEEP_T)Serial.println("Light");
else if (byte(bbuf)==MODEM_SLEEP_T)Serial.println("Modem");
else Serial.println("???");
}
else Serial.println("Error reading sleep mode");
if (CONFIG::read_byte(EP_CHANNEL, &bbuf ))
{
Serial.print("Channel : ");
Serial.println(byte(bbuf));
}
else Serial.println("Error reading channel");
if (CONFIG::read_byte(EP_AUTH_TYPE, &bbuf ))
{
Serial.print("Authentification : ");
if (byte(bbuf)==AUTH_OPEN)Serial.println("None");
else if (byte(bbuf)==AUTH_WEP)Serial.println("WEP");
else if (byte(bbuf)==AUTH_WPA_PSK)Serial.println("WPA");
else if (byte(bbuf)==AUTH_WPA2_PSK)Serial.println("WPA2");
else if (byte(bbuf)==AUTH_WPA_WPA2_PSK)Serial.println("WPA/WPA2");
else if (byte(bbuf)==AUTH_MAX)Serial.println("Max");
else Serial.println("???");
}
else Serial.println("Error reading authentification");
if (CONFIG::read_byte(EP_SSID_VISIBLE, &bbuf ))
{
Serial.print("SSID visibility: ");
if (bbuf==0)Serial.println("Hidden");
else if (bbuf==1)Serial.println("Visible");
else Serial.println(bbuf);
}
else Serial.println("Error reading SSID visibility");
if (CONFIG::read_buffer(EP_WEB_PORT, (byte *)&ibuf , INTEGER_LENGTH))
{
Serial.print("Web port: ");
Serial.println(ibuf);
}
else Serial.println("Error reading web port");
if (CONFIG::read_buffer(EP_DATA_PORT, (byte *)&ibuf , INTEGER_LENGTH))
{
Serial.print("Data port: ");
Serial.println(ibuf);
}
else Serial.println("Error reading data port");
if (CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &bbuf ))
{
Serial.print("Web page refresh time: ");
Serial.println(byte(bbuf));
}
else Serial.println("Error reading refesh page");
if (CONFIG::read_string(EP_HOSTNAME, sbuf , MAX_HOSTNAME_LENGTH))
{
Serial.print("Hostname : ");
Serial.println(sbuf);
}
else Serial.println("Error reading hostname");
if (CONFIG::read_buffer(EP_XY_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH))
{
Serial.print("XY feed rate: ");
Serial.println(ibuf);
}
else Serial.println("Error reading XY feed rate");
if (CONFIG::read_buffer(EP_Z_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH))
{
Serial.print("Z feed rate: ");
Serial.println(ibuf);
}
else Serial.println("Error reading Z feed rate");
if (CONFIG::read_buffer(EP_E_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH))
{
Serial.print("E feed rate: ");
Serial.println(ibuf);
}
else Serial.println("Error reading E feed rate");
Serial.print("Captive portal : ");
#ifdef CAPTIVE_PORTAL_FEATURE
Serial.println("Enabled");
#else
Serial.println("Disabled");
#endif
Serial.print("SSDP : ");
#ifdef SSDP_FEATURE
Serial.println("Enabled");
#else
Serial.println("Disabled");
#endif
Serial.print("mDNS : ");
#ifdef MDNS
Serial.println("Enabled");
#else
Serial.println("Disabled");
#endif
} }

1
esp8266/esp8266.ino
View File

@ -62,7 +62,6 @@ void setup() {
// ESP.wdtDisable(); // ESP.wdtDisable();
system_update_cpu_freq(SYS_CPU_160MHZ); system_update_cpu_freq(SYS_CPU_160MHZ);
delay(8000); delay(8000);
EEPROM.begin(EEPROM_SIZE);
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);