Merge branch 'next' into camera_stabilization

HISTORY.txt

@@ -1,26 +1,26 @@
-Short summary of changes.  For a complete list see the git log.
+Short summary of changes.  For a complete list see the git log.
-
+
-2011-07-29
+2011-07-29
-Added support for PPM receivers from James W. Now all 4 interfaces (R/C
+Added support for PPM receivers from James W. Now all 4 interfaces (R/C
-standard PWM, combined PPM (MK), Spektrum satellite, Futaba S.Bus) are
+standard PWM, combined PPM (MK), Spektrum satellite, Futaba S.Bus) are
-supported and configurable through the GCS hardware configuration tab.
+supported and configurable through the GCS hardware configuration tab.
-
+
-2011-07-17
+2011-07-17
-Updated module initialization from Mathieu which separates the initialization
+Updated module initialization from Mathieu which separates the initialization
-from the task startup.  Also implements a method to reclaim unused ram from
+from the task startup.  Also implements a method to reclaim unused ram from
-initialization and end of memory for the FreeRTOS heap.
+initialization and end of memory for the FreeRTOS heap.
-
+
-2011-07-12
+2011-07-12
-Improvements to the stabilization code.  Included a LPF on the gyros to smooth
+Improvements to the stabilization code.  Included a LPF on the gyros to smooth
-out noise in high vibration environments.  Also two new modes: axis-lock and
+out noise in high vibration environments.  Also two new modes: axis-lock and
-weak leveling.  Axis-lock will try and hold an axis at a fixed position and
+weak leveling.  Axis-lock will try and hold an axis at a fixed position and
-reject any disturbances.  This is like heading-hold on a heli for the tail but
+reject any disturbances.  This is like heading-hold on a heli for the tail but
-can be useful for other axes.  Weak leveling is rate mode with a weak
+can be useful for other axes.  Weak leveling is rate mode with a weak
-correction to self level the craft - good for easier rate mode flying.
+correction to self level the craft - good for easier rate mode flying.
-
+
-2011-07-07
+2011-07-07
-Dynamic hardware configuration from Stac.  The input type is now
+Dynamic hardware configuration from Stac.  The input type is now
-selected from ManualControlSettings.InputMode and the aircraft must be rebooted
+selected from ManualControlSettings.InputMode and the aircraft must be rebooted
-after changing this.  Also for CopterControl the HwSettings object must
+after changing this.  Also for CopterControl the HwSettings object must
-indicate which modules are connected to which ports.  PPM currently not
+indicate which modules are connected to which ports.  PPM currently not
-working.
+working.

package/osx/package

@@ -20,7 +20,8 @@ device=$(hdiutil attach  "${TEMP_FILE}" | \
 
 # packaging goes here
 cp -r "${APP_PATH}" "/Volumes/${VOL_NAME}"
-cp -r "${FW_DIR}" "/Volumes/${VOL_NAME}/firmware"
+#cp -r "${FW_DIR}" "/Volumes/${VOL_NAME}/firmware"
+cp "${FW_DIR}/fw_coptercontrol-${PACKAGE_LBL}.opfw" "/Volumes/${VOL_NAME}/firmware"
 
 "${ROOT_DIR}/package/osx/libraries" \
 	"/Volumes/${VOL_NAME}/OpenPilot GCS.app" || exit 1

package/winx86/openpilotgcs.nsi

@@ -33,6 +33,7 @@
 ; Paths
 
   ; Tree root locations (relative to this script location)
+  !define PROJECT_ROOT   "..\.."
   !define NSIS_DATA_TREE "."
   !define GCS_BUILD_TREE "..\..\build\ground\openpilotgcs"
 
@@ -151,6 +152,8 @@ Section "Core files" InSecCore
   SectionIn RO
   SetOutPath "$INSTDIR\bin"
   File /r "${GCS_BUILD_TREE}\bin\*"
+  SetOutPath "$INSTDIR"
+  File "${PROJECT_ROOT}\HISTORY.txt"
 SectionEnd
 
 Section "Plugins" InSecPlugins
@@ -185,8 +188,10 @@ Section "Localization" InSecLocalization
 SectionEnd
 
 Section "Firmware" InSecFirmware
-  SetOutPath "$INSTDIR\firmware\${FIRMWARE_DIR}"
+; SetOutPath "$INSTDIR\firmware\${FIRMWARE_DIR}"
-  File /r "${PACKAGE_DIR}\${FIRMWARE_DIR}\*"
+; File /r "${PACKAGE_DIR}\${FIRMWARE_DIR}\*"
+  SetOutPath "$INSTDIR\firmware"
+  File /r "${PACKAGE_DIR}\${FIRMWARE_DIR}\fw_coptercontrol-${PACKAGE_LBL}.opfw"
 SectionEnd
 
 Section "Shortcuts" InSecShortcuts
@@ -195,6 +200,14 @@ Section "Shortcuts" InSecShortcuts
   CreateDirectory "$SMPROGRAMS\OpenPilot"
   CreateShortCut "$SMPROGRAMS\OpenPilot\OpenPilot GCS.lnk" "$INSTDIR\bin\openpilotgcs.exe" \
 	"" "$INSTDIR\bin\openpilotgcs.exe" 0 "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}. ${BUILD_DESCRIPTION}"
+  CreateShortCut "$SMPROGRAMS\OpenPilot\OpenPilot ChangeLog.lnk" "$INSTDIR\HISTORY.txt" \
+	"" "$INSTDIR\bin\openpilotgcs.exe" 0
+  CreateShortCut "$SMPROGRAMS\OpenPilot\OpenPilot Website.lnk" "http://www.openpilot.org" \
+	"" "$INSTDIR\bin\openpilotgcs.exe" 0
+  CreateShortCut "$SMPROGRAMS\OpenPilot\OpenPilot Wiki.lnk" "http://wiki.openpilot.org" \
+	"" "$INSTDIR\bin\openpilotgcs.exe" 0
+  CreateShortCut "$SMPROGRAMS\OpenPilot\OpenPilot Forums.lnk" "http://forums.openpilot.org" \
+	"" "$INSTDIR\bin\openpilotgcs.exe" 0
   CreateShortCut "$DESKTOP\OpenPilot GCS.lnk" "$INSTDIR\bin\openpilotgcs.exe" \
   	"" "$INSTDIR\bin\openpilotgcs.exe" 0 "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}. ${BUILD_DESCRIPTION}"
   CreateShortCut "$SMPROGRAMS\OpenPilot\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
@@ -245,6 +258,7 @@ Section "un.OpenPilot GCS" UnSecProgram
   RMDir /r /rebootok "$INSTDIR\lib"
   RMDir /r /rebootok "$INSTDIR\share"
   RMDir /r /rebootok "$INSTDIR\firmware"
+  Delete /rebootok "$INSTDIR\HISTORY.txt"
   Delete /rebootok "$INSTDIR\Uninstall.exe"
 
   ; Remove directory