some fixes #3

pull/1/head
Thomas Ballmann 4 years ago
parent 31acb54167
commit 02d8826302

@ -21,8 +21,6 @@
<v-card <v-card
max-width="344" max-width="344"
class="mx-auto" class="mx-auto"
_color="grey lighten-4"
_flat _height="200px"
> >
<v-template v-if="!wifiStats.connected"> <v-template v-if="!wifiStats.connected">
<v-card-text> <v-card-text>
@ -75,57 +73,7 @@
</v-card> </v-card>
<v-card <br/><br/>
style="display:none"
max-width="344"
class="mx-auto"
>
<v-card-title>
<v-icon
large
left
>
$signalWifi3Lock
</v-icon>
<span class="title font-weight-light">xd-design.info</span>
</v-card-title>
<v-divider></v-divider>
<v-card-text>
<div>connected to</div>
<p class="display-1 text--primary">
xd-design.info
</p>
</v-card-text>
<v-divider></v-divider>
<v-list-item>
<v-list-item-avatar color="grey_">
<v-icon size="25">$signalWifi3Lock</v-icon>
</v-list-item-avatar>
<v-list-item-content>
<v-list-item-title class="headline">xd-design.info</v-list-item-title>
<v-list-item-subtitle>connected to</v-list-item-subtitle>
</v-list-item-content>
</v-list-item>
<v-divider class="mx-4"></v-divider>
<v-list dense>
<v-list-item
v-for="(value, key) in wifiStats"
:key="key"
>
<v-list-item-title>{{ key }}</v-list-item-title>
<v-list-item-subtitle class="text-right">
{{ value }}
</v-list-item-subtitle>
</v-list-item>
</v-list>
</v-card>
<br/><br/>
<!-- connect to wifi --> <!-- connect to wifi -->
@ -201,12 +149,14 @@
import apiDevice from '../api/device' import apiDevice from '../api/device'
export default { export default {
name: "Settings", name: "Wifi",
data: () => ({ data: () => ({
isLoading: true, isLoading: true,
isSnackbar: false, isSnackbar: false,
isConnecting: false, isConnecting: false,
mode: 'AP_initial', // AP_initial, AP_lost, Default
// todo load
wifiStats: { wifiStats: {
connected: true, connected: true,
ip: 'xxx.xxx.xxx.xxx', ip: 'xxx.xxx.xxx.xxx',

@ -47,11 +47,11 @@ void setupApp()
doc["wifi"]["ssid"] = WiFi.SSID(); doc["wifi"]["ssid"] = WiFi.SSID();
doc["wifi"]["connected"] = WiFi.isConnected(); doc["wifi"]["connected"] = WiFi.isConnected();
doc["wifi"]["ip"] = WiFi.localIP(); doc["wifi"]["ip"] = WiFi.localIP().toString();
doc["wifi"]["mac"] = WiFi.macAddress(); doc["wifi"]["mac"] = WiFi.macAddress();
doc["wifi"]["channel"] = WiFi.channel(); doc["wifi"]["channel"] = WiFi.channel();
doc["wifi"]["dns"] = WiFi.dnsIP(); doc["wifi"]["dns"] = WiFi.dnsIP().toString();
doc["wifi"]["gateway"] = WiFi.gatewayIP(); doc["wifi"]["gateway"] = WiFi.gatewayIP().toString();
doc["device"]["heap"] = ESP.getFreeHeap(); doc["device"]["heap"] = ESP.getFreeHeap();
doc["device"]["bootCycle"] = deviceGetBootCount(); doc["device"]["bootCycle"] = deviceGetBootCount();

@ -55,16 +55,12 @@ void ___connectToNetwork()
void initClientMode(const char *ssid, const char *password) void initClientMode(const char *ssid, const char *password)
{ {
uint8_t veces = 10; uint8_t veces = 5;
long startMills = millis(); long startMills = millis();
Serial.print(" Connecting to: "); Serial.print(" Connecting to: ");
Serial.print(ssid); Serial.print(ssid);
Serial.print(" ");
// print try count
Serial.print(" (");
Serial.print(wifiFailedCount);
Serial.print("x)");
// connecting // connecting
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
@ -74,28 +70,17 @@ void initClientMode(const char *ssid, const char *password)
while (WiFi.status() != WL_CONNECTED) while (WiFi.status() != WL_CONNECTED)
{ {
delay(500); delay(500);
Serial.println(veces); Serial.print(".");
if (!veces--) if (!veces--)
{ {
veces = 10; veces = 5;
WiFi.disconnect(); WiFi.disconnect();
Serial.println("Wifi reset..."); Serial.println(" wifi reset...");
delay(500); delay(500);
WiFi.begin(ssid, password); WiFi.begin(ssid, password);
Serial.println("Establishing connection to WiFi..");
} }
} }
/*
while (WiFi.waitForConnectResult() != WL_CONNECTED)
{
wifiFailedCount++;
Serial.println("Connection Failed! Rebooting...");
delay(100);
ESP.restart();
}
*/
Serial.println(" ...connected"); Serial.println(" ...connected");
Serial.print(" IP address: "); Serial.print(" IP address: ");
Serial.println(WiFi.localIP()); Serial.println(WiFi.localIP());

Loading…
Cancel
Save