Merge pull request #22 from akadamson/master

updated startup delay with slow flashing led
EvvGC · Nov 16, 2013 · d7097b1 · d7097b1
2 parents 2d9e3f5 + 1dceb89
commit d7097b1
Show file tree

Hide file tree

Showing 7 changed files with 2,930 additions and 2,914 deletions.
diff --git a/built-versions/0.4/STM32Gimbal.USB.bin b/built-versions/0.4/STM32Gimbal.USB.bin
diff --git a/built-versions/0.4/STM32Gimbal.bin b/built-versions/0.4/STM32Gimbal.bin
diff --git a/built-versions/0.4/STM32Gimbal.hex b/built-versions/0.4/STM32Gimbal.hex
diff --git a/built-versions/0.4/STM32Gimbal.zip b/built-versions/0.4/STM32Gimbal.zip
diff --git a/history.md b/history.md
@@ -216,8 +216,12 @@
     - added acc007 changes for debug/desk config of board when no IMU is present
     - updated attitude with paulphil changes for pitch greater than 45 degrees
     - updated rc pwm detect for futaba receievers
-    - Released 0.4.4
+    - Released 0.4.4 firmware
 
 20131115
     - added delay to startup to allow gimbal to settle
-    - Released 0.4.5
+    - Released 0.4.5 firmware
+
+20131116
+    - tweaking startup delay and added slow flashing LED
+    - Release 0.4.5.1 firmware
diff --git a/src/main.c b/src/main.c
@@ -15,7 +15,7 @@
 #include "hw_config.h"
 #include "stm32f10x_tim.h"
 
-#define SETTLE_PAUSE 20
+#define SETTLE_PAUSE 13
 
 static volatile int WatchDogCounter;
 static volatile int gotIMU = 0;
@@ -75,6 +75,8 @@ void setup(void)
         Delay_ms(100); //short blink
     }
 
+    LEDoff();
+
     if (GetVCPConnectMode() != eVCPConnectReset)
     {
         print("\r\nUSB startup delay...\r\n");
@@ -132,6 +134,7 @@ void setup(void)
 
         for (int i = 0; i < SETTLE_PAUSE; i++)
         {
+            LEDtoggle();
             Delay_ms(1000);
         }
 

diff --git a/src/main.h b/src/main.h
@@ -9,7 +9,7 @@
 #define MAIN_H_
 
 // software version number
-#define __EV_VERSION "0.4.5"
+#define __EV_VERSION "0.4.5.1"
 
 float GetIdlePerf(void);