Andy & Phil / Mbed 2 deprecated c027_prototyping

Prototyping the Adaptable Emergency System on an C027 board.

Dependencies:   C027_Support mbed

Fork of c027_prototyping by Philémon Favrod

Files at this revision

API Documentation at this revision

Revision 6:58d48b90c9f7, committed 2014-09-30

Comitter:
philemonf
Date:
Tue Sep 30 18:04:00 2014 +0000
Parent:
5:6d0cdd715100
Child:
9:c91facdc759b
Child:
10:b9ca12e9bb34
Commit message:
correct typos in sms_lib

Changed in this revision

sms_lib.cpp Show annotated file Show diff for this revision Revisions of this file
sms_lib.h Show annotated file Show diff for this revision Revisions of this file 
--- a/sms_lib.cpp	Tue Sep 30 17:49:29 2014 +0000
+++ b/sms_lib.cpp	Tue Sep 30 18:04:00 2014 +0000
@@ -13,12 +13,12 @@
     
     MDMParser::DevStatus devStatus = {};
     MDMParser::NetStatus netStatus = {};
-    bool mdmOk = mdm.init(SIMPIN, &devStatus);
-    mdm.dumpDevStatus(&devStatus);
+    bool mdmOk = mdm->init(SIMPIN, &devStatus);
+    mdm->dumpDevStatus(&devStatus);
     
     if (mdmOk) {
-        mdmOk &= mdm.registerNet(&netStatus);
-        mdm.dumpNetStatus(&netStatus);
+        mdmOk &= mdm->registerNet(&netStatus);
+        mdm->dumpNetStatus(&netStatus);
     }
     
     return mdmOk;
@@ -31,11 +31,10 @@
     }
 }
 
-#define PREC_UNSATISFIED (!sms || !(sms->phone_num) || !(sms->msg_buf) || !mdm)
-int send_sms(struct sms_t *sms)
+int send_sms(struct sms_data_t *sms)
 {
     
-    if (PREC_UNSATISFIED) {
+    if (!sms || !(sms->phone_num) || !(sms->msg_buf) || !mdm) {
         return 0;
     }
     
@@ -43,17 +42,17 @@
 }
 
 
-int read_sms(struct sms_t *sms)
+int read_sms(struct sms_data_t *sms)
 {
-    if (PREC_UNSATISFIED) {
+    if (!sms || !(sms->phone_num) || !(sms->msg_buf) || !mdm) {
         return 0;
     }
     
     int ix[1];
-    int numReceivedSMS = mdm.smsList("REC UNREAD", ix, 1);
+    int numReceivedSMS = mdm->smsList("REC UNREAD", ix, 1);
     
-    if (numReceivedSMS > 1 && mdm.smsRead(ix[0], sms->phone_num, sms->msg_buf, sizeof(sms->msg_buf)) {
-        mdm.smsDelete(ix[0]);
+    if (numReceivedSMS > 1 && mdm->smsRead(ix[0], sms->phone_num, sms->msg_buf, sizeof(sms->msg_buf))) {
+        mdm->smsDelete(ix[0]);
         return 1;
     }
     

--- a/sms_lib.h	Tue Sep 30 17:49:29 2014 +0000
+++ b/sms_lib.h	Tue Sep 30 18:04:00 2014 +0000
@@ -9,6 +9,6 @@
 int init_sms_features(void);
 void close_sms_features(void);
 
-int send_sms(struct sms_t *sms);
-int read_sms(struct sms_t *sms);
+int send_sms(struct sms_data_t *sms);
+int read_sms(struct sms_data_t *sms);
 #endif
\ No newline at end of file