community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes to the jaggery app

Browse Source
merge-requests/1/head
Rasika 10 years ago
parent 9f4d2fed4b
commit c24e6edea1
14 changed files with 671 additions and 62 deletions
Show Stats Download Patch File Download Diff File

3
modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag
Unescape View File

@ -41,7 +41,8 @@ if (uriMatcher.match("/{context}/api/device/sketch/")) {
exit(); exit();
} }
serviceUrl = "http://localhost:9763/WSO2ConnectedDevices-1.0.0/FireAlarmDeviceManager/DownloadSketch"; serviceUrl = "http://localhost:9763/WSO2ConnectedDevices-1.0" +
".0/FireAlarmDeviceManager/downloadSketch";
response.sendRedirect(serviceUrl + "?type="+sketchType+"&owner="+user.username); response.sendRedirect(serviceUrl + "?type="+sketchType+"&owner="+user.username);
exit(); exit();
} }

15
modules/distribution/src/repository/jaggeryapps/iot/units/firealarm/firealarm.hbs
Unescape View File

@ -27,11 +27,20 @@
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow-2 fw-stack-1x"></i>
</span>Arduino Ethernet / WiFi Shield </span>Arduino Ethernet / WiFi Shield
<br /><br /> <br /><br />
<form method="POST" class="form-login-box" <form method="POST" class="float-left margin-right"
action="{{sketchPath}}">
<input type="hidden" name="type" value="firealarm_wifi" />
<button class="blue-btn" type="submit">Create Sketch for
Wifi
</button>
</form>
<form method="POST" class="form-login-box float-left"
action="{{sketchPath}}"> action="{{sketchPath}}">
<input type="hidden" name="type" value="firealarm" /> <input type="hidden" name="type" value="firealarm" />
<button class="blue-btn" type="submit">Create Sketch</button> <button class="blue-btn margin-right" type="submit">Create
<button class="blue-btn right" type="button" onclick="document Sketch
for Ethernet</button>
<button class="blue-btn" type="button" onclick="document
.location .location
.href='mydevices'">My .href='mydevices'">My
Devices</button> Devices</button>

30
modules/distribution/src/sketches/firealarm/Connect.ino
Unescape View File

@ -9,32 +9,34 @@ byte server[4] = { 192, 168, 1, 216 };
String connecting = "connecting.... "; String connecting = "connecting.... ";
void connectHttp() { void connectHttp() {
// Serial.println("-------------------------------"); if(DEBUG) Serial.println("-------------------------------");
Ethernet.begin(mac, deviceIP, dns2, gateway, subnet); Ethernet.begin(mac, deviceIP, dns2, gateway, subnet);
delay(2000); delay(2000);
// Serial.print("My IP: "); if(DEBUG) {
// Serial.println(Ethernet.localIP()); Serial.print("My IP: ");
Serial.println(Ethernet.localIP());
}
connecting += httpClient.connect(server, SERVICE_PORT); connecting += httpClient.connect(server, SERVICE_PORT);
delay(2000); delay(2000);
// Serial.println(connecting); if(DEBUG) Serial.println(connecting);
if (httpClient.connected()) { if (httpClient.connected()) {
// Serial.println("connected"); if(DEBUG) Serial.println("connected");
} else { } else {
// Serial.println("connection failed"); if(DEBUG) Serial.println("connection failed");
while(!httpClient.connected()){ while(!httpClient.connected()){
// Serial.println("retrying to connect......"); if(DEBUG) Serial.println("retrying to connect......");
httpClient.connect(server, SERVICE_PORT); httpClient.connect(server, SERVICE_PORT);
delay(2000); delay(2000);
} }
// Serial.println("connected to server!"); if(DEBUG) Serial.println("connected to server!");
} }
// Serial.println("-------------------------------"); if(DEBUG) Serial.println("-------------------------------");
} }
@ -43,7 +45,7 @@ void setupResource(){
String port = String(SERVICE_PORT); String port = String(SERVICE_PORT);
host = "Host: " + hostIP + ":" + port; host = "Host: " + hostIP + ":" + port;
// Serial.println(host); if(DEBUG) Serial.println(host);
jsonPayLoad = String(OWNER_JSON); jsonPayLoad = String(OWNER_JSON);
jsonPayLoad += String(DEVICE_OWNER); jsonPayLoad += String(DEVICE_OWNER);
@ -51,9 +53,11 @@ void setupResource(){
jsonPayLoad += String(DEVICE_ID); jsonPayLoad += String(DEVICE_ID);
jsonPayLoad += String(REPLY_JSON); jsonPayLoad += String(REPLY_JSON);
// Serial.print("JSON Payload: "); if(DEBUG) {
// Serial.println(jsonPayLoad); Serial.print("JSON Payload: ");
// Serial.println("-------------------------------"); Serial.println(jsonPayLoad);
Serial.println("-------------------------------");
}
} }

