diff --git a/0x01-temperatura/0x01-temperatura.ino b/0x01-temperatura/0x01-temperatura.ino index f49c9bf..4729f4e 100644 --- a/0x01-temperatura/0x01-temperatura.ino +++ b/0x01-temperatura/0x01-temperatura.ino @@ -1,71 +1,76 @@ -int inData; -char sensorValue = "10"; -const byte devID = 0x01; +#include +#include + +// Pin donde se conecta el bus 1-Wire +const int pinDatosDQ = 2; + +// Instancia a las clases OneWire y DallasTemperature +OneWire oneWireObjeto(pinDatosDQ); +DallasTemperature sensorDS18B20(&oneWireObjeto); + + +// Dispositivo +const int devID = 1; +char devIDstr[5]; +int inQuery; -char *senData[] { - "T", // Tipo de sensor - "s", // Lectura del sensor - "C" - -}; +float getData() { + sensorDS18B20.requestTemperatures(); + return (sensorDS18B20.getTempCByIndex(0)); +} void setup() { - Serial.begin(14400); + Serial.begin(9600); + sensorDS18B20.begin(); -} +} void loop() { + + + + + + if ( Serial.available() > 0) { - inData = Serial.read(); - switch (inData) { - case devID: - - Serial.write(devID); - - for (int i = 0; i <= 3; i++) { - Serial.write(senData[i]); - - } - Serial.write("99"); - - break; - } - } -} + inQuery = Serial.read(); + if ( inQuery = devID) { -/*if ( Serial.available() > 0) { - inData = Serial.read(); - switch (inData) { - case devID: - Serial.write("0x01"); + + + + + Serial.write(itoa(devID, devIDstr, 10)); Serial.write(" "); - Serial.write("hum"); + Serial.write("T"); + //Serial.write(" "); + + float lectura = getData(); + char lecturaStr[8]; // Buffer big enough for 7-character float + dtostrf(lectura, 6, 2, lecturaStr); // Leave room for too large numbers! + + + Serial.write(lecturaStr); Serial.write(" "); - Serial.write("78"); - Serial.write(" "); - Serial.write("P"); + Serial.write("C"); Serial.write(" "); Serial.write("99"); - Serial.write(" "); - Serial.write("pre"); - Serial.write(" "); - Serial.write("100"); - Serial.write(" "); - Serial.write("Hpa"); - Serial.write(" "); - Serial.write("98"); - Serial.write(" "); - break; + + } + } - } */ + + delay(1500); + +} diff --git a/0x01-temperatura/config.ino b/0x01-temperatura/config.ino new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/0x01-temperatura/config.ino @@ -0,0 +1 @@ + diff --git a/0x02-turbidez/0x02-turbidez.ino b/0x02-turbidez/0x02-turbidez.ino new file mode 100644 index 0000000..5ce20dc --- /dev/null +++ b/0x02-turbidez/0x02-turbidez.ino @@ -0,0 +1,30 @@ +int inData; +const char* valueSensor; + +void setup() { + Serial.begin(9600); +} + + + void loop() { + + if ( Serial.available() > 0) { + inData = Serial.read(); + + switch (inData) { + case 2: + Serial.print(2); + Serial.print(" "); + Serial.print("hum"); + Serial.print(" "); + Serial.print("78"); + Serial.print(" "); + Serial.print("P"); + Serial.print(" "); + Serial.print("99"); + Serial.print(" "); + + break; + } + } +}