Skip to content

Commit

Permalink
nuevo heartbeat
Browse files Browse the repository at this point in the history
  • Loading branch information
afpinzon10 committed May 7, 2018
1 parent c988554 commit 8fdf1e5
Show file tree
Hide file tree
Showing 15 changed files with 1,102 additions and 1,252 deletions.
Binary file modified EntidadFisica/WiringArquisoft/editing/build/core.a
Binary file not shown.
3 changes: 0 additions & 3 deletions EntidadFisica/WiringArquisoft/editing/build/editing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,6 @@ void loop()
if(time2<time1 || initsound) {
tone(16, 262);
Serial.println("sound");
Serial.println(time1);
Serial.println(time2);
delay(2000);
noTone(16);
pause=false;
Expand Down Expand Up @@ -251,7 +249,6 @@ void loop()
boolean bol = false;
boolean found = false;
if(compareKey(currentKey)) {
Serial.println("reached");
setColor(255,0,255);
digitalWrite(10,HIGH);
open = true;
Expand Down
Binary file modified EntidadFisica/WiringArquisoft/editing/build/editing.cpp.elf
Binary file not shown.
1,739 changes: 865 additions & 874 deletions EntidadFisica/WiringArquisoft/editing/build/editing.cpp.hex

Large diffs are not rendered by default.

Binary file modified EntidadFisica/WiringArquisoft/editing/build/editing.cpp.o
Binary file not shown.
3 changes: 0 additions & 3 deletions EntidadFisica/WiringArquisoft/editing/build/editing.pde
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ void loop()
if(time2<time1 || initsound) {
tone(16, 262);
Serial.println("sound");
Serial.println(time1);
Serial.println(time2);
delay(2000);
noTone(16);
pause=false;
Expand Down Expand Up @@ -240,7 +238,6 @@ void loop()
boolean bol = false;
boolean found = false;
if(compareKey(currentKey)) {
Serial.println("reached");
setColor(255,0,255);
digitalWrite(10,HIGH);
open = true;
Expand Down
3 changes: 0 additions & 3 deletions EntidadFisica/WiringArquisoft/editing/editing.pde
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ void loop()
if(time2<time1 || initsound) {
tone(16, 262);
Serial.println("sound");
Serial.println(time1);
Serial.println(time2);
delay(2000);
noTone(16);
pause=false;
Expand Down Expand Up @@ -240,7 +238,6 @@ void loop()
boolean bol = false;
boolean found = false;
if(compareKey(currentKey)) {
Serial.println("reached");
setColor(255,0,255);
digitalWrite(10,HIGH);
open = true;
Expand Down
4 changes: 2 additions & 2 deletions EntidadFisica/codigonodemcu/codigonodemcu.ino
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ PubSubClient clientMQTT(clientWIFI);

// CONFIG WIFI
//u:EventosUAndes c:EvUniandinos.18
const char* ssid = "EventosUAndes";
const char* password = "EvUniandinos.18";
const char* ssid = "FAMILIA HIDALGO";
const char* password = "51688GHJ";

// CONFIG MQTT
const char* mqtt_server = "broker.mqtt-dashboard.com";
Expand Down
325 changes: 0 additions & 325 deletions EntidadVirtual/API_REST/apirest.py

This file was deleted.

3 changes: 1 addition & 2 deletions EntidadVirtual/API_REST/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// /requirements.txt

flask
flask-pymongo
python-dotenv
requests
authlib
Expand Down
Loading

0 comments on commit 8fdf1e5

Please sign in to comment.