From: Jon Langseth <jon.langseth@lilug.no>
Date: Wed, 7 Sep 2011 19:49:13 +0000 (+0200)
Subject: Changes to debugging, battery alarm, ppm timing:
X-Git-Url: https://git.defcon.no/?a=commitdiff_plain;h=9553d62397f79611e4d4f96cf9f224e4193038e3;p=rctxduino

Changes to debugging, battery alarm, ppm timing:

* Added a #define DEBUG statement, and a bunch of #ifdef/#else/#endif that includes or excludes debugging code depending on this #define
* Added BATTERY_CRITICAL, and changed the way BATTERY_LOW was handled. We now have two states of "severity" on the battery
* Set the debugging-value of BATTERY_CRITICAL to 0, to be able to debug without a battery connected :P
* Changed PPM timings again, had problems with some RF recievers. Tested OK with: fmsusb2, Graupner RX700, Corona RS810II, Corona RP8D1.
---

diff --git a/source/RCTXDuino/RCTXDuino.pde b/source/RCTXDuino/RCTXDuino.pde
index d560fb4..ebe62ad 100644
--- a/source/RCTXDuino/RCTXDuino.pde
+++ b/source/RCTXDuino/RCTXDuino.pde
@@ -2,6 +2,11 @@
 #include <TimerOne.h>
 #include <EEPROM.h>
 
+// Undefine this whenever a "release" or "flight-test" build is made.
+// Defining DEBUG sets some crazy values for things like battery warning,
+// and includes a whole bunch of debugging-related code ...
+#define DEBUG 1
+
 #define MAX_INPUTS 8
 
 // Update this _every_ time a change in datastructures that
@@ -83,10 +88,10 @@ volatile bool do_channel = true;        // Is next operation a channel or a sepa
 // The timing here (and/or in the ISR) needs to be tweaked to provide valid
 // RC PPM signals accepted by standard RC RX'es and the Microcopter...
 
-#define framelength  21500		// Max length of frame
-#define seplength      250		// Lenght of a channel separator
+#define framelength  21000		// Max length of frame
+#define seplength      300		// Lenght of a channel separator
 #define chmax         1600		// Max lenght of channel pulse
-#define chmin          480		// Min length of channel
+#define chmin          495		// Min length of channel
 #define chwidht  (chmax - chmin)// Useable time of channel pulse
 
 // ----------------- Menu/IU related stuffs --------------------
@@ -105,7 +110,15 @@ volatile bool do_channel = true;        // Is next operation a channel or a sepa
 
 // Voltage sense pin is connected to a 1/3'd voltage divider.
 #define BATTERY_CONV (10 * 3 * (5.0f/1024.0f))
+
+#ifdef DEBUG
+// The following values are for DEBUGGING ONLY!!
 #define BATTERY_LOW 92
+#define BATTERY_CRITICAL 0
+#else
+#define BATTERY_LOW 92
+#define BATTERY_CRITICAL 92
+#endif
 
 enum {
   VALUES,
@@ -121,7 +134,7 @@ enum {
   INVERTS,
   DUALRATES,
   EXPOS, // Some radios have "drawn curves", i.e. loopup tables stored in external EEPROM ...
-  DEBUG,
+  DEBUG_DUMP,
   SAVE
 } 
 menu_mainstate;
@@ -145,11 +158,12 @@ struct clock_timer_t
 	boolean running;
 } clock_timer;
 
+#ifdef DEBUG
 // -----------------  DEBUG-STUFF --------------------
 unsigned long prev_loop_time;
 unsigned long avg_loop_time;
 unsigned long t;
-
+#endif
 
 // ---------- CODE! -----------------------------------
 
@@ -183,11 +197,12 @@ void setup(){
   if ( !keys[KEY_UP])
     calibrate();
   
+#ifdef DEBUG
   // Debugging: how long does the main loop take on avg...  
   t = micros();
   avg_loop_time = t;
   prev_loop_time = t;    
-
+#endif
   
   // Initializing the stopwatch timer/clock values...
   clock_timer = (clock_timer_t){0, 0, 0, false};
@@ -233,6 +248,8 @@ void loop ()
   battery_val = analogRead(1) * BATTERY_CONV;
   if ( battery_val < BATTERY_LOW ) {
     digitalWrite(13, 1); // Simulate alarm :P
+  }
+  if ( battery_val < BATTERY_CRITICAL ) {
     displaystate = BATTERY;
   }
 
@@ -242,7 +259,7 @@ void loop ()
     ui_handler(); 
   }
   
-
+#ifdef DEBUG
   if ( displaystate != MENU )
   {
     // Debugging: how long does the main loop take on avg,
@@ -251,6 +268,7 @@ void loop ()
     avg_loop_time = ( t - prev_loop_time + avg_loop_time ) / 2;
     prev_loop_time = t;    
   }
+#endif
 
   // Whoa! Slow down partner! Let everything settle down before proceeding.
   delay(5);
@@ -427,7 +445,9 @@ void read_model_settings(unsigned char mod_no)
   for (i = 0; i < sizeof(model_t); i++)
 		*p++ = EEPROM.read( model_address++ );
 
+#ifdef DEBUG
   serial_dump_model();
+#endif
 
   lcd.setCursor(0 , 1);
   lcd.print("... Loaded.");
@@ -472,6 +492,7 @@ void write_model_settings(unsigned char mod_no)
   delay(200);    
 }
 
+#ifdef DEBUG
 void serial_dump_model ( void )
 {
   int i;
@@ -532,6 +553,7 @@ void serial_dump_model ( void )
     Serial.println();
   }  
 }
+#endif
 
 void scan_keys ( void )
 {
@@ -674,6 +696,7 @@ void ISR_timer(void)
   }
 }
 
+#ifdef DEBUG
 void serial_debug()
 {
   int current_input;
@@ -699,6 +722,7 @@ void serial_debug()
 
   Serial.println();
 }
+#endif
 
 void dr_inputselect( int no, int in )
 {
@@ -1017,13 +1041,22 @@ void ui_handler()
             menu_mainstate = DUALRATES; 
             return; 
           }          
+#ifdef DEBUG          
           if ( check_key(KEY_DOWN ) ) {
-            menu_mainstate = DEBUG;
+            menu_mainstate = DEBUG_DUMP;
             return;
           }
+#else
+          if ( check_key(KEY_DOWN ) ) {
+            menu_mainstate = TOP;
+            return;
+          }
+
+#endif
           break;
-          
-        case DEBUG:
+
+#ifdef DEBUG          
+        case DEBUG_DUMP:
           lcd.setCursor(0 , 0);
           lcd.print("Dumping debug to");
           lcd.setCursor(0 , 1);
@@ -1038,7 +1071,7 @@ void ui_handler()
             return;
           }
           break;
-    
+#endif    
         default:
           lcd.print("Not implemented");
           lcd.setCursor(0 , 1);