Diff: main.cpp

Revision:

4:dfd10f43cc8b

Parent:

3:b164662f9740

Child:

11:005a50dd7db5

Child:

12:f753bc59c2e8

--- a/main.cpp	Wed May 10 18:45:51 2017 +0000
+++ b/main.cpp	Fri May 12 20:19:56 2017 +0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
-This software is especially designed for Solarboat Twente for the use in their solarboat v1.0
+This software is especially designed for Solarboat Twente for the use in their Solarboat v1.0
 
 Written by:
 Niels Leijen, Jesse van Rhijn, Bram Seinhorst
@@ -7,7 +7,7 @@
 Thanks to:
 Jasper Admiraal, Hidde Pik (hihihihi), Lisa Postma, Heleen Jeurink, Ruben Peters,
 Martijn Groot Jebbink, Martijn Wilpshaar, Bram Seinhorst, Robert Geels, Arnoud Meutstege,
-Jeroen te Braake, Ids de Vos, Jesse van Rhijn, Sam Benou and Niels Leijen
+Jeroen te Braake, Ids de Vos, Jesse van Rhijn, Sam Benou, Niels Leijen and Mark Bruijn
 
 DISCLAIMER:
 THIS SOFTWARE IS SUPPLIED "AS IS" WITHOUT ANY WARRANTIES AND SUPPORT. 
@@ -18,7 +18,7 @@
 #define DEBUG
 
 //include 3rd party libraries
-#include "mbed.h"
+#include "mbed.h" //needs to be revision 136 else SD filesystem will not work
 #include "rtos.h"
 
 // include Solarboat libraries
@@ -32,7 +32,6 @@
 
 // initialize canbus
 CAN can(CAN_RD, CAN_TD);
-DigitalOut canEnable(CAN_ENABLE);
 
 // initialze onboard leds
 DigitalOut ledError(LED3);
@@ -41,100 +40,21 @@
 DigitalOut ledFona(LED5);
 DigitalOut led24V(LED4);
 
-// initialeze buck converters
-DigitalOut buckCan(BUCK2);
-DigitalOut buckXSens(BUCK3);
-DigitalOut buckScreen(BUCK4);
-DigitalOut buck24V(BUCK5);
-
-// global variables
-// Thread 1
-//static bool goSleep = true;
-
-
-
-
-/*
-// Thread 1 - Power - Functions
-void greenButtonPressed(){
-#ifdef DEBUG
-    printf("green button pressed\r\n ");
-#endif
-
-}
-    if(goSleep){
-#ifdef DEBUG
-        printf("waking up\n");
-#endif
+//DigitalOut buckCan(BUCK2);
+//DigitalOut buckXSens(BUCK3);
+//DigitalOut buckScreen(BUCK4);
+//DigitalOut buck24V(BUCK5);
 
-        goSleep = false;
-        
-        canEnable = 1;
-        buckCan = 1;
-        wait_ms(200);
-        can.write(CANMessage(0x033, "1"));
-        ledRelay = 1;
-        wait_ms(300);
-        buckXSens = 1;
-        buckScreen = 1;
-        buck24V = 1;
-        led24V = 1;
-
-#ifdef DEBUG
-        printf("fully awake\n");
-#endif
-    }
-}
-   
-void redButtonPressed(){
-#ifdef DEBUG
-    printf("red button pressed\r\n ");
-#endif
-#ifdef DEBUG
-    printf("going to sleep\n");
-#endif
-    
-    goSleep = true;
-    can.write(CANMessage(0x033, "0"));
-    
-    ledRelay = 0;
-    wait_ms(200);
-    buckXSens = 0;
-    buckScreen = 0;
-    buck24V = 0;
-    led24V = 0;
-    wait_ms(300);
-    canEnable = 0;
-    buckCan = 0;
-    
-#ifdef DEBUG
-    printf("entering sleep mode\n");
-#endif
-    
-    //sleep();
-}
-*/
 
 // Thread 1 - Power
 void power(){
+    PowerControl powercontrol(PUSH_GREEN); 
+    
 #ifdef DEBUG
-    pc.printf("Thread 1 - Power start\r\n ");
+    pc.printf("Thread 1 - Power started\r\n ");
 #endif
 
-    PowerControl powercontrol(PUSH_GREEN, PUSH_RED); 
-#ifdef DEBUG
-    pc.printf("Thread 1 - started\r\n ");
-#endif
-    
-    //sleep();
-    
-    while(1){
-        //if(!goSleep){
-          //  can.write(CANMessage(0x033, "1"));
-        //}
-        ledError = !ledError;
-        Thread::wait(1000);
-    }
+    Thread::wait(osWaitForever);
 }