phschoen
/
ESPuino
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Adding RSSI

master
Torsten Stauder 4 years ago
parent
a4c51d385e
commit
a5cfa8b3b9
8 changed files with 23 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      html/management_DE.html
  2. 2
      html/management_EN.html
  3. 2
      src/HTMLmanagement_DE.h
  4. 2
      src/HTMLmanagement_EN.h
  5. 10
      src/Web.cpp
  6. 6
      src/Wlan.cpp
  7. 3
      src/Wlan.h
  8. 6
      src/main.cpp

2
html/management_DE.html
View File

@ -137,7 +137,7 @@
<a class="reboot float-right nav-link" href="/restart"><i class="fas fa-redo"></i> Neustart</a> <a class="reboot float-right nav-link" href="/restart"><i class="fas fa-redo"></i> Neustart</a>
<a class="reboot float-right nav-link" href="/shutdown"><i class="fas fa-power-off"></i> Ausschalten</a> <a class="reboot float-right nav-link" href="/shutdown"><i class="fas fa-power-off"></i> Ausschalten</a>
<a class="reboot float-right nav-link" href="/log"><i class="fas fa-book"></i> Log</a> <a class="reboot float-right nav-link" href="/log"><i class="fas fa-book"></i> Log</a>
<a class="reboot float-right nav-link" href="/info"><i class="fas fa-info"></i> RAM-info</a>
<a class="reboot float-right nav-link" href="/info"><i class="fas fa-info"></i> Infos</a>
</div> </div>
</nav> </nav>
<br/> <br/>

2
html/management_EN.html
View File

@ -137,7 +137,7 @@
<a class="reboot float-right nav-link" href="/restart"><i class="fas fa-redo"></i> Restart</a> <a class="reboot float-right nav-link" href="/restart"><i class="fas fa-redo"></i> Restart</a>
<a class="reboot float-right nav-link" href="/shutdown"><i class="fas fa-power-off"></i> Shutdown</a> <a class="reboot float-right nav-link" href="/shutdown"><i class="fas fa-power-off"></i> Shutdown</a>
<a class="reboot float-right nav-link" href="/log"><i class="fas fa-book"></i> Log</a> <a class="reboot float-right nav-link" href="/log"><i class="fas fa-book"></i> Log</a>
<a class="reboot float-right nav-link" href="/info"><i class="fas fa-info"></i> RAM-info</a>
<a class="reboot float-right nav-link" href="/info"><i class="fas fa-info"></i> Infos</a>
</div> </div>
</nav> </nav>
<br/> <br/>

2
src/HTMLmanagement_DE.h
View File

@ -137,7 +137,7 @@ static const char management_HTML[] PROGMEM = "<!DOCTYPE html>\
<a class=\"reboot float-right nav-link\" href=\"/restart\"><i class=\"fas fa-redo\"></i> Neustart</a>\ <a class=\"reboot float-right nav-link\" href=\"/restart\"><i class=\"fas fa-redo\"></i> Neustart</a>\
<a class=\"reboot float-right nav-link\" href=\"/shutdown\"><i class=\"fas fa-power-off\"></i> Ausschalten</a>\ <a class=\"reboot float-right nav-link\" href=\"/shutdown\"><i class=\"fas fa-power-off\"></i> Ausschalten</a>\
<a class=\"reboot float-right nav-link\" href=\"/log\"><i class=\"fas fa-book\"></i> Log</a>\ <a class=\"reboot float-right nav-link\" href=\"/log\"><i class=\"fas fa-book\"></i> Log</a>\
<a class=\"reboot float-right nav-link\" href=\"/info\"><i class=\"fas fa-info\"></i> RAM-info</a>\
<a class=\"reboot float-right nav-link\" href=\"/info\"><i class=\"fas fa-info\"></i> Infos</a>\
</div>\ </div>\
</nav>\ </nav>\
<br/>\ <br/>\

2
src/HTMLmanagement_EN.h
View File

@ -137,7 +137,7 @@ static const char management_HTML[] PROGMEM = "<!DOCTYPE html>\
<a class=\"reboot float-right nav-link\" href=\"/restart\"><i class=\"fas fa-redo\"></i> Restart</a>\ <a class=\"reboot float-right nav-link\" href=\"/restart\"><i class=\"fas fa-redo\"></i> Restart</a>\
<a class=\"reboot float-right nav-link\" href=\"/shutdown\"><i class=\"fas fa-power-off\"></i> Shutdown</a>\ <a class=\"reboot float-right nav-link\" href=\"/shutdown\"><i class=\"fas fa-power-off\"></i> Shutdown</a>\
<a class=\"reboot float-right nav-link\" href=\"/log\"><i class=\"fas fa-book\"></i> Log</a>\ <a class=\"reboot float-right nav-link\" href=\"/log\"><i class=\"fas fa-book\"></i> Log</a>\
<a class=\"reboot float-right nav-link\" href=\"/info\"><i class=\"fas fa-info\"></i> RAM-info</a>\
<a class=\"reboot float-right nav-link\" href=\"/info\"><i class=\"fas fa-info\"></i> Infos</a>\
</div>\ </div>\
</nav>\ </nav>\
<br/>\ <br/>\

10
src/Web.cpp
View File

