From: Hans Åge Martinsen <hamartin@moshwire.com>
Date: Wed, 7 Sep 2011 17:51:53 +0000 (+0200)
Subject: Merge branch 'jstt_2'
X-Git-Url: https://git.defcon.no/?a=commitdiff_plain;h=a4f3be73805afbeb58e05054a1512aaceaa79573;hp=172c0e2289746bbaac25b4997ec8b93c5ca6e5b8;p=rctxduino

Merge branch 'jstt_2'
---

diff --git a/hardware/prototype_1/rf-adapter-stage.brd b/hardware/prototype_1/rf-adapter-stage.brd
index a6af9aa..c81586e 100644
Binary files a/hardware/prototype_1/rf-adapter-stage.brd and b/hardware/prototype_1/rf-adapter-stage.brd differ
diff --git a/hardware/prototype_1/rf-adapter-stage.sch b/hardware/prototype_1/rf-adapter-stage.sch
index fcfd087..0784793 100644
Binary files a/hardware/prototype_1/rf-adapter-stage.sch and b/hardware/prototype_1/rf-adapter-stage.sch differ
diff --git a/source/RCTXDuino/RCTXDuino.pde b/source/RCTXDuino/RCTXDuino.pde
index 0bc8562..d560fb4 100644
--- a/source/RCTXDuino/RCTXDuino.pde
+++ b/source/RCTXDuino/RCTXDuino.pde
@@ -224,15 +224,8 @@ void model_defaults( void )
 }
 
 // ---------- Arduino main loop -----------------------
-void loop () {
-  
-  // Determine if the UI needs to run...
-  boolean disp;
-  if ( millis() - last > UI_INTERVAL ) { 
-    last = millis(); 
-    disp = true; 
-  }
-  else disp = false;
+void loop ()
+{  
 
   process_inputs();
 
@@ -243,10 +236,13 @@ void loop () {
     displaystate = BATTERY;
   }
 
-  if ( disp )
-  {
+  if ( millis() - last > UI_INTERVAL ) 
+  { 
+    last = millis(); 
     ui_handler(); 
   }
+  
+
   if ( displaystate != MENU )
   {
     // Debugging: how long does the main loop take on avg,