13
modules/distribution/src/sketches/firealarm/FireAlarmAgent.h
Unescape View File

@ -1,4 +1,3 @@
#[[
#ifndef FireAlarmAgent_H #ifndef FireAlarmAgent_H
#define FireAlarmAgent_H #define FireAlarmAgent_H
@ -13,11 +12,11 @@
#define HTTP_VERSION "HTTP/1.1" #define HTTP_VERSION "HTTP/1.1"
#define HTTP_CONTENT_TYPE "Content-Type: application/json" #define HTTP_CONTENT_TYPE "Content-Type: application/json"
#define HTTP_CONTENT_LEN "Content-Length: " #define HTTP_CONTENT_LEN "Content-Length: "
#define DEVICE_OWNER "${DEVICE_OWNER}"
#define DEVICE_TYPE "FireAlarm" #define DEVICE_TYPE "FireAlarm"
]]# #define DEVICE_ID "${DEVICE_ID}"
\#define DEVICE_OWNER "${DEVICE_OWNER}"
\#define DEVICE_ID "${DEVICE_ID}"
#[[
#define PUSH_ALARM_DATA "pushalarmdata" #define PUSH_ALARM_DATA "pushalarmdata"
#define READ_CONTROLS "readcontrols/" #define READ_CONTROLS "readcontrols/"
#define REPLY "reply" #define REPLY "reply"
@ -40,8 +39,10 @@
#define BULB_PIN 4 #define BULB_PIN 4
#define FAN_PIN 5 #define FAN_PIN 5
#define DEBUG false
#define POLL_INTERVAL 1000 #define POLL_INTERVAL 1000
#endif #endif
]]#

53
modules/distribution/src/sketches/firealarm/FireAlarmAgent.ino
Unescape View File

@ -10,9 +10,8 @@ int analogPins[] = { 0, 1, 2, 3, 4, 5 };
EthernetClient httpClient; EthernetClient httpClient;
String host, jsonPayLoad, replyMsg; String host, jsonPayLoad, replyMsg;
void setup() { void setup() {
// Serial.begin(9600); if(DEBUG) Serial.begin(9600);
pinMode(BULB_PIN, OUTPUT); pinMode(BULB_PIN, OUTPUT);
pinMode(FAN_PIN, OUTPUT); pinMode(FAN_PIN, OUTPUT);
connectHttp(); connectHttp();
@ -41,12 +40,11 @@ void loop() {
replyMsg = "Bulb was switched " + switchFan(); replyMsg = "Bulb was switched " + switchFan();
} }
} }
// delay(POLL_INTERVAL);
} else { } else {
// Serial.println("client not found..."); if(DEBUG) {
// Serial.println("disconnecting."); Serial.println("client not found...");
Serial.println("disconnecting.");
}
httpClient.stop(); httpClient.stop();
connectHttp(); connectHttp();
@ -91,40 +89,45 @@ String switchFan() {
double getTemperature(){ double getTemperature(){
dht DHT; dht DHT;
// Serial.println("-------------------------------"); if(DEBUG) {
// Serial.println("Type,\tstatus,\tHumidity (%),\tTemperature (C)"); Serial.println("-------------------------------");
// Serial.print("DHT11, \t"); Serial.println("Type,\tstatus,\tHumidity (%),\tTemperature (C)");
Serial.print("DHT11, \t");
}
int chk = DHT.read11(TEMP_PIN); int chk = DHT.read11(TEMP_PIN);
switch (chk) switch (chk)
{ {
case DHTLIB_OK: case DHTLIB_OK:
// Serial.print("OK,\t"); if(DEBUG) Serial.print("OK,\t");
break; break;
case DHTLIB_ERROR_CHECKSUM: case DHTLIB_ERROR_CHECKSUM:
// Serial.print("Checksum error,\t"); if(DEBUG) Serial.print("Checksum error,\t");
break; break;
case DHTLIB_ERROR_TIMEOUT: case DHTLIB_ERROR_TIMEOUT:
// Serial.print("Time out error,\t"); if(DEBUG) Serial.print("Time out error,\t");
break; break;
case DHTLIB_ERROR_CONNECT: case DHTLIB_ERROR_CONNECT:
// Serial.print("Connect error,\t"); if(DEBUG) Serial.print("Connect error,\t");
break; break;
case DHTLIB_ERROR_ACK_L: case DHTLIB_ERROR_ACK_L:
// Serial.print("Ack Low error,\t"); if(DEBUG) Serial.print("Ack Low error,\t");
break; break;
case DHTLIB_ERROR_ACK_H: case DHTLIB_ERROR_ACK_H:
// Serial.print("Ack High error,\t"); if(DEBUG) Serial.print("Ack High error,\t");
break; break;
default: default:
// Serial.print("Unknown error,\t"); if(DEBUG) Serial.print("Unknown error,\t");
break; break;
} }
// DISPLAY DATA // DISPLAY DATA
// Serial.print("\t"); if(DEBUG) {
// Serial.print(DHT.temperature, 1); Serial.print("\t");
// Serial.print(",\t\t"); Serial.print(DHT.temperature, 1);
// Serial.println(DHT.humidity, 1); Serial.print(",\t\t");
// Serial.println("-------------------------------"); Serial.println(DHT.humidity, 1);
Serial.println("-------------------------------");
}
return DHT.temperature; return DHT.temperature;
} }

