Thomas Morris / Mbed OS PROJ324_Final

Fork of ELEC351_Group_T by Plymouth ELEC351 Group T

Files at this revision

API Documentation at this revision

Comitter:
thomasmorris
Date:
Wed Dec 20 15:18:00 2017 +0000
Parent:
11:e7b5ed6cd3cf
Child:
13:db857b3744c6
Commit message:
20/12/2017 v4

Changed in this revision

NETWORK.cpp Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/NETWORK.cpp	Wed Dec 20 14:43:55 2017 +0000
+++ b/NETWORK.cpp	Wed Dec 20 15:18:00 2017 +0000
@@ -31,7 +31,7 @@
         using namespace std;
         //Block and wait on an incoming connection
         srv.accept(&clt_sock, &clt_addr);
-        printf("accept %s:%d\n", clt_addr.get_ip_address(), clt_addr.get_port());
+        //printf("accept %s:%d\n", clt_addr.get_ip_address(), clt_addr.get_port());
         
         //Uses a C++ string to make it easier to concatinate
         string response;
@@ -43,7 +43,7 @@
         
         //Convert to a C String
         sprintf(ldr_str, "%5.3f", u );
-        printf("LDR: %5.3f\n\r", u);
+        //printf("LDR: %5.3f\n\r", u);
         
         //Build the C++ string response
         response = HTTP_MESSAGE_BODY1;
--- a/main.cpp	Wed Dec 20 14:43:55 2017 +0000
+++ b/main.cpp	Wed Dec 20 15:18:00 2017 +0000
@@ -4,9 +4,11 @@
 Current Verision 3
 Overiew: Working Tasks 1,5,7
 
-Last Revision: Added DATA class structure
+Last Revision: Added Mail Box to serial
 Todo:
-make a mailbox of DATA class 120 long
+make a mailbox within SD card, LCD, network so they can be used from within
+Fix the network so it uses the mail box data.
+Place the LCD write functions in their own function
 */
 
 //Includes and Definitions
@@ -79,7 +81,10 @@
     sw1TimeOut.detach();        //Stop the timeout counter firing
     SW1.fall(&SW1FallingEdge);  //Now wait for a falling edge
 }
-
+void SDWrite()//End of skype chat
+{
+    
+}
 //Interrupt service routive for SW1 falling edge (release)
 void SW1FallingEdge() {
     SW1.fall(NULL);                             //Disable this interrupt
@@ -156,7 +161,8 @@
     {
         osEvent evt = mail_box.get();                                   //Get the latest entry from "mail_box"
         
-        if (evt.status == osEventMail){
+        if (evt.status == osEventMail)
+        {
             DATA *Rec_Data = (DATA*)evt.value.p;
             DATA msg;