@ -156,11 +156,17 @@ void webserverStart(void) {
info += "\nGroesster freier heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT)); info += "\nGroesster freier heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT));
info += "\nFreier PSRAM: "; info += "\nFreier PSRAM: ";
info += (!psramInit()) ? "nicht verfuegbar" : String(ESP.getFreePsram()); info += (!psramInit()) ? "nicht verfuegbar" : String(ESP.getFreePsram());
if (Wlan_IsConnected) {
info += "\nWLAN-Signalstaerke: " + String((int8_t)Wlan_GetRssi()) + " dBm";
}
#else #else
String info = "Free heap: " + String(ESP.getFreeHeap()); String info = "Free heap: " + String(ESP.getFreeHeap());
info += "\nLargest free heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT)); info += "\nLargest free heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT));
info += "\nFree PSRAM: "; info += "\nFree PSRAM: ";
info += (!psramInit()) ? "not available" : String(ESP.getFreePsram()); info += (!psramInit()) ? "not available" : String(ESP.getFreePsram());
if (Wlan_IsConnected) {
info += "\nWiFi signal-strength: " + String((int8_t)Wlan_GetRssi()) + " dBm";
}
#endif #endif
request->send_P(200, "text/plain", info.c_str()); request->send_P(200, "text/plain", info.c_str());
}); });
@ -812,7 +818,7 @@ void handleUpload(AsyncWebServerRequest *request, String filename, size_t index,
} }
if (!tmpFile) { if (!tmpFile) {
Serial.println(F("Error occured while saving tmpfile to SD"));
Log_Println((char *) FPSTR(errorWritingTmpfile), LOGLEVEL_ERROR);
return; return;
} }
@ -859,12 +865,10 @@ void Web_DumpSdToNvs(const char *_filename) {
count = true; count = true;
memcpy(nvsEntry[0].nvsKey, token, strlen(token)); memcpy(nvsEntry[0].nvsKey, token, strlen(token));
nvsEntry[0].nvsKey[strlen(token)] = '\0'; nvsEntry[0].nvsKey[strlen(token)] = '\0';
//Serial.printf("Key: %s\n", token);
} else { } else {
count = false; count = false;
memcpy(nvsEntry[0].nvsEntry, token, strlen(token)); memcpy(nvsEntry[0].nvsEntry, token, strlen(token));
nvsEntry[0].nvsEntry[strlen(token)] = '\0'; nvsEntry[0].nvsEntry[strlen(token)] = '\0';
//Serial.printf("Entry: %s\n", token);
} }
token = strtok(NULL, stringOuterDelimiter); token = strtok(NULL, stringOuterDelimiter);
} }

6
src/Wlan.cpp
View File

@ -30,7 +30,7 @@ void Wlan_Init(void) {
} }
void Wlan_Cyclic(void) { void Wlan_Cyclic(void) {
// If wifi whould not be activated, return instantly
// If wifi would not be activated, return instantly
if (!wifiEnabled) { if (!wifiEnabled) {
return; return;
} }
@ -114,6 +114,10 @@ String Wlan_GetIpAddress(void) {
return WiFi.localIP().toString(); return WiFi.localIP().toString();
} }
int8_t Wlan_GetRssi(void) {
return WiFi.RSSI();
}
// Initialize soft access-point // Initialize soft access-point
void accessPointStart(const char *SSID, IPAddress ip, IPAddress netmask) { void accessPointStart(const char *SSID, IPAddress ip, IPAddress netmask) {
WiFi.mode(WIFI_AP); WiFi.mode(WIFI_AP);

3
src/Wlan.h
View File

@ -4,4 +4,5 @@ void Wlan_Init(void);
void Wlan_Cyclic(void); void Wlan_Cyclic(void);
bool Wlan_IsConnected(void); bool Wlan_IsConnected(void);
boolean Wlan_ToggleEnable(void); boolean Wlan_ToggleEnable(void);
String Wlan_GetIpAddress(void);
String Wlan_GetIpAddress(void);
int8_t Wlan_GetRssi(void);

6
src/main.cpp
View File

@ -185,7 +185,7 @@ void setup()
Serial.println(F(" | |___ ___) | | __/ | |_| | | | | | | | | (_) |")); Serial.println(F(" | |___ ___) | | __/ | |_| | | | | | | | | (_) |"));
Serial.println(F(" |_____| |____/ |_| \\__,_| |_| |_| |_| \\___/ ")); Serial.println(F(" |_____| |____/ |_| \\__,_| |_| |_| |_| \\___/ "));
Serial.println(F(" Rfid-controlled musicplayer\n")); Serial.println(F(" Rfid-controlled musicplayer\n"));
Serial.println(F(" Rev 20210707-1\n"));
Serial.println(F(" Rev 20210708-1\n"));
// print wake-up reason // print wake-up reason
printWakeUpReason(); printWakeUpReason();
@ -231,6 +231,10 @@ void setup()
Log_Println(Log_Buffer, LOGLEVEL_DEBUG); Log_Println(Log_Buffer, LOGLEVEL_DEBUG);
snprintf(Log_Buffer, Log_BufferLength, "Flash-size: %u bytes", ESP.getFlashChipSize()); snprintf(Log_Buffer, Log_BufferLength, "Flash-size: %u bytes", ESP.getFlashChipSize());
Log_Println(Log_Buffer, LOGLEVEL_DEBUG); Log_Println(Log_Buffer, LOGLEVEL_DEBUG);
if (Wlan_IsConnected()) {
snprintf(Log_Buffer, Log_BufferLength, "RSSI: %d dBm", Wlan_GetRssi());
Log_Println(Log_Buffer, LOGLEVEL_DEBUG);
}
System_ShowUpgradeWarning(); System_ShowUpgradeWarning();
} }

Write Preview
Loading…
Cancel
Save