41
modules/distribution/src/sketches/firealarm/PollServer.ino
Unescape View File

@ -1,12 +1,21 @@
String readControls() { String readControls() {
String responseMsg; String responseMsg;
String resource = " " + String(SERVICE_EPOINT) + String(READ_CONTROLS) + String(DEVICE_OWNER) + "/" + String(DEVICE_ID) + " "; String resource = " " + String(SERVICE_EPOINT) + String(READ_CONTROLS) + String(DEVICE_OWNER) + "/" + String(DEVICE_ID) + " ";
httpClient.print(HTTP_GET); httpClient.print(HTTP_GET);
httpClient.print(resource); httpClient.print(resource);
httpClient.println(HTTP_VERSION); httpClient.println(HTTP_VERSION);
httpClient.println(host); httpClient.println(host);
httpClient.println(); httpClient.println();
if(DEBUG) {
Serial.print(HTTP_GET);
Serial.print(resource);
Serial.println(HTTP_VERSION);
Serial.println(host);
Serial.println();
}
delay(1000); delay(1000);
while (httpClient.available()) { while (httpClient.available()) {
@ -14,9 +23,11 @@ String readControls() {
responseMsg += response; responseMsg += response;
} }
// Serial.print(responseMsg); if(DEBUG) {
// Serial.println(); Serial.print(responseMsg);
// Serial.println("-------------------------------"); Serial.println();
Serial.println("-------------------------------");
}
delay(1000); delay(1000);
return responseMsg; return responseMsg;
} }
@ -35,15 +46,31 @@ void reply(String replyMsg) {
httpClient.println(); httpClient.println();
httpClient.println(payLoad); httpClient.println(payLoad);
httpClient.println(); httpClient.println();
if(DEBUG) {
Serial.print(HTTP_POST);
Serial.print(resource);
Serial.println(HTTP_VERSION);
Serial.println(host);
Serial.println(HTTP_CONTENT_TYPE);
Serial.print(HTTP_CONTENT_LEN);
Serial.println(payLoad.length());
Serial.println();
Serial.println(payLoad);
Serial.println();
}
delay(1000); delay(1000);
while (httpClient.available()) { while (httpClient.available()) {
char response = httpClient.read(); char response = httpClient.read();
// Serial.print(response); if(DEBUG) Serial.print(response);
} }
// Serial.println(); if(DEBUG) {
// Serial.println("-------------------------------"); Serial.println();
Serial.println("-------------------------------");
}
delay(1000); delay(1000);
} }

