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

change int to long for baud

Browse Source 
both are 4 bytes size but long is more adapted
This commit is contained in:
luc 2015-06-05 09:34:00 +08:00
parent aaf4ce699f
commit e87497726a
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp8266/config.h
View File

@ -73,7 +73,7 @@ const char DEFAULT_PASSWORD [] PROGMEM = "12345678";
const byte DEFAULT_IP_VALUE[] = {192, 168, 0, 1}; const byte DEFAULT_IP_VALUE[] = {192, 168, 0, 1};
const byte DEFAULT_MASK_VALUE[] = {255, 255, 255, 0}; const byte DEFAULT_MASK_VALUE[] = {255, 255, 255, 0};
#define DEFAULT_GATEWAY_VALUE DEFAULT_IP_VALUE #define DEFAULT_GATEWAY_VALUE DEFAULT_IP_VALUE
const int DEFAULT_BAUD_RATE = 9600; const long DEFAULT_BAUD_RATE = 9600;
#ifdef MDNS_FEATURE #ifdef MDNS_FEATURE
const char LOCAL_NAME[] PROGMEM = "esp8266"; const char LOCAL_NAME[] PROGMEM = "esp8266";
#endif #endif

2
esp8266/esp8266.ino
View File

@ -55,7 +55,7 @@ void setup() {
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
int 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_LENGH)&&CONFIG::read_buffer(EP_WEB_PORT, (byte *)&(wifi_config.iweb_port) , INTEGER_LENGH)&&CONFIG::read_buffer(EP_DATA_PORT, (byte *)&(wifi_config.idata_port) , INTEGER_LENGH)) if ( CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&baud_rate , INTEGER_LENGH)&&CONFIG::read_buffer(EP_WEB_PORT, (byte *)&(wifi_config.iweb_port) , INTEGER_LENGH)&&CONFIG::read_buffer(EP_DATA_PORT, (byte *)&(wifi_config.idata_port) , INTEGER_LENGH))

14
esp8266/webinterface.cpp
View File

