Diff: main.cpp

Revision:

13:455601f62aad

Parent:

12:5b4f3245606a

Child:

14:7cdb643da356

--- a/main.cpp	Mon Mar 21 23:14:46 2016 +0000
+++ b/main.cpp	Tue Mar 22 14:56:35 2016 +0000
@@ -19,12 +19,12 @@
 /////////////////////////////////////////////
 //General Items
 /////////////////////////////////////////////
-//I2C                 i2c(PB_9, PB_8);//(D14, D15);
+//I2C                 i2c(PB_9, PB_8);//(D14, D15); SDA,SCL
 Serial              pc(USBTX, USBRX);
 DigitalOut          blower(PA_9, 0);//(D8, 0);
 DigitalOut          pbKill(PC_12, 1); // Digital input pin that conncect to the LTC2950 battery charger used to shutdown the UPAS 
+DigitalIn           nINT(PA_15); //Connected but currently unused is a digital ouput pin from LTC2950 battery charger. http://cds.linear.com/docs/en/datasheet/295012fd.pdf
 /*
-DigitalIn           nINT(PA_15); //Connected but currently unused is a digital ouput pin from LTC2950 battery charger. http://cds.linear.com/docs/en/datasheet/295012fd.pdf
 MCP40D17            DigPot(&i2c);
 BME280              bmesensor(PB_9, PB_8);//(D14, D15);
 NCP5623BMUTBG       RGB_LED(PB_9, PB_8);//(D14, D15);
@@ -39,10 +39,11 @@
 Serial microChannel(PB_10, PB_11); // tx, rx
 DigitalOut          bleRTS(PB_14, 0);
 DigitalOut          bleCTS(PB_13, 0);
+/*
 DigitalOut          BT_IRST(PC_8, 0);
 DigitalOut          BT_SW(PA_12, 0);
 
-/*
+
 /////////////////////////////////////////////
 //Analog to Digital Converter
 /////////////////////////////////////////////
@@ -403,12 +404,12 @@
 //////////////////////////////////////////////////////////////
 void log_data()
 {
-
+/*
     //RGB_LED.set_led(1,1,0);
         
     time_t seconds = time(NULL);
     strftime(timestr, 32, "%y%m%d%H%M%S", localtime(&seconds));
-/*
+
     RTC_UPAS.get_time(); 
     press = bmesensor.getPressure();
     temp = bmesensor.getTemperature()-5.0;
@@ -566,7 +567,7 @@
     motor2.stop();
     motor3.stop();
     motor4.stop();
-*/
+
 
     pc.baud(115200);  // set what you want here depending on your terminal program speed
     pc.printf("\f\n\r-------------Startup-------------\n\r");
@@ -574,7 +575,7 @@
     
     
     uint8_t serialNumberAndType[6] = {0x50,0x53};
-    /*
+    
     E2PROM.read(0x00034,serialNumberAndType+2,2);
    
     int tempSerialNum = serialNumberAndType[2]+serialNumberAndType[3];
@@ -590,7 +591,7 @@
     serialNumberAndType[5] = serialNumDigits[3]+48;
     
     RGB_LED.set_led(0,1,0);
-    */
+    
     pc.attach(pc_recv);
     microChannel.attach(uartMicro,microChannel.RxIrq);
     microChannel.baud(115200);  
@@ -667,11 +668,11 @@
     uint8_t subjectLabelOriginal[8] = {0,};
     E2PROM.read(0x00001, subjectLabelOriginal,8); 
 
-*/
+
         
     time_t seconds = time(NULL);
     strftime(timestr, 32, "%y-%m-%d-%H=%M=%S", localtime(&seconds));
-/*
+
     //sprintf(filename, "/sd/UPAS%04dLOG_%02d-%02d-%02d_%02d=%02d=%02d_%c%c%c%c%c%c%c%c.txt",serial_num,RTC_UPAS.year,RTC_UPAS.month,RTC_UPAS.date,RTC_UPAS.hour,RTC_UPAS.minutes,RTC_UPAS.seconds,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7]);
     sprintf(filename, "/sd/UPAS_TboardtestLog_%s_%c%c%c%c%c%c%c%c.txt", timestr,subjectLabelOriginal[0],subjectLabelOriginal[1],subjectLabelOriginal[2],subjectLabelOriginal[3],subjectLabelOriginal[4],subjectLabelOriginal[5],subjectLabelOriginal[6],subjectLabelOriginal[7]);
     FILE *fp = fopen(filename, "w");
@@ -731,7 +732,7 @@
     RGB_LED.set_led(0,1,0);
 */
   //  stop.attach(&check_stop, 9);    // check if we should shut down every 9 number seconds, starting after the start.
-    logg.attach(&log_data, logInerval);
+ //   logg.attach(&log_data, logInerval);
     //flowCtl.attach(&flowControl, 1);
             
 
@@ -742,6 +743,10 @@
 
     while (1) {
         // Do other things...
+        blower = 1;
+        wait(5);
+        blower = 0;
+        wait(5);
     }