51
modules/distribution/src/sketches/firealarm/PushData.ino
Unescape View File

@ -17,6 +17,9 @@ void pushDigitalPinData(){
} }
payLoad = payLoad + String(END_JSON); payLoad = payLoad + String(END_JSON);
if(DEBUG) Serial.println(payLoad);
httpClient.print(HTTP_POST); httpClient.print(HTTP_POST);
httpClient.print(resource); httpClient.print(resource);
httpClient.println(HTTP_VERSION); httpClient.println(HTTP_VERSION);
@ -27,15 +30,31 @@ void pushDigitalPinData(){
httpClient.println(); httpClient.println();
httpClient.println(payLoad); httpClient.println(payLoad);
httpClient.println(); httpClient.println();
if(DEBUG) {
Serial.print(HTTP_POST);
Serial.print(resource);
Serial.println(HTTP_VERSION);
Serial.println(host);
Serial.println(HTTP_CONTENT_TYPE);
Serial.print(HTTP_CONTENT_LEN);
Serial.println(payLoad.length());
Serial.println();
Serial.println(payLoad);
Serial.println();
}
delay(1000); delay(1000);
while (httpClient.available()) { while (httpClient.available()) {
char response = httpClient.read(); char response = httpClient.read();
// Serial.print(response); if(DEBUG) Serial.print(response);
} }
// Serial.println(); if(DEBUG) {
// Serial.println("-------------------------------"); Serial.println();
Serial.println("-------------------------------");
}
delay(1000); delay(1000);
} }
} }
@ -50,7 +69,9 @@ void pushAnalogPinData(){
payLoad = payLoad + String(KEY_JSON) + getDataType(analogPins[pin]); payLoad = payLoad + String(KEY_JSON) + getDataType(analogPins[pin]);
payLoad = payLoad + String(VALUE_JSON) + analogRead(analogPins[pin]); payLoad = payLoad + String(VALUE_JSON) + analogRead(analogPins[pin]);
payLoad = payLoad + String(END_JSON); payLoad = payLoad + String(END_JSON);
if(DEBUG) Serial.println(payLoad);
httpClient.print(HTTP_POST); httpClient.print(HTTP_POST);
httpClient.print(resource); httpClient.print(resource);
httpClient.println(HTTP_VERSION); httpClient.println(HTTP_VERSION);
@ -61,15 +82,31 @@ void pushAnalogPinData(){
httpClient.println(); httpClient.println();
httpClient.println(payLoad); httpClient.println(payLoad);
httpClient.println(); httpClient.println();
if(DEBUG) {
Serial.print(HTTP_POST);
Serial.print(resource);
Serial.println(HTTP_VERSION);
Serial.println(host);
Serial.println(HTTP_CONTENT_TYPE);
Serial.print(HTTP_CONTENT_LEN);
Serial.println(payLoad.length());
Serial.println();
Serial.println(payLoad);
Serial.println();
}
delay(1000); delay(1000);
while (httpClient.available()) { while (httpClient.available()) {
char response = httpClient.read(); char response = httpClient.read();
// Serial.print(response); if(DEBUG) Serial.print(response);
} }
// Serial.println(); if(DEBUG) {
// Serial.println("-------------------------------"); Serial.println();
Serial.println("-------------------------------");
}
delay(1000); delay(1000);
} }
} }

1
modules/distribution/src/sketches/firealarm/sketch.properties
Unescape View File

@ -0,0 +1 @@
templates=FireAlarmAgent.h

98
modules/distribution/src/sketches/firealarm_wifi/Connect.ino
Unescape View File

