Skip to content

Commit

Permalink
Change EEPROM begin/end to be sure it is open
Browse files Browse the repository at this point in the history 
Update print_config
  • Loading branch information
@luc-github
luc-github committed Oct 22, 2015
1 parent fa9b87f commit b2f8ab9
Show file tree
Hide file tree
Showing 3 changed files with 169 additions and 21 deletions.
1 change: 0 additions & 1 deletion esp8266/command.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ void COMMAND::execute_command(int cmd,String cmd_params)
if (cmd_params=="RESET")
{
CONFIG::reset_config();
web_interface->restartmodule=true;
}
if (cmd_params=="SAFEMODE")
{
Expand Down
188 changes: 169 additions & 19 deletions esp8266/config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@
#include "config.h"
#include <EEPROM.h>
#include "wifi.h"
extern "C" {
#include "user_interface.h"
}

//read a string
//a string is multibyte + \0, this is won't work if 1 char is multibyte like chinese char
bool CONFIG::read_string(int pos, char byte_buffer[], int size_max)
{
//check if parameters are acceptable
if (size_max==0 || pos+size_max+1 > EEPROM_SIZE || byte_buffer== NULL)return false;
EEPROM.begin(EEPROM_SIZE);
byte b=0;
int i=0;
//read first byte
Expand All @@ -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 (b!=0)byte_buffer[i-1]=0x00;
EEPROM.end();
return true;
}

Expand All @@ -52,6 +57,7 @@ bool CONFIG::read_string(int pos, String & sbuffer, int size_max)
byte b=0;
int i=0;
sbuffer="";
EEPROM.begin(EEPROM_SIZE);
//read first byte
b = EEPROM.read(pos + i);
sbuffer+=char(b);
Expand All @@ -63,6 +69,7 @@ bool CONFIG::read_string(int pos, String & sbuffer, int size_max)
sbuffer+=char(b);
i++;
}
EEPROM.end();
return true;
}

Expand All @@ -72,12 +79,14 @@ bool CONFIG::read_buffer(int pos, byte byte_buffer[], int size_buffer)
//check if parameters are acceptable
if (size_buffer==0 || pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL)return false;
int i=0;
EEPROM.begin(EEPROM_SIZE);
//read until max size is reached
while (i<size_buffer )
{
byte_buffer[i]=EEPROM.read(pos+i);
i++;
}
EEPROM.end();
return true;
}

Expand All @@ -86,7 +95,9 @@ bool CONFIG::read_byte(int pos, byte * value)
{
//check if parameters are acceptable
if (pos+1 > EEPROM_SIZE)return false;
EEPROM.begin(EEPROM_SIZE);
value[0] = EEPROM.read(pos);
EEPROM.end();
return true;
}

Expand All @@ -104,13 +115,15 @@ bool CONFIG::write_string(int pos, const char * byte_buffer)
//check if parameters are acceptable
if (size_buffer==0 || pos+size_buffer+1 > EEPROM_SIZE || byte_buffer== NULL)return false;
//copy the value(s)
EEPROM.begin(EEPROM_SIZE);
for (int i = 0; i < size_buffer; i++) {
EEPROM.write(pos + i, byte_buffer[i]);
}

//0 terminal
EEPROM.write(pos + size_buffer, 0x00);
EEPROM.commit();
EEPROM.end();
return true;
}

Expand All @@ -119,11 +132,13 @@ bool CONFIG::write_buffer(int pos, const byte * byte_buffer, int size_buffer)
{
//check if parameters are acceptable
if (size_buffer==0 || pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL)return false;
EEPROM.begin(EEPROM_SIZE);
//copy the value(s)
for (int i = 0; i < size_buffer; i++) {
EEPROM.write(pos + i, byte_buffer[i]);
}
EEPROM.commit();
EEPROM.end();
return true;
}

Expand All @@ -132,8 +147,10 @@ bool CONFIG::write_byte(int pos, const byte value)
{
//check if parameters are acceptable
if (pos+1 > EEPROM_SIZE)return false;
EEPROM.begin(EEPROM_SIZE);
EEPROM.write(pos, value);
EEPROM.commit();
EEPROM.end();
return true;
}

Expand Down Expand Up @@ -168,24 +185,157 @@ void CONFIG::print_config()
char sbuf[MAX_PASSWORD_LENGTH+1];
byte bbuf=0;
int ibuf=0;
if (CONFIG::read_byte(EP_WIFI_MODE, &bbuf ))Serial.println(byte(bbuf));
if (CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH))Serial.println(sbuf);
if (CONFIG::read_byte(EP_WIFI_MODE, &bbuf ))
{
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_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_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 (CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&ibuf , INTEGER_LENGTH))Serial.println(ibuf);
if (CONFIG::read_byte(EP_PHY_MODE, &bbuf ))Serial.println(byte(bbuf));
if (CONFIG::read_byte(EP_SLEEP_MODE, &bbuf ))Serial.println(byte(bbuf));
if (CONFIG::read_byte(EP_CHANNEL, &bbuf ))Serial.println(byte(bbuf));
if (CONFIG::read_byte(EP_AUTH_TYPE, &bbuf ))Serial.println(byte(bbuf));
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);
if (CONFIG::read_buffer(EP_DATA_PORT, (byte *)&ibuf , INTEGER_LENGTH))Serial.println(ibuf);
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);
if (CONFIG::read_buffer(EP_XY_FEEDRATE, (byte *)&ibuf , INTEGER_LENGTH))Serial.println(ibuf);
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);

if (CONFIG::read_byte(EP_IP_MODE, &bbuf ))
{
if (byte(bbuf)==STATIC_IP_MODE) Serial.println("IP Mode: Static");
else if (byte(bbuf)==DHCP_MODE) Serial.println("IP Mode: DHCP");
else Serial.println("IP mode: ???");
}
else Serial.println("Error reading IP mode");
if (CONFIG::read_buffer(EP_IP_VALUE,(byte *)sbuf , IP_LENGTH))
{
Serial.print("IP: ");
Serial.println(wifi_config.ip2str((byte *)sbuf));
}
else Serial.println("Error reading IP");
if (CONFIG::read_buffer(EP_MASK_VALUE, (byte *)sbuf , IP_LENGTH))
{
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 change: 0 additions & 1 deletion esp8266/esp8266.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ void setup() {
// ESP.wdtDisable();
system_update_cpu_freq(SYS_CPU_160MHZ);
delay(8000);
EEPROM.begin(EEPROM_SIZE);
bool breset_config=false;
//check if reset config is requested
pinMode(RESET_CONFIG_PIN, INPUT);
Expand Down

0 comments on commit b2f8ab9

Please # to comment.