Merge branch 'master' of https://github.com/ISIS2503/201810_01_softse…

…curity
ISIS2503 · May 18, 2018 · 96d4cda · 96d4cda
2 parents 219bf43 + 0f86ecf
commit 96d4cda
Show file tree

Hide file tree

Showing 383 changed files with 116 additions and 89,389 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 **/*.xml
+*.iml
diff --git a/.idea/201810_01_softsecurity.iml b/.idea/201810_01_softsecurity.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/EntidadFisica/codigonodemcu/codigonodemcu.ino b/EntidadFisica/codigonodemcu/codigonodemcu.ino
@@ -19,8 +19,8 @@ PubSubClient  clientMQTT(clientWIFI);
 
 // CONFIG WIFI
 //u:EventosUAndes c:EvUniandinos.18
-const char* ssid = "FAMILIA HIDALGO";
-const char* password = "51688GHJ";
+const char* ssid = "EventosUAndes";
+const char* password = "EvUniandinos.18";
 
 // CONFIG MQTT
 const char* mqtt_server = "broker.mqtt-dashboard.com";