@ -0,0 +1,98 @@
byte mac[6] = { 0x90, 0xA2, 0xDA, 0x0D, 0x30, 0xD7}; //mac - 90a2da0d30d7
byte dns2[] = { 8, 8, 8, 8 };
byte subnet[] = { 255, 255, 255, 0 };
byte gateway[] = { 192, 168, 1, 1 };
byte deviceIP[4] = { 192, 168, 1, 219 };
byte server[4] = { 192, 168, 1, 216 };
//byte server[4] = { 207, 58, 139, 247 };
uint32_t ip, ddns, ssubnet, ggateway, sserver;
String connecting = "connecting.... ";
void connectHttp() {
/* Initialise the module */
if(true) Serial.println(F("\nInitializing..."));
if (!cc3000.begin())
{
if(true) Serial.println(F("Couldn't begin()! Check your wiring?"));
while(1);
}
ip = cc3000.IP2U32(deviceIP[0], deviceIP[1], deviceIP[2], deviceIP[3]);
ddns = cc3000.IP2U32(dns2[0], dns2[1], dns2[2], dns2[3]);
ssubnet = cc3000.IP2U32(subnet[0], subnet[1], subnet[2], subnet[3]);
ggateway = cc3000.IP2U32(gateway[0], gateway[1], gateway[2], gateway[3]);
sserver = cc3000.IP2U32(server[0], server[1], server[2], server[3]);
cc3000.setStaticIPAddress(ip, ssubnet, ggateway, ddns);
if(true) {
Serial.print(F("\nAttempting to connect to "));
Serial.println(WLAN_SSID);
}
if (!cc3000.connectToAP(WLAN_SSID, WLAN_PASS, WLAN_SECURITY)) {
if(true) Serial.println(F("Failed!"));
while(1);
}
if(true) Serial.println(F("Connected to Wifi network!"));
httpClient = cc3000.connectTCP(sserver, SERVICE_PORT); //SERVICE_PORT
if (httpClient.connected()) {
if(true) Serial.println("Connected to server");
} else {
if(true) Serial.println(F("Connection failed"));
while(!httpClient.connected()){
if(true) Serial.println("retrying to connect......");
httpClient = cc3000.connectTCP(sserver, SERVICE_PORT);
delay(1000);
}
}
if(true) Serial.println(F("-------------------------------------"));
}
void setupResource(){
String hostIP = getHostIP(server);
String port = String(SERVICE_PORT);
host = "Host: " + hostIP + ":" + port;
if(DEBUG) Serial.println(host);
jsonPayLoad = "{\"owner\":\"";
jsonPayLoad += String(DEVICE_OWNER);
jsonPayLoad += "\",\"deviceId\":\"";
jsonPayLoad += String(DEVICE_ID);
jsonPayLoad += "\",\"replyMessage\":\"";
if(DEBUG) {
Serial.print("JSON Payload: ");
Serial.println(jsonPayLoad);
Serial.println("-------------------------------");
}
}
String getMyIP(byte deviceIP[4]){
String myIP = String(deviceIP[0]);
for ( int index = 1; index < 4; index++) {
myIP += "." + String(deviceIP[index]);
}
return myIP;
}
String getHostIP(byte server[4]){
String hostIP = String(server[0]);
for ( int index = 1; index < 4; index++) {
hostIP += "." + String(server[index]);
}
return hostIP;
}

41
modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h
Unescape View File

@ -0,0 +1,41 @@
#ifndef FireAlarmWifiAgent_H
#define FireAlarmWifiAgent_H
#if (ARDUINO >= 100)
#include "Arduino.h"
#else
#include "WProgram.h"
#endif
// These are the interrupt and control pins
#define ADAFRUIT_CC3000_IRQ 3 // MUST be an interrupt pin!
// These can be any two pins
#define ADAFRUIT_CC3000_VBAT 5
#define ADAFRUIT_CC3000_CS 10
#define WLAN_SSID "Dialog 4G" // cannot be longer than 32 characters!
#define WLAN_PASS "FA09C543"
#define WLAN_SECURITY WLAN_SEC_WPA2
// Security can be WLAN_SEC_UNSEC, WLAN_SEC_WEP, WLAN_SEC_WPA or WLAN_SEC_WPA2
#define IDLE_TIMEOUT_MS 3000
#define DEVICE_OWNER "${DEVICE_OWNER}"
#define DEVICE_TYPE "FireAlarm"
#define DEVICE_ID "${DEVICE_ID}"
#define SERVICE_PORT 9763
#define SERVICE_EPOINT "/WSO2ConnectedDevices/FireAlarmController/"
// pushalarmdata - application/json - {"owner":"","deviceId":"","replyMessage":"","time":"","key":"","value":""}
// readcontrols/{owner}/{deviceId}
// reply - application/json - {"owner":"","deviceId":"","replyMessage":""}
#define TEMP_PIN 6
#define BULB_PIN 7
#define FAN_PIN 8
#define POLL_INTERVAL 1000
#define DEBUG false
#endif

