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 20:96420597a848, committed 2017-05-22

Comitter:
kwasymodo
Date:
Mon May 22 07:45:28 2017 +0000
Parent:
12:f753bc59c2e8
Commit message:
v1_2;

Changed in this revision

CanControl.lib Show annotated file Show diff for this revision Revisions of this file
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/CanControl.lib	Sun May 21 22:05:25 2017 +0000
+++ b/CanControl.lib	Mon May 22 07:45:28 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/kwasymodo/code/CanControl/#25258579a80d
+https://developer.mbed.org/users/kwasymodo/code/CanControl/#d7776fa70ef5

--- a/PowerControl.lib	Sun May 21 22:05:25 2017 +0000
+++ b/PowerControl.lib	Mon May 22 07:45:28 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/kwasymodo/code/PowerControl/#1e3291e8294d
+https://developer.mbed.org/users/kwasymodo/code/PowerControl/#54792b95c570

--- a/main.cpp	Sun May 21 22:05:25 2017 +0000
+++ b/main.cpp	Mon May 22 07:45:28 2017 +0000
@@ -35,15 +35,11 @@
 
 // initialze onboard leds
 DigitalOut ledError(LED3);
-DigitalOut ledRelay(LED2);
 DigitalOut ledSD(LED1);
 DigitalOut ledFona(LED5);
 DigitalOut led24V(LED4);
 
 //DigitalOut buckCan(BUCK2);
-//DigitalOut buckXSens(BUCK3);
-//DigitalOut buckScreen(BUCK4);
-//DigitalOut buck24V(BUCK5);
 DigitalOut buckXSens(BUCK3);
 DigitalOut buckScreen(BUCK4);
 DigitalOut buck24V(BUCK5);
@@ -91,7 +87,6 @@
     //Thread thread2;
     //Thread thread3;
     //Thread thread4;
-    //Thread thread5;
     Thread threadx;
     
     // change thread priority
@@ -102,7 +97,6 @@
     //thread2.start(&calcPi);
     //thread3.start(&motorTest);
     //thread4.start(&canReceive);
-    //thread5.start(&relaisOn);
     threadx.start(&test);
     
     //stop this thread while keeping the other threads running
@@ -113,4 +107,4 @@
         } 
     }
     Thread::wait(osWaitForever);
-}
+}
\ No newline at end of file

--- a/pinout.h	Sun May 21 22:05:25 2017 +0000
+++ b/pinout.h	Mon May 22 07:45:28 2017 +0000
@@ -67,8 +67,8 @@
 #define FONA_RX         PA_0
 #define FONA_TX         PA_1
 
-#define FONA_RTS        PC_15
-#define FONA_RI         PH_0       
+#define FONA_RTS        PH_0
+#define FONA_RI         
 #define FONA_NS         PH_1
 #define FONA_PS         PA_4
 #define FONA_KEY        PB_7
@@ -99,15 +99,16 @@
 #define SCRN_CS2        PB_5
 #define SCRN_CS3        PB_4
 
-#define SCRN_RSTD       PB_12
-#define SCRN_DC         PA_10
+#define SCRN_RSTD       PC_0
+#define SCRN_DC         PC_4
 
 
 // Steering wheel
-#define STEER_THROTTLE  PC_5
-#define STEER_FLY       PC_4
-#define STEER_REV       PA_12
-#define STEER_MENU      PA_11
+#define STEER_THROTTLE  PB_12
+
+#define STEER_SW1       PC_5
+#define STEER_SW2       PA_12
+#define STEER_SW3       PA_11
 
 
 // Others