Skip to content

Rename CurieRTC to CurieTime and integrate some Processing/Time lib API's #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 15, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 0 additions & 71 deletions libraries/CurieRTC/examples/SetTime/SetTime.ino

This file was deleted.

7 changes: 0 additions & 7 deletions libraries/CurieRTC/readme.txt

This file was deleted.

42 changes: 0 additions & 42 deletions libraries/CurieRTC/src/CurieRTC.cpp

This file was deleted.

37 changes: 0 additions & 37 deletions libraries/CurieRTC/src/CurieRTC.h

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,30 +1,26 @@
#include <TimeLib.h>
#include <CurieRTC.h>
#include <CurieTime.h>

void setup() {
Serial.begin(115200);
delay(200);
Serial.println("CurieRTC Read Test");
while (!Serial);
Serial.begin(9600);

Serial.println("CurieTime Read Test");
Serial.println("-------------------");
}

void loop() {
tmElements_t tm;
time_t t = RTC.get();
breakTime(t, tm);

Serial.print("Ok, Time = ");
print2digits(tm.Hour);
print2digits(hour());
Serial.write(':');
print2digits(tm.Minute);
print2digits(minute());
Serial.write(':');
print2digits(tm.Second);
print2digits(second());
Serial.print(", Date (D/M/Y) = ");
Serial.print(tm.Day);
Serial.print(day());
Serial.write('/');
Serial.print(tm.Month);
Serial.print(month());
Serial.write('/');
Serial.print(tmYearToCalendar(tm.Year));
Serial.print(year());
Serial.println();
delay(1000);
}
Expand Down
38 changes: 38 additions & 0 deletions libraries/CurieTime/examples/SetTime/SetTime.ino
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#include <CurieTime.h>

void setup() {
while (!Serial);
Serial.begin(9600);

// set the current time to 14:27:00, December 14th, 2015
setTime(14, 27, 00, 14, 12, 2015);
}

void loop() {
Serial.print("Time now is: ");

print2digits(hour());
Serial.print(":");
print2digits(minute());
Serial.print(":");
print2digits(second());

Serial.print(" ");

Serial.print(day());
Serial.print("/");
Serial.print(month());
Serial.print("/");
Serial.print(year());

Serial.println();

delay(1000);
}

void print2digits(int number) {
if (number >= 0 && number < 10) {
Serial.print('0');
}
Serial.print(number);
}
13 changes: 3 additions & 10 deletions libraries/Time/keywords.txt → libraries/CurieTime/keywords.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#######################################
# Syntax Coloring Map For Time
# Syntax Coloring Map For CurieTime
#######################################

#######################################
# Datatypes (KEYWORD1)
#######################################
time_t KEYWORD1

#######################################
# Methods and Functions (KEYWORD2)
#######################################
Expand All @@ -16,15 +16,8 @@ hour KEYWORD2
day KEYWORD2
month KEYWORD2
year KEYWORD2
isAM KEYWORD2
isPM KEYWORD2
weekday KEYWORD2
setTime KEYWORD2
adjustTime KEYWORD2
setSyncProvider KEYWORD2
setSyncInterval KEYWORD2
timeStatus KEYWORD2
TimeLib KEYWORD2

#######################################
# Instances (KEYWORD2)
#######################################
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name=CurieRTC
name=CurieTime
version=1.0
author=Intel
maintainer=Intel <dino.tinitigan@intel.com>
sentence=Curie RTC library.
sentence=Curie Time library.
paragraph=
category=Timing
url=
Expand Down
7 changes: 7 additions & 0 deletions libraries/CurieTime/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Readme file for CurieTime Library

The CurieTime library is provided to demonstrate the Arduino101 Time library.

See the CurieTime example sketches provided with the Arduino101 Time library download for usage


Loading