141
modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.ino
Unescape View File

@ -0,0 +1,141 @@
#include "FireAlarmWifiAgent.h"
#include <Adafruit_CC3000.h>
//#include <ccspi.h>
//#include <string.h>
//#include "utility/debug.h"
#include <SPI.h>
#include "dht.h"
int digitalPins[] = { TEMP_PIN, BULB_PIN, FAN_PIN };
int analogPins[] = { 0, 1, 2, 3, 4, 5 };
Adafruit_CC3000 cc3000 = Adafruit_CC3000(ADAFRUIT_CC3000_CS, ADAFRUIT_CC3000_IRQ, ADAFRUIT_CC3000_VBAT,
SPI_CLOCK_DIVIDER); // you can change this clock speed
Adafruit_CC3000_Client httpClient;
String host, jsonPayLoad, replyMsg;
void setup() {
if(true) Serial.begin(115200);
pinMode(BULB_PIN, OUTPUT);
pinMode(FAN_PIN, OUTPUT);
connectHttp();
setupResource();
}
void loop() {
if (httpClient.connected()) {
pushDigitalPinData();
delay(POLL_INTERVAL);
String responseMsg = readControls();
int index = responseMsg.lastIndexOf(":");
int newLine = responseMsg.lastIndexOf("\n");
String subStrn = responseMsg.substring(index + 1);
if (subStrn.equals("IN")) {
responseMsg = responseMsg.substring(newLine + 1, index);
if (responseMsg.equals("TEMP")) {
int temperature = (uint8_t)getTemperature();
replyMsg = "Temperature is " + String(temperature) + " C";
reply();
} else if (responseMsg.equals("BULB")) {
replyMsg = "Bulb was switched " + switchBulb();
} else if (responseMsg.equals("FAN")) {
replyMsg = "Buzzer was switched " + switchFan();
}
}
} else {
if(DEBUG) {
Serial.println("client not found...");
Serial.println("disconnecting.");
}
httpClient.stop();
connectHttp();
}
}
String getDataType(int pin){
switch(pin){
case TEMP_PIN:
return "Temperature";
case BULB_PIN:
return "Bulb";
case FAN_PIN:
return "Fan";
default:
return String(pin);
}
}
String switchBulb() {
if (digitalRead(BULB_PIN) == HIGH) {
digitalWrite(BULB_PIN, LOW);
return "OFF";
} else {
digitalWrite(BULB_PIN, HIGH);
return "ON";
}
}
String switchFan() {
if (digitalRead(FAN_PIN) == HIGH) {
digitalWrite(FAN_PIN, LOW);
return "OFF";
} else {
digitalWrite(FAN_PIN, HIGH);
return "ON";
}
}
double getTemperature(){
dht DHT;
if(DEBUG) {
Serial.println("-------------------------------");
Serial.println("Type,\tstatus,\tHumidity (%),\tTemperature (C)");
Serial.print("DHT11, \t");
}
int chk = DHT.read11(TEMP_PIN);
switch (chk)
{
case DHTLIB_OK:
if(DEBUG) Serial.print("OK,\t");
break;
case DHTLIB_ERROR_CHECKSUM:
if(DEBUG) Serial.print("Checksum error,\t");
break;
case DHTLIB_ERROR_TIMEOUT:
if(DEBUG) Serial.print("Time out error,\t");
break;
case DHTLIB_ERROR_CONNECT:
if(DEBUG) Serial.print("Connect error,\t");
break;
case DHTLIB_ERROR_ACK_L:
if(DEBUG) Serial.print("Ack Low error,\t");
break;
case DHTLIB_ERROR_ACK_H:
if(DEBUG) Serial.print("Ack High error,\t");
break;
default:
if(DEBUG) Serial.print("Unknown error,\t");
break;
}
// DISPLAY DATA
if(DEBUG) {
Serial.print("\t");
Serial.print(DHT.temperature, 1);
Serial.print(",\t\t");
Serial.println(DHT.humidity, 1);
Serial.println("-------------------------------");
}
return DHT.temperature;
}