@ -320,6 +320,7 @@ void handle_web_interface_root()
struct softap_config apconfig; struct softap_config apconfig;
struct ip_info info; struct ip_info info;
int istatus; int istatus;
int lstatus;
uint8_t mac [WL_MAC_ADDR_LENGTH]; uint8_t mac [WL_MAC_ADDR_LENGTH];
if (wifi_get_opmode()==WIFI_STA ) IP=wifi_config.ip2str(WiFi.localIP()); if (wifi_get_opmode()==WIFI_STA ) IP=wifi_config.ip2str(WiFi.localIP());
else IP=wifi_config.ip2str(WiFi.softAPIP()); else IP=wifi_config.ip2str(WiFi.softAPIP());
@ -361,8 +362,8 @@ void handle_web_interface_root()
//LABEL(sbuf,"Boot mode: ",String(system_get_boot_mode())) //no meaning so far //LABEL(sbuf,"Boot mode: ",String(system_get_boot_mode())) //no meaning so far
LABEL(PROGMEM2CHAR(BOOT_VERSION_TITLE),String(system_get_boot_version()).c_str()) LABEL(PROGMEM2CHAR(BOOT_VERSION_TITLE),String(system_get_boot_version()).c_str())
istatus=0; istatus=0;
if (!CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&istatus , INTEGER_LENGH))istatus=0; if (!CONFIG::read_buffer(EP_BAUD_RATE, (byte *)&lstatus , INTEGER_LENGH))lstatus=0;
LABEL(PROGMEM2CHAR(BAUD_RATE_TITLE),String(istatus).c_str()) LABEL(PROGMEM2CHAR(BAUD_RATE_TITLE),String(lstatus).c_str())
istatus=0; istatus=0;
if (!CONFIG::read_buffer(EP_WEB_PORT, (byte *)&istatus , INTEGER_LENGH))istatus=0; if (!CONFIG::read_buffer(EP_WEB_PORT, (byte *)&istatus , INTEGER_LENGH))istatus=0;
LABEL(PROGMEM2CHAR(WEB_PORT_TITLE),String(istatus).c_str()) LABEL(PROGMEM2CHAR(WEB_PORT_TITLE),String(istatus).c_str())
@ -481,12 +482,11 @@ void handle_web_interface_configSys()
{ {
String stmp,smsg; String stmp,smsg;
String buffer2send =""; String buffer2send ="";
int istatus=0;
byte bflag=0; byte bflag=0;
char error_display[4]={0,0,0,0}; char error_display[4]={0,0,0,0};
bool msg_alert_error=false; bool msg_alert_error=false;
bool msg_alert_success=false; bool msg_alert_success=false;
int ibaud=0; long ibaud=0;
int iweb_port =0; int iweb_port =0;
int idata_port =0; int idata_port =0;
byte bsleepmode=0; byte bsleepmode=0;
@ -495,8 +495,8 @@ void handle_web_interface_configSys()
{ //is there a correct list of values? { //is there a correct list of values?
if (web_interface->WebServer.hasArg(PROGMEM2CHAR(BAUD_RATE_ID)) && web_interface->WebServer.hasArg(PROGMEM2CHAR(SLEEP_MODE_ID))&& web_interface->WebServer.hasArg(PROGMEM2CHAR(WEB_PORT_ID))&& web_interface->WebServer.hasArg(PROGMEM2CHAR(DATA_PORT_ID))) if (web_interface->WebServer.hasArg(PROGMEM2CHAR(BAUD_RATE_ID)) && web_interface->WebServer.hasArg(PROGMEM2CHAR(SLEEP_MODE_ID))&& web_interface->WebServer.hasArg(PROGMEM2CHAR(WEB_PORT_ID))&& web_interface->WebServer.hasArg(PROGMEM2CHAR(DATA_PORT_ID)))
{ //is each value correct ? { //is each value correct ?
ibaud = atoi(web_interface->WebServer.arg(PROGMEM2CHAR(BAUD_RATE_ID)).c_str()); ibaud = atol(web_interface->WebServer.arg(PROGMEM2CHAR(BAUD_RATE_ID)).c_str());
iweb_port = atoi(web_interface->WebServer.arg(PROGMEM2CHAR(WEB_PORT_ID)).c_str()); iweb_port = atol(web_interface->WebServer.arg(PROGMEM2CHAR(WEB_PORT_ID)).c_str());
idata_port = atoi(web_interface->WebServer.arg(PROGMEM2CHAR(DATA_PORT_ID)).c_str()); idata_port = atoi(web_interface->WebServer.arg(PROGMEM2CHAR(DATA_PORT_ID)).c_str());
bsleepmode = atoi(web_interface->WebServer.arg(PROGMEM2CHAR(SLEEP_MODE_ID)).c_str()); bsleepmode = atoi(web_interface->WebServer.arg(PROGMEM2CHAR(SLEEP_MODE_ID)).c_str());
if (!(iweb_port>0 && iweb_port<65001) || if (!(iweb_port>0 && iweb_port<65001) ||
@ -657,7 +657,6 @@ void handle_web_interface_configAP()
byte auth_buf; byte auth_buf;
byte channel_buf; byte channel_buf;
byte phy_mode_buf; byte phy_mode_buf;
int istatus=0;
byte bflag=0; byte bflag=0;
bool msg_alert_error=false; bool msg_alert_error=false;
bool msg_alert_success=false; bool msg_alert_success=false;
@ -1024,7 +1023,6 @@ void handle_web_interface_configSTA()
byte auth_buf; byte auth_buf;
byte channel_buf; byte channel_buf;
byte phy_mode_buf; byte phy_mode_buf;
int istatus=0;
byte bflag=0; byte bflag=0;
bool revertSTA=false; bool revertSTA=false;
bool msg_alert_error=false; bool msg_alert_error=false;