Revision 6:a738dcd53bf8, committed 2016-03-01

Comitter:

caseyquinn

Date:

Tue Mar 01 02:56:20 2016 +0000

Parent:

5:c3252e5d45ca

Child:

7:29b01d5812ee

Commit message:

Recopied and updated the mbed folder version (now seems to work)... must not have been completely copied over...

Changed in this revision

--- a/main.cpp	Mon Feb 29 20:43:07 2016 +0000
+++ b/main.cpp	Tue Mar 01 02:56:20 2016 +0000
@@ -10,7 +10,7 @@
 #include "CronoDot.h"
 #include "EEPROM.h"
 #include "Calibration.h" 
-//Serial pc(USBTX, USBRX);
+Serial pc(USBTX, USBRX);
 //Serial microChannel(D0, D1); // tx, rx Appears there is a conflict in the mbed code (possibly already assigned to SERIAL_TX, SERIAL_RX, USBTX, USBRX need to reassign these values)
 // However still an issue with the BLE not reading the EEPROM with the old pin assignments Jake had.
 Serial microChannel(D8, D2); // tx, rx
@@ -250,7 +250,7 @@
 }
  
 int main(){
-    RGB_LED.set_led(1,1,1);
+    //RGB_LED.set_led(1,1,1);
     STtime.tm_sec = 10;    // 0-59
     STtime.tm_min = 38;    // 0-59
     STtime.tm_hour = 15;   // 0-23
@@ -261,7 +261,7 @@
     set_time(STseconds); // Set RTC time to 16 December 2013 10:05:23 UTC
     char timestr[32];
     //wait(10);
-    RGB_LED.set_led(0,0,1);
+    //RGB_LED.set_led(0,0,1);
     //pc.baud(115200);  // set what you want here depending on your terminal program speed
     //pc.printf("\f\n\r-------------Startup-------------\n\r");
     wait(0.5);
@@ -285,7 +285,7 @@
     //pc.attach(pc_recv);
     microChannel.attach(uartMicro,microChannel.RxIrq);
     microChannel.baud(115200);  
-    RGB_LED.set_led(1,0,0);
+    //RGB_LED.set_led(1,0,0);
     microChannel.printf("$$$");
     wait(0.5);
     microChannel.printf("SN,");

--- a/mbed.lib	Mon Feb 29 20:43:07 2016 +0000
+++ b/mbed.lib	Tue Mar 01 02:56:20 2016 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/Vockens-Group-Sensors/code/mbed/#57796552bb4a
+http://mbed.org/users/mbed_official/code/mbed/#252557024ec3