104
modules/distribution/src/sketches/firealarm_wifi/PollServer.ino
Unescape View File

@ -0,0 +1,104 @@
String readControls() {
String responseMsg;
httpClient.fastrprint(F("GET "));
httpClient.fastrprint(SERVICE_EPOINT); httpClient.fastrprint(F("readcontrols/"));
httpClient.fastrprint(DEVICE_OWNER); httpClient.fastrprint(F("/")); httpClient.fastrprint(DEVICE_ID);
httpClient.fastrprint(F(" HTTP/1.1")); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(host.c_str()); httpClient.fastrprint(F("\n"));
httpClient.println();
delay(1000);
while (httpClient.available()) {
char response = httpClient.read();
responseMsg += response;
}
if(DEBUG) {
Serial.print(responseMsg);
Serial.println();
Serial.println("-------------------------------");
}
delay(1000);
return responseMsg;
}
void reply() {
String payLoad = replyMsg + "\"}";
if(DEBUG) {
Serial.print(jsonPayLoad); Serial.println(payLoad);
}
httpClient.fastrprint(F("POST "));
httpClient.fastrprint(SERVICE_EPOINT); httpClient.fastrprint(F("reply"));
httpClient.fastrprint(F(" HTTP/1.1")); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(host.c_str()); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(F("Content-Type: application/json")); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(F("Content-Length: "));
int payLength = jsonPayLoad.length() + payLoad.length();
httpClient.fastrprint(String(payLength).c_str()); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(F("\n"));
if(DEBUG) {
Serial.print("POST ");
Serial.print(SERVICE_EPOINT); Serial.print("reply");
Serial.print(" HTTP/1.1"); Serial.println();
Serial.print(host); Serial.println();
Serial.print("Content-Type: application/json"); Serial.println();
Serial.print("Content-Length: ");
Serial.print(payLength); Serial.println();
Serial.println();
}
int chunkSize = 50;
for (int i = 0; i < jsonPayLoad.length(); i++) {
if ( (i+1)*chunkSize > jsonPayLoad.length()) {
httpClient.print(jsonPayLoad.substring(i*chunkSize, jsonPayLoad.length()));
if(DEBUG) Serial.print(jsonPayLoad.substring(i*chunkSize, jsonPayLoad.length()));
i = jsonPayLoad.length();
} else {
httpClient.print(jsonPayLoad.substring(i*chunkSize, (i+1)*chunkSize));
if(DEBUG) Serial.print(jsonPayLoad.substring(i*chunkSize, (i+1)*chunkSize));
}
}
for (int i = 0; i < payLoad.length(); i++) {
if ( (i+1)*chunkSize > payLoad.length()) {
httpClient.print(payLoad.substring(i*chunkSize, payLoad.length()));
if(DEBUG) Serial.print(payLoad.substring(i*chunkSize, payLoad.length()));
i = payLoad.length();
} else {
httpClient.print(payLoad.substring(i*chunkSize, (i+1)*chunkSize));
if(DEBUG) Serial.print(payLoad.substring(i*chunkSize, (i+1)*chunkSize));
}
}
httpClient.fastrprint(F("\n"));
if(DEBUG) Serial.println();
delay(1000);
while (httpClient.available()) {
char response = httpClient.read();
if(DEBUG) Serial.print(response);
}
if(DEBUG) {
Serial.println();
Serial.println("-------------------------------");
}
payLoad = "";
delay(1000);
}

141
modules/distribution/src/sketches/firealarm_wifi/PushData.ino
Unescape View File

