Diff: Samples/SampleSync_writeAndChangeAll.cpp

Revision:

17:d8d3d2088cac

Parent:

15:94c98d2aa235

Child:

18:d596eb3f575f

diff -r 02611ca49f48 -r d8d3d2088cac Samples/SampleSync_writeAndChangeAll.cpp
--- a/Samples/SampleSync_writeAndChangeAll.cpp	Wed Aug 31 15:14:08 2016 +0000
+++ b/Samples/SampleSync_writeAndChangeAll.cpp	Thu Jul 13 09:41:01 2017 +0000
@@ -46,13 +46,14 @@
 #include "NDefLib/RecordType/RecordText.h"
 #include "NDefLib/RecordType/RecordMimeType.h"
 #include "NDefLib/RecordType/RecordVCard.h"
+#include "NDefLib/RecordType/RecordWifiConf.h"
 
-#include "X_NUCLEO_NFC01A1.h"
+#include "XNucleoNFC01A1.h"
 
 /**
  * Shift the led status between the 3 leds.
  */
-static void shiftLed(DigitalOut &led1,DigitalOut &led2,DigitalOut &led3){
+static void shift_led(DigitalOut &led1,DigitalOut &led2,DigitalOut &led3){
     const uint8_t prevLed1=led1;
     const uint8_t prevLed2=led2;
     const uint8_t prevLed3=led3;
@@ -65,33 +66,37 @@
  * Create a message that contains all the possible records, and write it in the tag.
  * @param tag Nfc tag where write the message.
  */
-static void writeNFCTag(NDefLib::NDefNfcTag &tag){
+static void write_nfc_tag(NDefLib::NDefNfcTag &tag){
 
-    bool writeStatus,closeStatus;
-    if(tag.openSession()){
+    bool writeStatus=false;
+    bool closeStatus=false;
+    if(tag.open_session()){
         printf("Open session\r\n");
         NDefLib::Message msg;
 
         NDefLib::RecordAAR rAAR("com.st.BlueMS");
-        msg.addRecord(&rAAR);
+        msg.add_record(&rAAR);
 
         NDefLib::RecordSMS rSMS("123456789","st.com.BlueMS");
-        msg.addRecord(&rSMS);
+        msg.add_record(&rSMS);
 
         NDefLib::RecordGeo rGeo(123.123,-456.789);
-        msg.addRecord(&rGeo);
+        msg.add_record(&rGeo);
 
         NDefLib::RecordURI rUri(NDefLib::RecordURI::HTTP_WWW,"http://www.st.com");
-        msg.addRecord(&rUri);
+        msg.add_record(&rUri);
 
         NDefLib::RecordMail rMail("mail@st.com","ciao","da nfc tag");
-        msg.addRecord(&rMail);
+        msg.add_record(&rMail);
 
         NDefLib::RecordMimeType rText1("text/plain",(const uint8_t*)"ciao",4);
-        msg.addRecord(&rText1);
+        msg.add_record(&rText1);
 
         NDefLib::RecordText rText3(NDefLib::RecordText::UTF8,"it","ciao");
-        msg.addRecord(&rText3);
+        msg.add_record(&rText3);
+
+        NDefLib::RecordWifiConf rWifi("OpenNetworkd");
+        msg.add_record(&rWifi);
 
         NDefLib::RecordVCard::VCardInfo_t cardInfo;
         cardInfo[NDefLib::RecordVCard::FORMATTED_NAME]="prova prova1";
@@ -112,11 +117,11 @@
         cardInfo[NDefLib::RecordVCard::URL]="www.st.com";
         cardInfo[NDefLib::RecordVCard::PHOTO_URI]="http://www.st.com/st-web-ui/static/active/en/fragment/multimedia/image/picture/customer_focus.jpg";
         NDefLib::RecordVCard rVCard(cardInfo);
-        msg.addRecord(&rVCard);
+        msg.add_record(&rVCard);
 
         writeStatus = tag.write(msg);
 
-        closeStatus = tag.closeSession();
+        closeStatus = tag.close_session();
 
     }else
         printf("Error open Session\n\r");
@@ -136,45 +141,45 @@
  * Print the record content.
  * @param r Record to print.
  */
-static void printRecord(NDefLib::Record *const r){
+static void print_record(NDefLib::Record *const r){
     using namespace NDefLib;
-    switch(r->getType()){
+    switch(r->get_type()){
         case Record::TYPE_TEXT: {
             const RecordText *const temp = ( RecordText* )r;
-            printf("Read Text: %s\r\n",temp->getText().c_str());
+            printf("Read Text: %s\r\n",temp->get_text().c_str());
             break; }
         case Record::TYPE_AAR:{
             const RecordAAR *const temp = ( RecordAAR* )r;
-            printf("Read ARR: %s\r\n",temp->getPackage().c_str());
+            printf("Read ARR: %s\r\n",temp->get_package().c_str());
             break; }
         case Record::TYPE_MIME:{
             const RecordMimeType *const temp = ( RecordMimeType* )r;
-            printf("Read mimeType: %s\r\n",temp->getMimeType().c_str());
+            printf("Read mimeType: %s\r\n",temp->get_mime_type().c_str());
             printf("Read mimeData: %s\r\n",
-                    std::string((const char*)temp->getMimeData(),
-                            temp->getMimeDataLenght()).c_str());
+                    std::string((const char*)temp->get_mime_data(),
+                            temp->get_mime_data_lenght()).c_str());
             break;}
         case Record::TYPE_URI:{
             RecordURI *const temp = (RecordURI*)r;
-            printf("Read uriId: %d\r\n",temp->getUriId());
-            printf("Read uriType: %s\r\n",temp->getUriType().c_str());
-            printf("Read uriContent: %s\r\n",temp->getContent().c_str());
+            printf("Read uriId: %d\r\n",temp->get_uri_id());
+            printf("Read uriType: %s\r\n",temp->get_uri_type().c_str());
+            printf("Read uriContent: %s\r\n",temp->get_content().c_str());
             break;}
         case Record::TYPE_URI_MAIL:{
             const RecordMail*const temp = (RecordMail*)r;
-            printf("Read Dest: %s\r\n",temp->getToAddress().c_str());
-            printf("Read Subject: %s\r\n",temp->getSubject().c_str());
-            printf("Read Body: %s\r\n",temp->getBody().c_str());
+            printf("Read Dest: %s\r\n",temp->get_to_address().c_str());
+            printf("Read Subject: %s\r\n",temp->get_subject().c_str());
+            printf("Read Body: %s\r\n",temp->get_body().c_str());
             break;}
         case Record::TYPE_URI_SMS:{
             const RecordSMS*const temp = (RecordSMS*)r;
-            printf("Read number: %s\r\n",temp->getNumber().c_str());
-            printf("Read message: %s\r\n",temp->getMessagge().c_str());
+            printf("Read number: %s\r\n",temp->get_number().c_str());
+            printf("Read message: %s\r\n",temp->get_messagge().c_str());
             break;}
         case Record::TYPE_URI_GEOLOCATION:{
             const RecordGeo*const temp = (RecordGeo*)r;
-            printf("Read lat: %f\r\n",temp->getLatitude());
-            printf("Read long: %f\r\n",temp->getLongitude());
+            printf("Read lat: %f\r\n",temp->get_latitude());
+            printf("Read long: %f\r\n",temp->get_longitude());
             break;}
         case Record::TYPE_MIME_VCARD:{
             const RecordVCard *const temp = (RecordVCard*)r;
@@ -182,6 +187,13 @@
             printf("Read Mail: %s\r\n",(*temp)[RecordVCard::EMAIL_WORK].c_str());
             printf("Read ORG: %s\r\n",(*temp)[RecordVCard::ORGANIZATION].c_str());
             break;}
+        case Record::TYPE_WIFI_CONF:{
+            const RecordWifiConf *const temp = (RecordWifiConf*)r;
+            printf("Nework Name: %s\r\n",temp->get_network_ssid().c_str());
+            printf("Nework Key: %s\r\n",temp->get_network_key().c_str());
+            printf("Nework Auth: %X\r\n",temp->get_auth_type());
+            printf("Nework Enc: %X\r\n",temp->get_encryption());
+            break;}
         case Record::TYPE_UNKNOWN:{
             printf("Unknown record\r\n");
             break;}
@@ -192,46 +204,53 @@
  * Change the record content.
  * @param r Record to change.
  */
-static void changeRecord(NDefLib::Record const* r){
+static void change_record(NDefLib::Record const* r){
     using namespace NDefLib;
-    switch(r->getType()){
+    switch(r->get_type()){
         case Record::TYPE_TEXT: {
             RecordText *temp = (RecordText*)r;
-            temp->setText("Hello");
+            temp->set_text("Hello");
             break; }
         case Record::TYPE_AAR:{
             RecordAAR *temp = (RecordAAR*)r;
-            temp->setPackage("set Package Ok");
+            temp->set_package("set Package Ok");
             break; }
         case Record::TYPE_MIME:{
             RecordMimeType *temp = (RecordMimeType*)r;
-            temp->copyMimeData((const uint8_t *)"String2",sizeof("String2"));
+            temp->copy_mime_data((const uint8_t *)"String2",sizeof("String2"));
             break;}
         case Record::TYPE_URI:{
             RecordURI *temp = (RecordURI*)r;
-            temp->setContent("mbed.com");
+            temp->set_content("mbed.com");
             break;}
         case Record::TYPE_URI_MAIL:{
             RecordMail *temp = (RecordMail*)r;
-            temp->setToAddress("newMail@st.com");
-            temp->setSubject("tag change");
-            temp->setBody("read/change Works!");
+            temp->set_to_address("newMail@st.com");
+            temp->set_subject("tag change");
+            temp->set_body("read/change Works!");
             break;}
         case Record::TYPE_URI_SMS:{
             RecordSMS *temp = (RecordSMS*)r;
-            temp->setMessage("Message Change");
-            temp->setNumber("0987654321");
+            temp->set_message("Message Change");
+            temp->set_number("0987654321");
             break;}
         case Record::TYPE_URI_GEOLOCATION:{
             RecordGeo *temp = (RecordGeo*)r;
-            temp->setLatitude(-temp->getLatitude());
-            temp->setLongitude(-temp->getLongitude());
+            temp->set_latitude(-temp->get_latitude());
+            temp->set_longitude(-temp->get_longitude());
             break;}
         case Record::TYPE_MIME_VCARD:{
             RecordVCard *temp = (RecordVCard*)r;
             (*temp)[RecordVCard::NAME]="name change";
             (*temp)[RecordVCard::NICKNAME]="nic change";
             break;}
+        case Record::TYPE_WIFI_CONF:{
+            RecordWifiConf * temp = (RecordWifiConf*)r;
+            temp->set_network_ssid("hackMe");
+            temp->set_network_key("qwerty");
+            temp->set_auth_type(RecordWifiConf::AUTH_WPA2_PSK);
+            temp->set_encryption_type(RecordWifiConf::ENC_TYPE_AES_TKIP);
+            break;}
         case Record::TYPE_UNKNOWN:{
             printf("Unknown record\r\n");
             break;}
@@ -242,27 +261,27 @@
  * Read the nfc message and print the content on the serial console
  * @param tag Nfc tag where read the content
  */
-static void readAndPrintNfcTag(NDefLib::NDefNfcTag &tag){
+static void read_and_print_nfc_tag(NDefLib::NDefNfcTag &tag){
     using namespace NDefLib;
 
-    if(tag.openSession()){
+    if(tag.open_session()){
         printf("Open Session\r\n");
         NDefLib::Message readMsg;
 
         tag.read(&readMsg);
         printf("Message Read\r\n");
         
-        if(readMsg.getNRecords()==0){
+        if(readMsg.get_N_records()==0){
             printf("Error Read\r\n");
         }else{
-            for(uint32_t i=0;i<readMsg.getNRecords();i++){
+            for(uint32_t i=0;i<readMsg.get_N_records();i++){
                 Record *r = readMsg[i];
-                printRecord(r);
+                print_record(r);
                 delete r;
             }//for
         }//if-else
 
-        tag.closeSession();
+        tag.close_session();
         printf("Close session\r\n");
     }else{
         printf("Error open read Session\n\r");
@@ -273,29 +292,29 @@
  * Read a nfc message, change the content of each record and write the new message.
  * @param tag Tag where read and write the nfc message.
  */
-static void readAndChangeNfcTag(NDefLib::NDefNfcTag &tag){
+static void read_and_change_nfc_tag(NDefLib::NDefNfcTag &tag){
     using NDefLib::Record;
     using NDefLib::Message;
 
-    if(tag.openSession()){
+    if(tag.open_session()){
         printf("Open Session\r\n");
         Message readMsg;
 
         tag.read(&readMsg);
         printf("Read Message\r\n");
         
-        if(readMsg.getNRecords()==0){
+        if(readMsg.get_N_records()==0){
             printf("Error Read\r\n");
         }else{
-            for(uint32_t i=0;i<readMsg.getNRecords();i++){
+            for(uint32_t i=0;i<readMsg.get_N_records();i++){
                 Record *r = readMsg[i];
-                changeRecord(r);
+                change_record(r);
             }//for
             tag.write(readMsg);
             printf("Message Wrote\r\n");
         }//if-else
 
-        tag.closeSession();
+        tag.close_session();
         printf("Close Session\r\n");
     }else{
         printf("Error open SessionChange\n\r");
@@ -307,7 +326,7 @@
 /**
  * Call back called when the user press the button
  */
-static void setButtonPress(){
+static void set_button_press(){
     buttonPress=true;
 }//if buttonPress
 
@@ -317,38 +336,40 @@
 void sampleSync_writeAndChangeAll() {
     
     //instance the board with the default paramiters
-    I2C i2cChannel(X_NUCLEO_NFC01A1::DEFAULT_SDA_PIN,X_NUCLEO_NFC01A1::DEFAULT_SDL_PIN);
-    X_NUCLEO_NFC01A1 *nfcNucleo = X_NUCLEO_NFC01A1::Instance(i2cChannel);
+    I2C i2cChannel(XNucleoNFC01A1::DEFAULT_SDA_PIN,XNucleoNFC01A1::DEFAULT_SDL_PIN);
+    XNucleoNFC01A1 *nfcNucleo = XNucleoNFC01A1::instance(i2cChannel);
     //retrieve the NdefLib interface
-    NDefLib::NDefNfcTag& tag = nfcNucleo->getM24SR().getNDefTag();
+    NDefLib::NDefNfcTag& tag = nfcNucleo->get_M24SR().get_NDef_tag();
     
     //switch on the first led    
-    nfcNucleo->getLed1()=1;
-    nfcNucleo->getLed2()=0;
-    nfcNucleo->getLed3()=0;
+    nfcNucleo->get_led1()=1;
+    nfcNucleo->get_led2()=0;
+    nfcNucleo->get_led3()=0;
     
     printf("Init Done\r\n");
 
     //write the message
-    writeNFCTag(tag);
+    write_nfc_tag(tag);
     //read the message and write it on console
-    readAndPrintNfcTag(tag);
+    read_and_print_nfc_tag(tag);
 
     //enable the button
-    InterruptIn mybutton(USER_BUTTON);
-    //InterruptIn mybutton(SW2);
-    mybutton.fall(setButtonPress);
+    #if defined(TARGET_STM)
+        InterruptIn userButton(USER_BUTTON);
+    #else
+        InterruptIn userButton(SW2);
+    #endif
+    userButton.fall(set_button_press);
 
     //each second change the led status and see if the user press the button
     while(true) {               
         if(buttonPress){
             //update the message content
-            readAndChangeNfcTag(tag);
+            read_and_change_nfc_tag(tag);
             //write the new message on console
-            readAndPrintNfcTag(tag);
-            shiftLed(nfcNucleo->getLed1(),nfcNucleo->getLed2(),nfcNucleo->getLed3());
+            read_and_print_nfc_tag(tag);
+            shift_led(nfcNucleo->get_led1(),nfcNucleo->get_led2(),nfcNucleo->get_led3());
             buttonPress=false;
-        }
-    }
-
+        }//if
+    }//while
 }
\ No newline at end of file