Diff: main.cpp

Branch:

Metric

Revision:

126:e0d039096891

Parent:

125:f58b7ab2abee

Parent:

79:68f0dd8d1f19

Child:

127:27c739fd6d71

--- a/main.cpp	Sun Jul 21 11:08:38 2013 +0000
+++ b/main.cpp	Sun Jul 21 11:23:57 2013 +0000
@@ -51,12 +51,20 @@
 PwmOut dled(p23);
 Beep spkr(p21);
 
+<<<<<<< local
 bool debugMode = false;
 bool usbEn = false;
 bool logEn = true;
 bool logOpen = false; 
 bool yesBattLog = true; // gg - Batt Log
 unsigned char tNavRow = 3; // gg - 4x4 touch
+=======
+// revision string, max 6 characters
+// gg - revStr is used in 2 places
+// gg - and is easy to edit here
+// gg - added ZeroSecTick and revStr
+char revStr[7] = "79";
+>>>>>>> other
 
 FILE *hfile; // history file
 FIL efile; // external usb file
@@ -205,10 +213,17 @@
 
     // Read config file
     readConfig();
+<<<<<<< local
     if (repeatPoll) { // enable autopolling if enabled
         autoPoll.attach(&autoPollISR,pollInt);
     }
     
+=======
+
+    // Start 15ms timer for requests
+    //msgReq.attach(&sendReq,0.015);
+
+>>>>>>> other
     // Start monitors
     can1.monitor(true); // set to snoop mode
     can2.monitor(true); // set to snoop mode
@@ -424,7 +439,11 @@
                                 } else if (dMode[whichTouched]==cpBarScreen) { // gg - cpbars
                                     reqMsgCnt=0;
                                     msgReq.attach(&sendReq,0.015);
+<<<<<<< local
                                 } else if (dMode[whichTouched]==configScreen) {
+=======
+                                } else if (dMode[whichTouched]==config1Screen) {
+>>>>>>> other
                                     mbed_reset();
                                 } else if (dMode[whichTouched]==playbackScreen) { // pause/unpause
                                     playbackEn=!playbackEn;