@ -0,0 +1,141 @@
void pushDigitalPinData(){
for ( int pin = 0; pin < (sizeof(digitalPins)/sizeof(int)); pin++) {
String payLoad = jsonPayLoad + "DigitalPinData";
payLoad = payLoad + "\",\"time\":\"" + "9999";
payLoad = payLoad + "\",\"key\":\"" + getDataType(digitalPins[pin]);
payLoad = payLoad + "\",\"value\":\"";
if ( digitalPins[pin] == TEMP_PIN ) {
int temperature = (uint8_t)getTemperature();
payLoad += temperature;
} else if ( digitalRead(digitalPins[pin]) == HIGH ) {
payLoad += "ON";
} else if ( digitalRead(digitalPins[pin]) == LOW ) {
payLoad += "OFF";
}
payLoad += "\"}";
httpClient.fastrprint(F("POST "));
httpClient.fastrprint(SERVICE_EPOINT); httpClient.fastrprint(F("pushalarmdata"));
httpClient.fastrprint(F(" HTTP/1.1")); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(host.c_str()); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(F("Content-Type: application/json")); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(F("Content-Length: "));
int payLength = payLoad.length();
httpClient.fastrprint(String(payLength).c_str()); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(F("\n"));
if(DEBUG) {
Serial.print("POST ");
Serial.print(SERVICE_EPOINT); Serial.print("pushalarmdata");
Serial.print(" HTTP/1.1"); Serial.println();
Serial.print(host); Serial.println();
Serial.print("Content-Type: application/json"); Serial.println();
Serial.print("Content-Length: ");
Serial.print(payLength); Serial.println();
Serial.println();
}
int chunkSize = 50;
for (int i = 0; i < payLength; i++) {
if ( (i+1)*chunkSize > payLength) {
httpClient.print(payLoad.substring(i*chunkSize, payLength));
if(DEBUG) Serial.print(payLoad.substring(i*chunkSize, payLength));
i = payLength;
} else {
httpClient.print(payLoad.substring(i*chunkSize, (i+1)*chunkSize));
if(DEBUG) Serial.print(payLoad.substring(i*chunkSize, (i+1)*chunkSize));
}
}
httpClient.fastrprint(F("\n"));
if(DEBUG) Serial.println();
delay(1000);
while (httpClient.available()) {
char response = httpClient.read();
if(DEBUG) Serial.print(response);
}
if(DEBUG) {
Serial.println();
Serial.println("-------------------------------");
}
payLoad = "";
delay(1000);
}
}
void pushAnalogPinData(){
for ( int pin = 0; pin < (sizeof(analogPins)/sizeof(int)); pin++) {
String payLoad = jsonPayLoad + "AnalogPinData";
payLoad = payLoad + "\",\"time\":\"" + "9999";
payLoad = payLoad + "\",\"key\":\"" + getDataType(analogPins[pin]);
payLoad = payLoad + "\",\"value\":\"" + analogRead(analogPins[pin]);
payLoad = payLoad + "\"}";
httpClient.fastrprint(F("POST "));
httpClient.fastrprint(SERVICE_EPOINT); httpClient.fastrprint(F("pushalarmdata"));
httpClient.fastrprint(F(" HTTP/1.1")); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(host.c_str()); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(F("Content-Type: application/json")); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(F("Content-Length: "));
int payLength = payLoad.length();
httpClient.fastrprint(String(payLength).c_str()); httpClient.fastrprint(F("\n"));
httpClient.fastrprint(F("\n"));
if(DEBUG) {
Serial.print("POST ");
Serial.print(SERVICE_EPOINT); Serial.print("pushalarmdata");
Serial.print(" HTTP/1.1"); Serial.println();
Serial.print(host); Serial.println();
Serial.print("Content-Type: application/json"); Serial.println();
Serial.print("Content-Length: ");
Serial.print(payLength); Serial.println();
Serial.println();
}
int chunkSize = 50;
for (int i = 0; i < payLength; i++) {
if ( (i+1)*chunkSize > payLength) {
httpClient.print(payLoad.substring(i*chunkSize, payLength));
if(DEBUG) Serial.print(payLoad.substring(i*chunkSize, payLength));
i = payLength;
} else {
httpClient.print(payLoad.substring(i*chunkSize, (i+1)*chunkSize));
if(DEBUG) Serial.print(payLoad.substring(i*chunkSize, (i+1)*chunkSize));
}
}
httpClient.fastrprint(F("\n"));
if(DEBUG) Serial.println();
delay(1000);
while (httpClient.available()) {
char response = httpClient.read();
if(DEBUG) Serial.print(response);
}
if(DEBUG) {
Serial.println();
Serial.println("-------------------------------");
}
payLoad = "";
delay(1000);
}
}

1
modules/distribution/src/sketches/firealarm_wifi/sketch.properties
Unescape View File

@ -0,0 +1 @@
templates=FireAlarmWifiAgent.h
Write Preview
Loading…
Cancel
Save