Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Rtc function #76

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rtc function #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5c6b66
Extended readRTC function
Nov 6, 2016
faf4b21
Change or reply variable
Nov 6, 2016
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
57 changes: 41 additions & 16 deletions Adafruit_FONA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ boolean Adafruit_FONA::begin(Stream &port) {
if (sendCheckReply(F("AT"), ok_reply))
break;
while (mySerial->available()) mySerial->read();
if (sendCheckReply(F("AT"), F("AT")))
if (sendCheckReply(F("AT"), F("AT")))
break;
delay(500);
timeout-=500;
Expand Down Expand Up @@ -142,12 +142,37 @@ boolean Adafruit_FONA::setBaudrate(uint16_t baud) {

/********* Real Time Clock ********************************************/

boolean Adafruit_FONA::readRTC(uint8_t *year, uint8_t *month, uint8_t *date, uint8_t *hr, uint8_t *min, uint8_t *sec) {
uint16_t v;
sendParseReply(F("AT+CCLK?"), F("+CCLK: "), &v, '/', 0);
*year = v;
boolean Adafruit_FONA::readRTC(uint8_t *year, uint8_t *month, uint8_t *date, uint8_t *hr, uint8_t *min, uint8_t *sec, int8_t *tz) {
getReply(F("AT+CCLK?"), (uint16_t) 10000); //Get RTC timeout 10 sec
if (strncmp(replybuffer, "+CCLK: ", 7) != 0)
return false;

char *p = replybuffer+8; // skip +CCLK: "
// Parse Date.
int reply = atoi(p); // get Year
*year = (uint8_t) reply; // Save as year
p+=3; // skip 3 char
reply = atoi(p);
*month = (uint8_t) reply;
p+=3;
reply = atoi(p);
*date = (uint8_t) reply;
p+=3;
reply = atoi(p);
*hr = (uint8_t) reply;
p+=3;
reply = atoi(p);
*min = (uint8_t) reply;
p+=3;
reply = atoi(p);
*sec = (uint8_t) reply;
p+=3;
reply = atoi(p);
*tz = reply;

readline(); // eat OK

DEBUG_PRINTLN(*year);
return true;
}

boolean Adafruit_FONA::enableRTC(uint8_t i) {
Expand Down Expand Up @@ -382,7 +407,7 @@ boolean Adafruit_FONA::callPhone(char *number) {
uint8_t Adafruit_FONA::getCallStatus(void) {
uint16_t phoneStatus;

if (! sendParseReply(F("AT+CPAS"), F("+CPAS: "), &phoneStatus))
if (! sendParseReply(F("AT+CPAS"), F("+CPAS: "), &phoneStatus))
return FONA_CALL_FAILED; // 1, since 0 is actually a known, good reply

return phoneStatus; // 0 ready, 2 unkown, 3 ringing, 4 call in progress
Expand Down Expand Up @@ -471,9 +496,9 @@ int8_t Adafruit_FONA::getNumSMS(void) {
if (! sendCheckReply(F("AT+CMGF=1"), ok_reply)) return -1;

// ask how many sms are stored
if (sendParseReply(F("AT+CPMS?"), F("\"SM\","), &numsms))
if (sendParseReply(F("AT+CPMS?"), F("\"SM\","), &numsms))
return numsms;
if (sendParseReply(F("AT+CPMS?"), F("\"SM_P\","), &numsms))
if (sendParseReply(F("AT+CPMS?"), F("\"SM_P\","), &numsms))
return numsms;
return -1;
}
Expand Down Expand Up @@ -507,7 +532,7 @@ boolean Adafruit_FONA::readSMS(uint8_t i, char *smsbuff,

DEBUG_PRINTLN(replybuffer);


if (! parseReply(F("+CMGR:"), &thesmslen, ',', 11)) {
*readlen = 0;
return false;
Expand Down Expand Up @@ -1165,20 +1190,20 @@ boolean Adafruit_FONA::enableGPRS(boolean onoff) {
mySerial->println("\"");

DEBUG_PRINT(F("\t---> ")); DEBUG_PRINT(F("AT+CSTT=\""));
DEBUG_PRINT(apn);
DEBUG_PRINT(apn);

if (apnusername) {
DEBUG_PRINT("\",\"");
DEBUG_PRINT(apnusername);
DEBUG_PRINT(apnusername);
}
if (apnpassword) {
DEBUG_PRINT("\",\"");
DEBUG_PRINT(apnpassword);
DEBUG_PRINT(apnpassword);
}
DEBUG_PRINTLN("\"");

if (! expectReply(ok_reply)) return false;

// set username/password
if (apnusername) {
// Send command AT+SAPBR=3,1,"USER","<user>" where <user> is the configured APN username.
Expand Down
2 changes: 1 addition & 1 deletion Adafruit_FONA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Adafruit_FONA : public FONAStreamType {

// RTC
boolean enableRTC(uint8_t i);
boolean readRTC(uint8_t *year, uint8_t *month, uint8_t *date, uint8_t *hr, uint8_t *min, uint8_t *sec);
boolean readRTC(uint8_t *year, uint8_t *month, uint8_t *date, uint8_t *hr, uint8_t *min, uint8_t *sec, int8_t *tz);

// Battery and ADC
boolean getADCVoltage(uint16_t *v);
Expand Down