Mark Bruijn / Mbed 2 deprecated SOS_V1

new battery bar

Dependencies:   CAN_IDs CanControl Dashboard PinDetect PowerControl mbed-rtos mbed

Files at this revision

API Documentation at this revision

Revision 3:b164662f9740, committed 2017-05-10

Comitter:
kwasymodo
Date:
Wed May 10 18:45:51 2017 +0000
Parent:
2:e47fcc147530
Child:
4:dfd10f43cc8b
Commit message:
changed pinout.h

Changed in this revision

PowerControl.lib 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
pinout.h Show annotated file Show diff for this revision Revisions of this file 
--- a/PowerControl.lib	Wed May 10 17:14:40 2017 +0000
+++ b/PowerControl.lib	Wed May 10 18:45:51 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/kwasymodo/code/PowerControl/#f7568c04c1c3
+https://developer.mbed.org/users/kwasymodo/code/PowerControl/#1bae9ab7241e

--- a/main.cpp	Wed May 10 17:14:40 2017 +0000
+++ b/main.cpp	Wed May 10 18:45:51 2017 +0000
@@ -27,7 +27,7 @@
 
 // initialize serial connection for debug
 #ifdef DEBUG
-Serial pc(SERIAL_TX, SERIAL_RX);
+RawSerial pc(SERIAL_TX, SERIAL_RX);
 #endif
 
 // initialize canbus
@@ -118,12 +118,12 @@
 // Thread 1 - Power
 void power(){
 #ifdef DEBUG
-    printf("Thread 1 - Power start\r\n ");
+    pc.printf("Thread 1 - Power start\r\n ");
 #endif
 
     PowerControl powercontrol(PUSH_GREEN, PUSH_RED); 
-    #ifdef DEBUG
-    printf("Thread 1 - started\r\n ");
+#ifdef DEBUG
+    pc.printf("Thread 1 - started\r\n ");
 #endif
     
     //sleep();
@@ -142,7 +142,7 @@
 int main() {  
 #ifdef DEBUG
     pc.baud(115200);
-    printf("Starting SOS V1.0\n");
+    pc.printf("Starting SOS V1.0\n");
 #endif
     // change CAN frequency
     can.frequency(250000);

--- a/pinout.h	Wed May 10 17:14:40 2017 +0000
+++ b/pinout.h	Wed May 10 18:45:51 2017 +0000
@@ -13,9 +13,9 @@
 LED2            - x x - 3V3                     BUCK2           - x x - BIEM_CS1
 LED1            - x x - 5V                      LED5            - x x - NC
 GND             - x x - GND                     LED4            - x x - GND
-(FONA_KEY)      - x x - GND                     XSENS_RX        - x x - BIEM_CS3
+(hack FONA_KEY) - x x - GND                     XSENS_RX        - x x - BIEM_CS3
 PUSH_GREEN      - x x - NC                      SCRN_LED2       - x x - BIEM_CS2
-PUSH_RED        - x x - NC                      SCRN_LED3       - x x - SPI_MOSI
+NC(old PUSH_RED)- x x - NC                      SCRN_LED3       - x x - SPI_MOSI
 FONA_RTS        - x x - FONA_RX                 SCRN_CS3        - x x - SPI_MISO
 FONA_RI         - x x - FONA_TX                 SCRN_CS2        - x x - SPI_CLK
 FONA_NS         - x x - FONA_PS                 SCRN_CS1        - x x - NC
@@ -39,7 +39,7 @@
 #define BUCK5           PC_2
 
 #define PUSH_GREEN      PC_13 
-#define PUSH_RED        PC_14
+#define PUSH_RED        
 
 #define DEADMAN         PC_3