community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

added mqtt support for sending device controls

Browse Source
This commit is contained in:
Shabir Mohamed 2015-07-22 17:59:35 +05:30
parent 5b5df161fc
commit 04e4be51a2
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/distribution/src/sketches/firealarm_wifi/Connect.ino
View File

@ -65,7 +65,7 @@ void connectHttp() {
if(CON_DEBUG) Serial.println(F("Connected to Wifi network!")); if(CON_DEBUG) Serial.println(F("Connected to Wifi network!"));
if(true) Serial.println(F("Request DHCP")); if(CON_DEBUG) Serial.println(F("Request DHCP"));
while (!cc3000.checkDHCP()) while (!cc3000.checkDHCP())
{ {
delay(100); // ToDo: Insert a DHCP timeout! delay(100); // ToDo: Insert a DHCP timeout!
@ -78,14 +78,11 @@ void connectHttp() {
pushClient = cc3000.connectTCP(sserver, SERVICE_PORT); //SERVICE_PORT pushClient = cc3000.connectTCP(sserver, SERVICE_PORT); //SERVICE_PORT
if (pushClient.connected()) { if (pushClient.connected()) {
if(true) Serial.println(F("pushClient Connected to server")); if(CON_DEBUG) Serial.println(F("pushClient Connected to server"));
} else { } else {
if(CON_DEBUG) Serial.println(F("pushClient Connection failed")); if(CON_DEBUG) Serial.println(F("pushClient Connection failed"));
} }
if(CON_DEBUG) Serial.println(F("-------------------------------------")); if(CON_DEBUG) Serial.println(F("-------------------------------------"));
} }
@ -148,12 +145,11 @@ bool displayConnectionDetails(void)
void setupClient(){ void setupClient(){
pushClient = cc3000.connectTCP(sserver, SERVICE_PORT); //SERVICE_PORT pushClient = cc3000.connectTCP(sserver, SERVICE_PORT); //SERVICE_PORT
if (pushClient.connected()) { if (pushClient.connected()) {
if(CON_DEBUG) Serial.println(F("client Connected to server")); if(CON_DEBUG) Serial.println(F("pushClient Connected to server"));
} else { } else {
while( !cc3000.checkConnected() ){ while( !cc3000.checkConnected() ){
connectHttp(); connectHttp();
} }
if(CON_DEBUG) Serial.println(F("client Connection failed")); if(CON_DEBUG) Serial.println(F("pushClient Connection failed"));
} }
} }

2
modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h
View File

@ -39,7 +39,7 @@
#define WLAN_SECURITY WLAN_SEC_WPA #define WLAN_SECURITY WLAN_SEC_WPA
// Security can be WLAN_SEC_UNSEC, WLAN_SEC_WEP, WLAN_SEC_WPA or 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 IDLE_TIMEOUT_MS 3000
#define DEVICE_OWNER "${DEVICE_OWNER}" #define DEVICE_OWNER "${DEVICE_OWNER}"
#define DEVICE_ID "${DEVICE_ID}" #define DEVICE_ID "${DEVICE_ID}"

4
modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.ino
View File

@ -44,11 +44,10 @@ void setup() {
void loop() { void loop() {
while (!cc3000.checkConnected()) { while (!cc3000.checkConnected()) {
connectHttp(); connectHttp();
} }
wdt_reset(); wdt_reset();
if (millis() - pushTimestamp > PUSH_INTERVAL) { if (millis() - pushTimestamp > PUSH_INTERVAL) {
@ -59,6 +58,7 @@ void loop() {
pushData(); pushData();
pushTimestamp = millis(); pushTimestamp = millis();
} }
readControls(); readControls();
wdt_reset(); wdt_reset();

3
modules/distribution/src/sketches/firealarm_wifi/Listener.ino
View File

@ -63,7 +63,8 @@ void readControls() {
delay(100); delay(100);
// Close the connection when done. // Close the connection when done.
Serial.println(F("Client disconnected")); Serial.println(F("Listener Client disconnected"));
client.flush();
client.close(); client.close();
wdt_reset(); wdt_reset();

1
modules/distribution/src/sketches/sensebot_wifi/HttpServer.ino
View File

@ -57,6 +57,7 @@ void readControls()
// Wait a short period to make sure the response had time to send before // Wait a short period to make sure the response had time to send before
// the connection is closed (the CC3000 sends data asyncronously). // the connection is closed (the CC3000 sends data asyncronously).
delay(200); delay(200);
client.flush();
client.close(); client.close();
} }