Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New printer interface... #74

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0c53077
Change of units
treepleks Jan 16, 2016
5846f66
The notion of user (there is only one) does not seem needed. Let's ki…
treepleks Jan 16, 2016
b884c77
Saving Flash: let's factor code (Key/Values list management)
treepleks Jan 16, 2016
c6524ea
More Key/Values list factors detected (plus typos)
treepleks Jan 16, 2016
4d7d7a1
According to Expressif SDK, there is 'MAX' wifi authentification mode…
treepleks Jan 16, 2016
cd82661
Error/message processing refactoring + typos and minor improvements.
treepleks Jan 16, 2016
5d14101
Saving RAM using F() macro
treepleks Jan 16, 2016
97cb720
The "Admin" menu hightlisghts the STA item. We eed and ADMIN_MENU key.
treepleks Jan 16, 2016
768be5b
Put Free Memory Values at the end to get more "up to date " values.
treepleks Jan 16, 2016
32c5a5a
Local code shortening
treepleks Jan 16, 2016
dbf3561
The F() macro again.
treepleks Jan 16, 2016
0bc16fa
The F() macro again
treepleks Jan 16, 2016
95864f4
Change keys following the admin user removal
treepleks Jan 16, 2016
f48c2ea
lenght -> length
treepleks Jan 16, 2016
90660e2
octets -> bytes
treepleks Jan 16, 2016
a4c37b9
Some flash mem pooling using FPSTR
treepleks Jan 16, 2016
27412f3
chasing " :" (in English, : are used w/o space before - contrarily to…
treepleks Jan 16, 2016
ffc6c32
Highlight the "Admin" menu when selected
treepleks Jan 16, 2016
5db7ac1
Allow SSDP to be deactivated w/o compilation error.
treepleks Jan 16, 2016
4114320
Luc is right. strcpy seems even better than strcat in this case.
treepleks Jan 23, 2016
6cad3a7
CSS: lowered padding of td to 1mm
treepleks Jan 23, 2016
baca67b
JogBar font color
treepleks Jan 23, 2016
b1ec721
JogCommands in Extruder bars include tool changing commands
treepleks Jan 23, 2016
4082b09
Cleaning...
treepleks Jan 23, 2016
eb27ad5
Simplified, updated README.
treepleks Jan 24, 2016
31d9201
Remove F() macro for SSDP (following luc suggestion)
treepleks Jan 24, 2016
9eb2e46
T Reepleks flavoring, with kudos to luc.
treepleks Jan 24, 2016
4afe334
Now reads SD card - still not fully reliable.
treepleks Jan 24, 2016
5b562f5
Simplified hotend gradients
treepleks Jan 24, 2016
dd371ca
Simplified menu: no GitHub reference
treepleks Jan 24, 2016
3b8a57b
ALlows for platformio compilation
treepleks Jan 31, 2016
a13e5db
iget last commit from luc: optional web update
treepleks Jan 31, 2016
781cd2f
Oops. Pooled PROGMEM should use FPSTR.
treepleks Feb 1, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chasing " :" (in English, : are used w/o space before - contrarily to…
… what is done in french spacing)
  • Loading branch information
treepleks committed Jan 16, 2016
commit 27412f318f985df76a756647d08947fa7bcb63cd
2 changes: 1 addition & 1 deletion esp8266/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ void CONFIG::print_config()
#else
Serial.println(F("Disabled"));
#endif
Serial.print(F("mDNS : "));
Serial.print(F("mDNS: "));
#ifdef MDNS_FEATURE
Serial.println(F("Enabled"));
#else
Expand Down
2 changes: 1 addition & 1 deletion esp8266/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

//comment to disable
//MDNS_FEATURE: this feature allow type the name defined
//in web browser by default : http:\\esp8266.local and connect
//in web browser by default: http:\\esp8266.local and connect
#define MDNS_FEATURE

//SSDD_FEATURE: this feature is a discovery protocol, supported on Windows out of the box
Expand Down
2 changes: 1 addition & 1 deletion esp8266/data/config_ap.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $INCLUDE[header.inc]$
<div class="form-group $AP_SSID_STATUS$">
<label class="control-label" for="CONFIG1">SSID: </label><br>
<input type="text" class="form-control" id="CONFIG1" name="SSID" placeholder="SSID (8~32)" max="32" value="$AP_SSID$" style="width: auto;"></div>
<div class="form-group $AP_PASSWORD_STATUS$"><label class="control-label" for="CONFIG2">Password :</label><br>
<div class="form-group $AP_PASSWORD_STATUS$"><label class="control-label" for="CONFIG2">Password:</label><br>
<input type="password" class="form-control" id="CONFIG2" name="PASSWORD" placeholder="Password (0~64)" max="64" value="$AP_PASSWORD$" style="width: auto;"></div>
<div class="checkbox $IS_SSID_VISIBLE_STATUS$"><label class="control-label"><input type="checkbox" name="SSID_VISIBLE" $IS_SSID_VISIBLE$>Visible</label></div>
<div class="form-group $NETWORK_OPTION_LIST_STATUS$"><label class="control-label" for="CONFIG3">Network: </label><br>
Expand Down
2 changes: 1 addition & 1 deletion esp8266/data/config_sta.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $INCLUDE[header.inc]$
</DIV>
<div class="form-group $STA_SSID_STATUS$" ><label class="control-label" for="CONFIG1">SSID: </label><br>
<input type="text" class="form-control" id="CONFIG1" name="SSID" placeholder="SSID (8~32)" value="$STA_SSID$" max="32" style="width: auto;"></div>
<div class="form-group $STA_PASSWORD_STATUS$"><label class="control-label"for="CONFIG2">Password :</label><br>
<div class="form-group $STA_PASSWORD_STATUS$"><label class="control-label"for="CONFIG2">Password:</label><br>
<input type="password" class="form-control" id="CONFIG2" name="PASSWORD" placeholder="Password (0~64)" max="64" value="$STA_PASSWORD$" style="width: auto;"></div>
<div class="form-group $HOSTNAME_STATUS$" ><label class="control-label" for="CONFIG7">Hostname: </label><br>
<input type="text" class="form-control" id="CONFIG7" name="HOSTNAME" placeholder="Hostname (1~32)" value="$HOSTNAME$" max="32" style="width: auto;"></div>
Expand Down
2 changes: 1 addition & 1 deletion esp8266/data/login.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $INCLUDE[header.inc]$
<div class="panel-heading">Log in</div>
<div class="panel-body">
<form method="POST">
<div class="form-group $PASSWORD_STATUS$"><label class="control-label" for="PASSWORD">Password :</label><br>
<div class="form-group $PASSWORD_STATUS$"><label class="control-label" for="PASSWORD">Password:</label><br>
<input type="hidden" name="return" value="$RETURN$">
<input type="password" class="form-control" id="PASSWORD" name="PASSWORD" placeholder="Password (1~16)" min="1" max="16" value="$PASSWORD$" style="width: auto;"></div>
<div class="alert alert-danger" role="alert" style="$ERROR_MSG_VISIBILITY$" >
Expand Down
2 changes: 1 addition & 1 deletion esp8266/data/password.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $INCLUDE[header.inc]$
<form method="POST">
<div id="divpassword1" class="form-group $PASSWORD_STATUS$" ><label class="control-label" for="PASSWORD1">Password: </label><br>
<input type="password" class="form-control" onkeyup="checkpassword()" id="PASSWORD1" name="PASSWORD" placeholder="Password (1~16)" value="$PASSWORD$" max="16" m1n="1" style="width: auto;"></div>
<div id="divpassword2" class="form-group $PASSWORD_STATUS2$"><label class="control-label"for="PASSWORD2">Confirm Password :</label><br>
<div id="divpassword2" class="form-group $PASSWORD_STATUS2$"><label class="control-label"for="PASSWORD2">Confirm Password:</label><br>
<input type="password" class="form-control" onkeyup="checkpassword()" id="PASSWORD2" name="PASSWORD2" placeholder="Password (1~16)" max="16" minn="1" value="$PASSWORD2$" style="width: auto;"></div>
<div class="alert alert-danger" role="alert" id="alerterror" style="$ERROR_MSG_VISIBILITY$" >
$ERROR_MSG$
Expand Down
2 changes: 1 addition & 1 deletion esp8266/data/settings.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ content +="</div></TD><td></td></TR>";
}
document.getElementById('file_list').innerHTML=content;}
function Delete(filename){
if (confirm("Confirm deletion of :" + filename))SendCommand("delete",filename);
if (confirm("Confirm deletion of:" + filename))SendCommand("delete",filename);
}
function SendCommand(action,filename){
var xmlhttp = new XMLHttpRequest();
Expand Down
4 changes: 2 additions & 2 deletions esp8266/esp8266.ino
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
This firmware is using the standard arduino IDE with module to support ESP8266:
https://github.com/esp8266/Arduino from Bootmanager

Latest version of the code and documentation can be found here :
Latest version of the code and documentation can be found here:
https://github.com/luc-github/ESP8266

Main author: luc lebosse
Expand Down Expand Up @@ -56,7 +56,7 @@ WiFiServer * data_server;
WiFiClient serverClients[MAX_SRV_CLIENTS];

void setup() {
// init :
// init:
web_interface = NULL;
data_server = NULL;
// ESP.wdtDisable();
Expand Down
4 changes: 2 additions & 2 deletions esp8266/webinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ sprintf(result,"%d",value);
return result;
}

//TODO : should be in webserver class
//TODO: should be in webserver class
bool processTemplate(const char * filename, STORESTRINGS_CLASS & KeysList , STORESTRINGS_CLASS & ValuesList )
{
if(KeysList.size() != ValuesList.size()) //Sanity check
Expand Down Expand Up @@ -352,7 +352,7 @@ bool processTemplate(const char * filename, STORESTRINGS_CLASS & KeysList , ST
File includefile = SPIFFS.open(includefilename, "r");
if (!includefile) //if error display it on web page
{
buffer2send+= String("Error opening : ") + includefilename;
buffer2send+= String("Error opening: ") + includefilename;
}
else //if include is open lets read it, current open file is now include file
{
Expand Down