Skip to content

Commit

Permalink
Improved error handling & reliability of upload to emoncms
Browse files Browse the repository at this point in the history
  • Loading branch information
@nathanchantrell
nathanchantrell committed Sep 5, 2012
1 parent f21633e commit 4f61279
Showing 1 changed file with 67 additions and 22 deletions.
89 changes: 67 additions & 22 deletions TinyTX_MAX1284_emoncms/TinyTX_MAX1284_emoncms.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
#define group 210 // network group

// emoncms settings, change these settings to match your own setup
#define SERVER "www.chantrell.net"; // emoncms server
IPAddress server(192,168,0,21); // IP address of emoncms server
#define HOSTNAME "www.chantrell.net" // Hostname of emoncms server
#define EMONCMS "emoncms" // location of emoncms on server, blank if at root
#define APIKEY "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" // API write key

Expand Down Expand Up @@ -90,6 +91,7 @@ void setup () {

#ifdef DEBUG
Serial.begin(57600);
Serial.println("-------------------------------------------------");
Serial.println("MAX1284 Multiple TX to emoncms");
Serial.print("Node: "); Serial.print(MYNODE);
Serial.print(" Freq: ");
Expand All @@ -115,18 +117,20 @@ void setup () {
Serial.print(".");
}
Serial.println();
Serial.println("-------------------------------------------------");
#endif

rf12_initialize(MYNODE,freq,group); // initialise the RFM12B
lastRF = millis()-40000; // Forces the a send straight away

#ifdef USE_NTP
Udp.begin(UDP_PORT); // Start UDP for NTP client
Udp.begin(UDP_PORT); // Start UDP for NTP client
#endif

digitalWrite(ledPin,LOW); // Turn LED off to indicate setup has finished

wdt_enable(WDTO_8S); // Enable the watchdog timer with an 8 second timeout
delay(1000);

wdt_enable(WDTO_8S); // Enable the watchdog timer with an 8 second timeout

}

Expand All @@ -141,22 +145,22 @@ void loop () {
#ifdef USE_NTP
if ((millis()-timeTX)>(NTP_PERIOD*60000)){ // Send NTP time
getTime();
timeTX = millis();
}
#endif

//--------------------------------------------------------------------
// On data receieved from rf12
//--------------------------------------------------------------------

if (rf12_recvDone() && rf12_crc == 0 && (rf12_hdr & RF12_HDR_CTL) == 0)
if (dataReady==0 && rf12_recvDone() && rf12_crc == 0 && (rf12_hdr & RF12_HDR_CTL) == 0)
{

int nodeID = rf12_hdr & 0x1F; // extract node ID from received packet
rx=*(Payload*) rf12_data; // Get the payload
digitalWrite(ledPin,HIGH); // Turn LED on

#ifdef DEBUG
Serial.println();
Serial.print("Data received from Node ");
Serial.println(nodeID);
#endif
Expand Down Expand Up @@ -209,32 +213,62 @@ void loop () {
// Send the data
//--------------------------------------------------------------------

if (dataReady==1) { // If data is ready: send data
if (!client.connected() && dataReady==1) { // If not connected and data is ready: send data



#ifdef DEBUG
Serial.print("Sending to emoncms: ");
Serial.println(str.buf);
Serial.println("Connecting to server");
#endif

wdt_reset(); // Reset the watchdog timer

// Send the data
if (client.connect(server, 80)) { // Connect to server

if (client.connected()) { // If connected send data

#ifdef DEBUG
Serial.print("Sending to emoncms: ");
Serial.println(str.buf);
#endif

// The HTTP GET request
client.print("GET "); client.print("/"EMONCMS"/api/post.json?apikey="APIKEY"&json="); client.print(str.buf);
client.println(" HTTP/1.1");
client.print("Host: ");
client.println(HOSTNAME);
client.print("User-Agent: MAX1284");
client.println("\r\n");

#ifdef DEBUG
Serial.println("Sent OK");
#endif

digitalWrite(ledPin,LOW); // Turn LED OFF
dataReady = 0; // reset data ready flag

}
else { // If not connected retry on next loop
#ifdef DEBUG
Serial.println("Retrying... ");
#endif
}

char server[] = SERVER;
String url = "/"EMONCMS"/api/post?apikey="APIKEY"&json=";

// Send the data
if (client.connect(server, 80)) {
client.print("GET http://"); client.print(server); client.print(url); client.print(str.buf); client.println();
delay(200);
client.stop();

dataReady = 0; // reset data ready flag
}
else {
else { // We didn't get a connection to the server, will retry on next loop
#ifdef DEBUG
Serial.println("connection failed");
Serial.print("ERROR: Connection failed to ");
Serial.print(server);
Serial.println(", will retry");
#endif
}

digitalWrite(ledPin,LOW); // Turn LED OFF

client.stop(); // Disconnect
#ifdef DEBUG
Serial.println("Disconnected");
#endif
}

}
Expand All @@ -245,13 +279,15 @@ void loop () {

void getTime() {
#ifdef DEBUG
Serial.println();
Serial.println("Getting NTP Time");
#endif

sendNTPpacket(timeServer); // Send NTP packet to time server
delay(1000); // Wait for reply

if ( Udp.parsePacket() ) { // Packet received
timeTX = millis(); // Reset timer
Udp.read(packetBuffer,NTP_PACKET_SIZE); // Read packet into the buffer
unsigned long highWord = word(packetBuffer[40], packetBuffer[41]); // Timestamp starts at byte 40 & is 4 bytes
unsigned long lowWord = word(packetBuffer[42], packetBuffer[43]); // or 2 words. Extract the two words.
Expand All @@ -261,6 +297,7 @@ void loop () {
const unsigned long seventyYears = 2208988800UL; // Unix time starts on 1/1/1970
unsigned long epoch = secsSince1900 - seventyYears; // Subtract seventy years:
ntp.hour = ((epoch % 86400L) / 3600); // 86400 equals secs per day
ntp.hour += 1; // TO DO: Implement something for BST
ntp.mins = ((epoch % 3600) / 60); // 3600 equals secs per minute
ntp.sec = (epoch %60); // seconds

Expand All @@ -277,7 +314,15 @@ void loop () {
Serial.print(":");
if ( ntp.sec < 10 ) { Serial.print('0'); }
Serial.println(ntp.sec);
Serial.println();
#endif
} else
{
#ifdef DEBUG
Serial.println("Didn't get reply from NTP server");
Serial.println();
#endif
timeTX = (millis()-30000); // try again in 30 seconds
}
}

Expand Down

0 comments on commit 4f61279

Please sign in to comment.