From f3ca82a54891218cf3db0a8756d870744c6c8564 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Thu, 4 Jun 2015 21:25:00 -0700 Subject: [PATCH] Update CC3k example. --- examples/mqtt_cc3k/cc3000helper.cpp | 13 ++--- examples/mqtt_cc3k/mqtt_cc3k.ino | 84 +++++++++++++++++++++++------ examples/mqtt_cc3k/mqtt_config.h | 42 --------------- 3 files changed, 74 insertions(+), 65 deletions(-) delete mode 100644 examples/mqtt_cc3k/mqtt_config.h diff --git a/examples/mqtt_cc3k/cc3000helper.cpp b/examples/mqtt_cc3k/cc3000helper.cpp index 45b9961..f21f57d 100644 --- a/examples/mqtt_cc3k/cc3000helper.cpp +++ b/examples/mqtt_cc3k/cc3000helper.cpp @@ -1,17 +1,18 @@ -#include +#include #include #include #include -#include "mqtt_config.h" -#define STATICIP 1 +#define STATICIP 0 + +#define halt(s) { Serial.println(F( s )); while(1); } uint16_t checkFirmwareVersion(void); bool displayConnectionDetails(void); extern Adafruit_CC3000 cc3000; -boolean CC3000connect(void) { +boolean CC3000connect(const char* wlan_ssid, const char* wlan_pass, uint8_t wlan_security) { Watchdog.reset(); // Check for compatible firmware @@ -36,11 +37,11 @@ boolean CC3000connect(void) { // Attempt to connect to an access point Serial.print(F("\nAttempting to connect to ")); - Serial.print(WLAN_SSID); Serial.print(F("...")); + Serial.print(wlan_ssid); Serial.print(F("...")); Watchdog.disable(); // try 3 times - if (!cc3000.connectToAP(WLAN_SSID, WLAN_PASS, WLAN_SECURITY, 3)) { + if (!cc3000.connectToAP(wlan_ssid, wlan_pass, wlan_security, 3)) { return false; } diff --git a/examples/mqtt_cc3k/mqtt_cc3k.ino b/examples/mqtt_cc3k/mqtt_cc3k.ino index 2d90918..4ef3c6d 100644 --- a/examples/mqtt_cc3k/mqtt_cc3k.ino +++ b/examples/mqtt_cc3k/mqtt_cc3k.ino @@ -1,24 +1,76 @@ -#include +#include #include -#include #include #include "utility/debug.h" -#include - #include "Adafruit_MQTT.h" #include "Adafruit_MQTT_CC3000.h" -#include "mqtt_config.h" -Adafruit_CC3000 cc3000 = Adafruit_CC3000(ADAFRUIT_CC3000_CS, ADAFRUIT_CC3000_IRQ, ADAFRUIT_CC3000_VBAT, SPI_CLOCK_DIV2); // you can change this clock speed +/*************************** CC3000 Pins ***********************************/ -Adafruit_MQTT_CC3000 mqtt(&cc3000, AIO_SERVER, AIO_SERVERPORT, AIO_CLIENTNAME, AIO_USERNAME, AIO_KEY); +#define ADAFRUIT_CC3000_IRQ 3 // MUST be an interrupt pin! +#define ADAFRUIT_CC3000_VBAT 5 // VBAT & CS can be any digital pins. +#define ADAFRUIT_CC3000_CS 10 +// Use hardware SPI for the remaining pins +// On an UNO, SCK = 13, MISO = 12, and MOSI = 11 -const char PHOTOCELL_FEED[] PROGMEM = "api/feeds/photocell/data/send.json"; +// Alternate config: +//#define ADAFRUIT_CC3000_IRQ 2 +//#define ADAFRUIT_CC3000_VBAT 8 +//#define ADAFRUIT_CC3000_CS 10 + +/************************* WiFi Access Point *********************************/ + +#define WLAN_SSID "...your SSID..." // can't be longer than 32 characters! +#define WLAN_PASS "...your password..." +#define WLAN_SECURITY WLAN_SEC_WPA2 // Can be: WLAN_SEC_UNSEC, WLAN_SEC_WEP, + // WLAN_SEC_WPA or WLAN_SEC_WPA2 + +/************************* Adafruit.io Setup *********************************/ + +#define AIO_SERVER "io.adafruit.com" +#define AIO_SERVERPORT 1883 +#define AIO_USERNAME "...your AIO username (see https://accounts.adafruit.com)..." +#define AIO_KEY "...your AIO key..."; + +/* Debug server configuration (not normally used): +#define AIO_SERVER "apt.adafruit.com" +#define AIO_SERVERPORT 1883 +*/ + +/************ Global State (you don't need to change this!) ******************/ + +// Setup the main CC3000 class, just like a normal CC3000 sketch. +Adafruit_CC3000 cc3000 = Adafruit_CC3000(ADAFRUIT_CC3000_CS, ADAFRUIT_CC3000_IRQ, ADAFRUIT_CC3000_VBAT); + +// Store the MQTT server, client ID, username, and password in flash memory. +// This is required for using the Adafruit MQTT library. +const char MQTT_SERVER[] PROGMEM = AIO_SERVER; +const char MQTT_CLIENTID[] PROGMEM = AIO_KEY; +const char MQTT_USERNAME[] PROGMEM = AIO_USERNAME; +const char MQTT_PASSWORD[] PROGMEM = AIO_KEY; + +// Setup the CC3000 MQTT class by passing in the CC3000 class and MQTT server and login details. +Adafruit_MQTT_CC3000 mqtt(&cc3000, MQTT_SERVER, AIO_SERVERPORT, MQTT_CLIENTID, MQTT_USERNAME, MQTT_PASSWORD); + +// You don't need to change anything below this line! +#define halt(s) { Serial.println(F( s )); while(1); } + +// CC3000connect is a helper function that sets up the CC3000 and connects to +// the WiFi network. See the cc3000helper.cpp tab above for the source! +boolean CC3000connect(const char* wlan_ssid, const char* wlan_pass, uint8_t wlan_security); + +/****************************** Feeds ***************************************/ + +// Setup a feed called 'photocell' for publishing. +// Notice MQTT paths for AIO follow the form: /feeds/ +const char PHOTOCELL_FEED[] PROGMEM = AIO_USERNAME "/feeds/photocell"; Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, PHOTOCELL_FEED); -const char ONOFF_FEED[] PROGMEM = "api/feeds/onoff/data/receive.json"; +// Setup a feed called 'onoff' for subscribing to changes. +const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff"; Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED); +/*************************** Sketch Code ************************************/ void setup() { Serial.begin(115200); @@ -34,7 +86,7 @@ void setup() { mqtt.subscribe(&onoffbutton); - while (! CC3000connect()) { + while (! CC3000connect(WLAN_SSID, WLAN_PASS, WLAN_SECURITY)) { Serial.println(F("Retrying WiFi")); while(1); } @@ -53,7 +105,7 @@ void setup() { case 6: Serial.println(F("Failed to subscribe")); break; default: { Serial.println(F("Connection failed")); - CC3000connect(); // y0w, lets connect to wifi again + CC3000connect(WLAN_SSID, WLAN_PASS, WLAN_SECURITY); // y0w, lets connect to wifi again return; // restart the loop } } @@ -68,18 +120,19 @@ void setup() { uint32_t x=0; void loop() { - Adafruit_MQTT_Subscribe *subscription; - + // Make sure to reset watchdog every loop iteration! Watchdog.reset(); // Try to ping the MQTT server /* if (! mqtt.ping(3) ) { // MQTT pings failed, lets reconnect + Serial.println("Ping fail!"); } */ - + // this is our 'wait for incoming subscription packets' busy subloop + Adafruit_MQTT_Subscribe *subscription; while (subscription = mqtt.readSubscription(1000)) { if (subscription == &onoffbutton) { Serial.print(F("Got: ")); @@ -88,7 +141,6 @@ void loop() { } // Now we can publish stuff! - Serial.print(F("\nSending photocell val ")); Serial.print(x); Serial.print("..."); @@ -98,5 +150,3 @@ void loop() { Serial.println(F("OK!")); } } - - diff --git a/examples/mqtt_cc3k/mqtt_config.h b/examples/mqtt_cc3k/mqtt_config.h deleted file mode 100644 index b1389e3..0000000 --- a/examples/mqtt_cc3k/mqtt_config.h +++ /dev/null @@ -1,42 +0,0 @@ -#define IDLE_TIMEOUT_MS 5000 - -/*************************** CC3000 Pins ***********************************/ - -// These are the interrupt and control pins -#define ADAFRUIT_CC3000_IRQ 2 // MUST be an interrupt pin! -// These can be any two pins -#define ADAFRUIT_CC3000_VBAT 8 -#define ADAFRUIT_CC3000_CS 10 -// Use hardware SPI for the remaining pins -// On an UNO, SCK = 13, MISO = 12, and MOSI = 11 - -/************************* WiFi Access Point *********************************/ - -#define WLAN_SSID "" // cannot be longer than 32 characters! -#define WLAN_PASS "" -// Security can be WLAN_SEC_UNSEC, WLAN_SEC_WEP, WLAN_SEC_WPA or WLAN_SEC_WPA2 -#define WLAN_SECURITY WLAN_SEC_WPA2 - -/************************* Adafruit.io Setup *********************************/ - -const char AIO_SERVER[] PROGMEM = "io.adafruit.com"; -#define AIO_SERVERPORT 1883 -const char AIO_CLIENTNAME[] PROGMEM = "huzzah"; -const char AIO_USERNAME[] PROGMEM = ""; -const char AIO_KEY[] PROGMEM = ""; - - - -const char DBG_SERVER[] PROGMEM = "apt.adafruit.com"; -#define DBG_SERVERPORT 1883 -const char DBG_CLIENTNAME[] PROGMEM = "huzzah"; -const char DBG_KEY[] PROGMEM = ""; -const char DBG_PASSWORD[] PROGMEM = ""; - - -#define halt(s) { Serial.println(F( s )); while(1); } - - -#define println_P(s) { for (uint8_t i=0; i