just some boring credits

git-svn-id: http://multiwii.googlecode.com/svn/trunk/MultiWii_shared@721 02679b44-d973-9852-f2fa-63770883b36c
santosha2003 · Apr 25, 2012 · 711e688 · 711e688
1 parent 37eef23
commit 711e688
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 20 deletions.
diff --git a/CREDITS.txt b/CREDITS.txt
@@ -32,6 +32,14 @@ N: Luis Correia
 E:
 W: http://www.multiwii.com/forum/viewtopic.php?f=18&t=828
 
+S: Configuration Menu over LCD
+D: Use of attached LCD (serial,i2c) via cable or BT to tune parameters
+N: Alex
+N: ??? editing via TX-Sticks
+N: Hamburger (auxN settings, multiline/fullscreen, VT100 type)
+E:
+W:
+
 S: Eagle Tree Power Panel
 D:
 N: Danal
@@ -51,6 +59,13 @@ N: Jevermeister (Nils Ivo von Aswege)
 E:
 W:
 
+S: Flying Wing model
+D: support for model with 1 motor and 2 servos for 2 combined control surfaces (aileron+elevator)
+N: Alex (initial layout)
+N: Hamburger
+E:
+W:
+
 S: Global Buzzer Handling (buzzer.pde)
 D:
 N: Jevermeister (Nils Ivo von Aswege)
@@ -76,7 +91,7 @@ E:
 W:
 
 S: i2c OLED  128x64 display
-D:
+D: support for OLED as alternatative to LCD
 N: howardbb
 E: howard@automatrix.co.za
 W:
@@ -135,8 +150,7 @@ S: Inflight ACC Calibration
 D:
 N: Jevermeister (Nils Ivo von Aswege)
 E:
-W:http://ncopters.blogspot.com
-
+W: http://ncopters.blogspot.com
 
 S: OpenLRS Designed by Melih Karakelle on 2010-2012 
 D: Version Number     : 1.11
@@ -162,9 +176,9 @@ N: MIS
 E:
 W:
 
-S: powermeter
+S: Powermeter
 D: estimate consumed power either in software only or with hardware current sensor
-N: hamburger
+N: Hamburger
 E:
 W: http://www.multiwii.com/forum/viewtopic.php?f=8&t=167
 
@@ -199,9 +213,16 @@ N: Danal
 E:
 W:
 
+S: Telemetry over LCD/OLED serial/i2c
+D: 
+N: Hamburger
+E:
+W:
+
 S: Textstar LCD
-D: initial support
-N: Luca Brizzi aka gtrick90 @ RCG
+D: support for LCD 2x16 from Cat's Whisker
+N: Luca Brizzi aka gtrick90 @ RCG for initial support
+N: Hamburger (bargraph)
 E:
 W:
 

diff --git a/def.h b/def.h
@@ -111,18 +111,14 @@
     #define LEDPIN_OFF                 PORTD &= ~(1<<5);
     #define LEDPIN_ON                  PORTD |= (1<<5);
   #endif
-  #if defined(D8BUZZER)
-    #define BUZZERPIN_PINMODE          pinMode (8, OUTPUT);
-    #define BUZZERPIN_ON               PORTB |= 1<<4;
-    #define BUZZERPIN_OFF              PORTB &= ~(1<<4); 
-  #elif defined(A32U4ALLPINS)
-    #define BUZZERPIN_PINMODE          pinMode (4, OUTPUT);
-    #define BUZZERPIN_ON               PORTD |= 1<<4;
-    #define BUZZERPIN_OFF              PORTD &= ~(1<<4);    
-  #else
+  #if !defined(D8BUZZER) && !defined(A32U4ALLPINS)
     #define BUZZERPIN_PINMODE          pinMode (1, OUTPUT);
     #define BUZZERPIN_ON               PORTD |= 1<<3;
-    #define BUZZERPIN_OFF              PORTD &= ~(1<<3); 
+    #define BUZZERPIN_OFF              PORTD &= ~(1<<3);
+  #else
+    #define BUZZERPIN_PINMODE          pinMode (8, OUTPUT);
+    #define BUZZERPIN_ON               PORTB |= 1<<4;
+    #define BUZZERPIN_OFF              PORTB &= ~(1<<4);  
   #endif
   #define POWERPIN_PINMODE           //
   #define POWERPIN_ON                //
@@ -191,9 +187,9 @@
     #define AUX1PIN                    7
   #else
     #define ROLLPIN                    7
-    #define PITCHPIN                   6
-    #define YAWPIN                     4
-    #define AUX1PIN                    5 
+    #define PITCHPIN                   4
+    #define YAWPIN                     6
+    #define AUX1PIN                    5   
   #endif
   #define AUX2PIN                    0 
   #define AUX3PIN                    1 // unused