Revision 3:68cabac00547, committed 2016-05-05

Comitter:

Reniboy

Date:

Thu May 05 14:29:39 2016 +0000

Parent:

2:31c5c3b46742

Commit message:

Parking sensor

Changed in this revision

diff -r 31c5c3b46742 -r 68cabac00547 main.cpp
--- a/main.cpp	Thu May 05 14:17:42 2016 +0000
+++ b/main.cpp	Thu May 05 14:29:39 2016 +0000
@@ -732,13 +732,3 @@
 {
     g_timer_flag = 1; /** @Brief Set flag in ISR **/
 }
-void timer2_isr()
-{
-    g_timer2_flag = 1; /** @Brief set flag 2 in ISR **/
-}
-
-void timer1_isr()
-{
-
-    g_timer1_flag = 1;
-}
\ No newline at end of file

diff -r 31c5c3b46742 -r 68cabac00547 main.h
--- a/main.h	Thu May 05 14:17:42 2016 +0000
+++ b/main.h	Thu May 05 14:29:39 2016 +0000
@@ -72,17 +72,10 @@
 void init_serial();  //*!< function to activate onboard switches and LEDs */
 void timer_isr();
 volatile int g_timer_flag = 0; /** @Brief G flag makes things easier to distinguish as this is a global variable **/
-volatile int g_timer2_flag = 0;
-volatile int g_sw3_flag = 0;
-volatile int g_sw2_flag = 0;
-volatile int g_timer1_flag = 0;
-void sw2_isr();
-void sw3_isr();
-
-
-
-
-
+volatile int g_sw3_flag = 0; //*!< Flag used in interrupt for button 3 */
+volatile int g_sw2_flag = 0; //*!< Flag used in interrupt for button 2 */
+void sw2_isr(); //*!< Interrupt Service Routine for button 2 */
+void sw3_isr(); //*!< Flag used in interrupt for button 3 */
 void delete_file(char filename[]); // Function to call for deletion of file.
 
 /** Misc **/