Merge pull request #2 from jrbenito/master

Correct bug in examples and add Travis-ci and also add reading power outage timestamps

Author: kanewallmann

.travis.yml

@@ -0,0 +1,20 @@
+language: python
+python:
+    - "2.7"
+
+# Cache PlatformIO packages using Travis CI container-based infrastructure
+sudo: false
+cache:
+    directories:
+        - "~/.platformio"
+
+env:
+    - PLATFORMIO_CI_SRC=examples/alarm.ino
+    - PLATFORMIO_CI_SRC=examples/clock.ino
+    - PLATFORMIO_CI_SRC=examples/tm_format.ino
+
+install:
+    - pip install -U platformio
+
+script:
+    - platformio ci --lib=. --board=megaatmega2560 --board uno

RTCC_MCP7940N.cpp

@@ -208,9 +208,56 @@ bool RTCC_MCP7940N::IsOscillatorRunning()
 	return this->GetFlag(0x03, B100000);
 }
 
-bool RTCC_MCP7940N::HasPowerFailed()
-{
-	return this->GetFlag(0x03, B10000);
+bool RTCC_MCP7940N::HasPowerFailed(rtcc_time *dwTime, rtcc_time *upTime)
+{
+    byte year;
+    bool pwFail;
+	
+	year = this->GetByte(0x06);
+	pwFail = this->GetFlag(0x03, B10000);
+
+	if (pwFail) {
+
+        // set read address to POWER DOWN Time-Stamp
+        Wire.beginTransmission(this->i2c_addr);
+        Wire.write(0x18);
+        Wire.endTransmission();
+
+        // Request 8 bytes for both Time-stamps
+        Wire.requestFrom(this->i2c_addr, 8, true);
+        byte time_data[8];
+        Wire.readBytes(time_data, 8);
+
+        // convert 
+        dwTime->secten = 0; //(time_data[0] & B1110000) >> 4;
+        dwTime->secone = 0; //time_data[0] & B1111;
+        dwTime->minten = (time_data[0] & B111000) >> 4;
+        dwTime->minone = time_data[0] & B1111;
+        dwTime->hrten = (time_data[1] & B110000) >> 4;
+        dwTime->hrone = time_data[1] & B1111;
+        dwTime->wkday = 0; //time_data[3] & B111; not provided
+        dwTime->dateten = (time_data[2] & B110000) >> 4;
+        dwTime->dateone = time_data[2] & B1111;
+        dwTime->mthten = (time_data[3] & B10000) >> 4;
+        dwTime->mthone = time_data[3] & B1111;
+        dwTime->yrten = (year & B11110000) >> 4;
+        dwTime->yrone = year & B1111;
+        dwTime->secten = 0; //(time_data[0] & B1110000) >> 4;
+        dwTime->secone = 0; //time_data[0] & B1111;
+        dwTime->minten = (time_data[4] & B111000) >> 4;
+        dwTime->minone = time_data[4] & B1111;
+        dwTime->hrten = (time_data[5] & B110000) >> 4;
+        dwTime->hrone = time_data[5] & B1111;
+        dwTime->wkday = 0; //time_data[3] & B111; not provided
+        dwTime->dateten = (time_data[6] & B110000) >> 4;
+        dwTime->dateone = time_data[6] & B1111;
+        dwTime->mthten = (time_data[7] & B10000) >> 4;
+        dwTime->mthone = time_data[7] & B1111;
+        dwTime->yrten = (year & B11110000) >> 4;
+        dwTime->yrone = year & B1111;
+    }
+
+	return pwFail;
 }
 
 bool RTCC_MCP7940N::GetBatteryEnabled()

RTCC_MCP7940N.h

@@ -141,7 +141,7 @@ class RTCC_MCP7940N
 	 *
 	 * @return 				True if a power fail event has been detected
 	 */
-	bool HasPowerFailed();
+	bool HasPowerFailed(rtcc_time *dwTime, rtcc_time *upTime);
 
 	/**
 	 * Clear the power failure flag so it can be raised again if another failure is detected

examples/alarm.ino

@@ -7,7 +7,7 @@
 
 #define PIN_INT 	(3)
 
-RTCC_MCP7940N rtc();
+RTCC_MCP7940N rtc;
 
 volatile bool itr = false;
 

examples/clock.ino

@@ -5,7 +5,7 @@
 #include <Wire.h>
 #include <RTCC_MCP7940N.h>
 
-RTCC_MCP7940N rtc();
+RTCC_MCP7940N rtc;
 
 void setup()
 {

examples/power_outage.ino

@@ -0,0 +1,52 @@
+/* Part of RTCC (MCP7940N) Arduino library
+ * Copyright (C) 2017 Kane Wallmann
+ * See LICENCE.txt for license (MIT)*/
+
+#include <Wire.h>
+#include <RTCC_MCP7940N.h>
+
+RTCC_MCP7940N rtc;
+
+void setup()
+{
+	Serial.begin(9600);
+
+	// Must call before using rtcc
+	Wire.begin();
+
+	// Use crystal for timekeeping
+	rtc.SetOscillatorEnabled(true);
+	rtc.SetExternalOscillatorEnabled(false);
+}
+
+void loop()
+{
+	char buff[20];
+	bool pwrOutage;
+
+	// rtcc_time struct represents how the data is stored on RTCC chip, see tm_format example for info on converting
+	rtcc_time time, dwTime, upTime;
+	rtc.ReadTime(&time);
+
+	sprintf(buff, "%u%u-%u%u-%u%u %u%u:%u%u:%u%u", time.dateten, time.dateone, time.mthten, time.mthone, time.yrten,
+			time.yrone, time.hrten, time.hrone, time.minten, time.minone, time.secten, time.secone);
+	Serial.println(buff);
+
+	pwrOutage = rtc.HasPowerFailed(&dwTime, &upTime);
+	if (pwrOutage) {
+	    Serial.println("*****NEW OUTAGE*****");
+	}
+	else {
+	    Serial.println("LastOutage: ");
+	}
+	Serial.print("    From: ");
+	sprintf(buff, "%u%u-%u%u-%u%u %u%u:%u%u:%u%u", dwTime.dateten, dwTime.dateone, dwTime.mthten, dwTime.mthone, dwTime.yrten,
+			dwTime.yrone, dwTime.hrten, dwTime.hrone, dwTime.minten, dwTime.minone, dwTime.secten, dwTime.secone);
+	Serial.println(buff);
+	Serial.print("    To: ");
+	sprintf(buff, "%u%u-%u%u-%u%u %u%u:%u%u:%u%u", upTime.dateten, upTime.dateone, upTime.mthten, upTime.mthone, upTime.yrten,
+			upTime.yrone, upTime.hrten, upTime.hrone, upTime.minten, upTime.minone, upTime.secten, upTime.secone);
+	Serial.println(buff);
+
+	delay(10000);
+}

examples/tm_format.ino

@@ -6,7 +6,7 @@
 #include <RTCC_MCP7940N.h>
 #include <time.h>
 
-RTCC_MCP7940N rtc();
+RTCC_MCP7940N rtc;
 
 void setup()
 {
@@ -30,7 +30,7 @@ void loop()
 
 	// Covner to tm format
 	tm tm_time;
-	rtc.ConverTime( &time, &tm_time );
+	rtc.ConvertTime( &time, &tm_time );
 
 	// Format time and output to string
 	strftime( buff, 20, "%d-%m-%y %H:%M:%s", &tm_time );