paul Jewell
6b6461c8b4
Replaced OPENPILOT_IS_COOL by TOP_LEVEL_MAKEFILE
2015-07-15 08:06:21 +01:00
abeck70
88494e2745
OP-1696 PathFollower rewrite in C++ and Landing Squashed commit of the following:
...
commit 580cd8addafadc3109b90b1fd183130ea8add7f2
Author: abeck70 <abeck70@icloud.com>
Date: Fri Mar 20 21:32:33 2015 +1100
OP-1696 Cleanup and bug fix
1. Code review cleanup
2. Fixed gps assist braking - the thrust limits in piddown were not being set.
commit 31ac4494f6e2bc5859f49d1f76f19fe3a4d32862
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 18 08:31:16 2015 +1100
OP-1696 fix initialisation of down pid control parameters
commit a7bd737459249530bde9546b8247dd45b40dced4
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 21:18:38 2015 +1100
OP-1769 Actuator fix from code review
commit 968172b8fb46c91b2611be4825e17faf2fa13411
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 21:01:11 2015 +1100
OP-1696 fixed ground pathfollower settings xml
commit 721c07b67a87911ed67d0b62aa658cfac6d3eb97
Merge: f556215 be9f4ae
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 20:52:01 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit f556215ddbd5a29b22c2e6124372d74a0d6b9a0f
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 20:51:22 2015 +1100
OP-1696 ground pathfollower fixes
commit 4584b22d6a2d33d3efb1cd11ac46804a5623a236
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 18:11:52 2015 +1100
OP-1696 Ground redesign
1. Move to new PID loop design
2. Prototype steering control
commit b70c3373646fa758ae30a59765b8a56df7d2fbeb
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 15 18:42:06 2015 +1100
OP-1696 ground pathfollower added missing call to update velocity state
commit a282bfb14dffcd486466b60be3100d26c11649ef
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 15 17:22:02 2015 +1100
OP-1696 ground pathfollower improvements
commit f56ea4f9b101415e32e4464e51e087ee350be969
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 15 07:44:01 2015 +1100
OP-1696 remove unused PID controller in ground for vertical
commit 6424aa0a84c3718a5a7b51fab1c9e04587d325b8
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 21:40:58 2015 +1100
OP-1696 Initialise vtolemergencyfallback variables
commit 5d6110499bb06fe9b397e09dea5aafe994f03d13
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 21:30:21 2015 +1100
OP-1696 vtolflycontroller segv fixed and uncrustify
commit bef23ea3dc2b5aff5b9b8713802586719b8f68cf
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 20:50:05 2015 +1100
OP-1783 PathPlanner
Instead of config alarm if no pathplan, simply continue to alarm pathplan, but allow normal arming and flight in other modes. If pathplan enabled, simply enter position hold.
commit 370f1747209cca7c01c071a43224ad83b04bdd55
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 20:48:22 2015 +1100
OP-1769 Ground code review comment
1. Remove idx1 < 0 check not needed
2. Should return abs_input in the corner case that curve is "invalid".
commit 01973c656d783e035ad823c267d3387bf473eebe
Merge: be07d12 5c9b6fa
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 12:17:31 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit be07d125f42b5ca1aabce0f5c0fcf592e8cddf98
Merge: 44afdc7 ad44b31
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 21:55:52 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 44afdc77987049dc58cdf42e3be88b7eae38de02
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 19:35:55 2015 +1100
OP-1696 fix startup
Fix initialisation and void use of pios_malloc at startup
commit 962f5f75756883cec6726c0347310d60264f6989
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 18:48:04 2015 +1100
OP-1696 undo changes to make file
commit 7fa71d5c614d492cb4026312672068f92a4bcd3e
Merge: 672732e 5a9cfa6
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 18:06:59 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 672732e95d555946300ef5093f687f3fa88bfd3a
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 11 12:59:44 2015 +1100
OP-1696 code review comments
commit 73b295d6515f2489b3b3a61459c975b0c37afe3d
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 11 12:47:24 2015 +1100
OP-1696 code review comments
commit 524b72f537fe922bf3c4385b418872f13819a5cf
Merge: 6beef01 ba5f395
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 10 23:19:06 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 6beef01476d06598652a10de4857e6ae55015417
Merge: 100cf33 8c31f96
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 7 16:50:32 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 100cf335d187fe696d3678371b194fc3044a1c7e
Author: Alex Beck <abeck70@icloud.com>
Date: Thu Mar 5 22:32:30 2015 +1100
OP-1696 simposix c++ compilation fix
commit 9ebf846d1ec8fef30ffc1204546fc5dc648ec10b
Author: Alex Beck <abeck70@icloud.com>
Date: Thu Mar 5 21:35:39 2015 +1100
OP-1696 fix simposix c++ compile of pathfollower
commit a86b4b1db46dba569739587ee57b03460381ebab
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 5 18:03:51 2015 +1100
OP-1696 resolve linux build issue
commit 1d7695f81293534bc17f69b0fcd9de3876867f6a
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 18:10:09 2015 +1100
OP-1696 Return to Base & Land implemented
Enabled via FlightModeSettings ReturnToBaseNextCommand = LAND
commit 4e5ca807b18a40ea60c05c1b46f738462595a6b2
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 16:38:06 2015 +1100
OP-1696 reduce memory footprint by only allocating controllers required for a particular frame type
commit 78e8f559cd25ffaeac68b563e25d1ad357205fd6
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 13:51:05 2015 +1100
OP-1696 move fsm initialisation to controller implementations
commit 848c78a84e5c7e11b2da953c9d9549b11fc5b1d8
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 13:27:11 2015 +1100
OP-1696 reduce memory through re-use of pointers to data objects in base class.
commit bc8794601142055942910ba9f938c03c8a3ca547
Merge: 24bc3de 843325d
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 3 22:06:01 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 24bc3de6155a74850b17ca7706f6b592923e027c
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 3 17:56:12 2015 +1100
OP-1696 update gcs path planner options to align to new modes
commit dc659891882ea0624a6436550425c54b347f4101
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 3 13:51:55 2015 +1100
OP-1696 pathfollower class renaming and uncrustify
commit af19d114b8e0ff23159bdaca37e5f5bf1c1f8beb
Merge: b07c1fd 04f4cd9
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 21:47:12 2015 +1100
Merge branch 'rel-15.02' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit b07c1fdd0544a555678bc7a8510cd92861f17e46
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 21:27:27 2015 +1100
OP-1696 remainder of changes to integrate drive and fly objectives
commit c824c53cf30889a468ecb25ae3d705fa011b23ba
Merge: b89751c 1102243
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 17:06:13 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit b89751caa5d6dc06e1e20391aa4e12b5484056d4
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 17:04:27 2015 +1100
OP-1696 merge fly and drive pathdesired/action objectives
commit c463132cb7da5cdf9fc5395ae0650b081bc9fb55
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 1 10:25:29 2015 +1100
OP-1696 merge ground pathfollower and refactored into C++
commit 6ed504b32f9e502e4f02d50b9e85ba91591417ba
Merge: bcf245e deafed6
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 27 18:12:32 2015 +1100
Merge branch 'next' into corvuscorax/OP-1642_tank-support
Conflicts:
flight/modules/PathFollower/pathfollower.c
shared/uavobjectdefinition/vtolpathfollowersettings.xml
commit bcf245e08c3348f2e6e5eddceee6d6cc268bdc23
Author: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat Dec 6 19:45:29 2014 +0100
OP-1642 added new uavobject to discovery target, too
commit 6b9e8a7d7dad0739b4ffd2ce7f2f78ed4f597077
Author: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat Dec 6 17:58:18 2014 +0100
OP-1642 added very simple path control for ground vehicles
commit e8d8440e049c06158e7fc542627fac6420abaf65
Author: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat Dec 6 17:17:09 2014 +0100
OP-1642 added new settings uavobject for tank path follower
commit 71dd726eb5b52614b417236c22e8a5cc3a487faf
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 27 18:05:10 2015 +1100
OP-1696 align pathaction to pathdesired
commit 8a88af83be457aafbb63e4f94fad3b1cd54264ca
Author: abeck70 <abeck70@icloud.com>
Date: Thu Feb 26 08:06:34 2015 +1100
OP-1696 fixed wing control refactored and compiling
commit fd9850b5e5680f5b422dbc468a94c5ec4b6dd518
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 25 17:47:19 2015 +1100
OP-1696 Removed vtol stuff from pathfollower.cpp after having replaced it with class impl
commit 9127d8d6d8c345c5bbf8622ce4e5eb76b03d1356
Merge: 4054c73 93fb2d5
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 25 13:09:06 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 4054c73ac98b54188a0a5367c5ca913b7fee6a89
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 24 12:29:28 2015 +1100
OP-1696 fix compile errors
commit b398db3d4de8cd621a059da1f0dbb00868be0fb9
Merge: 94c795a 3e15cac
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 24 12:06:35 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 94c795af386cf0f1072a88e99a80cb1080bf85e7
Merge: d2115de 57e0a8b
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 23 17:54:33 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
Conflicts:
flight/modules/Sensors/sensors.c
make/common-defs.mk
commit d2115dee4e8e9b6a02f7b7700e4715480a56b18f
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 23 14:35:02 2015 +1100
OP-1696 preliminary checkin for refactor of fly
TODO:
1. Finalise and test fly, brake
2. Remove patfhollower vtol fly
3. Rename all objects adding vtol in name
commit 95804b1d591d194cce3596187c74cdb2dd0d192f
Merge: 58cebb0 31c1385
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 21 22:10:03 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 58cebb0658deaece1555cfa24e50f1b86fd68c96
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 21 22:09:29 2015 +1100
OP-1696 refactor neutral thrust and add pos hold implementation
commit 2c3cadfef3de9e092bd66bbabc58ac7847aca7e4
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 20 18:32:11 2015 +1100
OP-1696 start of refactor of braking
commit 991c2124e834f3432f5e34c5c9f4966cb42a7be3
Merge: 1ab5798 db7d605
Author: abeck70 <abeck70@icloud.com>
Date: Thu Feb 19 12:17:54 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 1ab579865f04aeaa5899f5065a983de29074e025
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 18 21:29:01 2015 +1100
OP-1696 Rewrote velocity roam into new C++ OO architecture
With use of new PID controller for NE.
commit 03edb049f06bf60054dce36a5b8b301a397284c4
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 18 12:19:17 2015 +1100
OP-1696 Start of refactoring of VelocityRoam implementation in PathFollower
Also TODOs:
1. To support pathplanner, remove all references to FlightStatus object and add more fields to PathDesired
2. Refactor Braking to use C++
3. Test and optimise Velocity Roam
4. Add more config options to Landing. For example disable disarming. And add more setting objects.
5. Consider moving all landing settings to one object.
commit 1f5dba821d4535a9a14f333efdeec1af5afcc281
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 16 22:51:31 2015 +1100
OP-1696 Landing tuning
commit 5133956c717fba871dd5700333806e298038a3d0
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 16 21:05:06 2015 +1100
OP-1696 Landing
Multiple fixes
commit cf22055ecb8eb7304174c730f249a2332ebc599b
Author: abeck70 <abeck70@icloud.com>
Date: Sun Feb 15 20:52:29 2015 +1100
OP-1696 Add PIDStatus debug object
commit bc13d732601e7c7cb48db17f1a75b33cc96c0c34
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 14 15:53:16 2015 +1100
OP-1696 Landing sanity tested
commit 6e913076c1dfcb8b90153e9eca8acf6c9e51f293
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 14 11:16:06 2015 +1100
OP-1696 completed refactoring
1. Completed refactoring of NE and Thrust control
2. Fixed velocity roam
TODO Tuning and testing
commit 63b62fbd0ac105029e54163b98c3beebc2d73c3a
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 13 08:54:23 2015 +1100
OP-1696 New PID Controller and refactoring of PID implementation for thrust management
commit 7474331529477d0badd2ef0d609c84c556be9cec
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 10 16:39:44 2015 +1100
OP-1696 Landing Refactor Thrust PID Loop for landing
commit 904ab2a9241e40c19da6a1508b4ce5243c75d7a3
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 9 22:13:39 2015 +1100
OP-1696 Uncrustify
commit b3d30e298d8a0343782a29bc91be6677105b325e
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 9 22:05:05 2015 +1100
OP-1696 Create new OO design
Added PathFollowerControl which has an Landing implementation. The landing implementation runs its own set of PIDs. And interfaces to the FSM for Landing.
commit 1ffd8d67cf7310c1c18c90f3ba18b08221d185a3
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 7 18:04:42 2015 +1100
OP-1696 Upgrade arm tools
commit 3df01f97021d13694027b92ba0b13cc9fe70d437
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 21:52:38 2015 +1100
OP-1696 Landing uncrustify and start of refactoring landing to make more use of FSMLand
commit 7a753b65fb69d52c89875b9a182ef5210ee8ef2d
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 15:08:29 2015 +1100
OP-1696 Landing: fix compilation of all exes
commit 692459874acf2b7ae07aa3ab88a2c78a09f26ee6
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 14:45:06 2015 +1100
OP-1696 Landing startup fixes
commit 9851f29b9238a969efd0110f01a4fad6bdbc5a5d
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 10:21:52 2015 +1100
OP-1696 Landing pathfollower CPP refactoring
commit 9b3a54d41f14f07cd0d78426026d12ae9ac4e5b5
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 4 13:02:44 2015 +1100
OP-1696 Moved to FSMLand class and fixed CPP problems
1. Additional methods, compile options, and need to have main as a cpp to solve various link issues when using static constructors but to avoid adding unnecessary libs.
commit 7ebe739bfdb4e0f598f4408c1488f01bc033c044
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 3 22:17:08 2015 +1100
OP-1696 Initial Landing prototype
Proof of concept. To be refactored into C++
commit 11d6754b9766efb76cc1cd57e9894badaf33ef2d
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 3 22:13:10 2015 +1100
OP-1696 CPP Enablement
revo c++
Enable optional revo C++ support:
1. Set USE_CXX to enable compliation and linkage of C++ source code
2. Disables rtti and exceptions
3. operator new and delete call pios malloc/free
4. Static constructor invocation supported
2015-03-20 21:42:20 +11:00
abeck70
171d335d76
OP-1721 C++ compile review comments
2015-02-19 12:45:21 +11:00
abeck70
53482be09c
OP-1721 C++ and ARM tools
...
Enable revo C++ support:
1. Set USE_CXX to enable compliation and linkage of C++ source code
2. Disables rtti and exceptions
3. operator new and delete call pios malloc/free
4. Static constructor invocation supported
5. Additional methods, compile options, and need to have main as a cpp to solve various link issues when using static constructors but to avoid adding unnecessary libs.
6. Upgrade arm tools
2015-02-13 12:56:04 +11:00
Alessio Morale
613910e7cb
OP-1365 fix some indentation
2014-06-11 18:57:19 +02:00
Alessio Morale
88e392260c
OP-1365 Flight code instrumentation API: Allow to pass DIAG_INSTRUMENTATION=YES option to make to enable instrumentation without changing board level settings
2014-06-10 21:49:30 +02:00
Alessio Morale
0aa9ef4b57
OP-1307 Bare f4 discovery platform with no sensor, for development pourpose
2014-04-22 23:46:27 +02:00
Alessio Morale
c1f767b12d
Merge remote-tracking branch 'origin/amorale/OP-954_logfs_settings_in_internal_flash' into next
...
Conflicts:
flight/pios/common/pios_flashfs_logfs.c
2013-05-18 15:53:25 +02:00
Alessio Morale
6ba15ebc53
OP-954 Fixes from review:
...
- CopterControl target fix
- tabs in Nakefiles
- Removed duplicate stale settings and clean empty lines in osd Makefile
+review OPReview-470
2013-05-15 23:18:50 +02:00
Richard Flay (Hyper)
ed68fbe68d
OP-951: Adds -Wshadow to flight CFLAGS and fixes resulting compilation breakage.
...
+review OPReview
2013-05-14 07:01:45 +09:30
Alessio Morale
d555bd0673
Uses Internal flash for system settings storage repourposing external flash for "User" storage
2013-05-11 22:06:30 +02:00
Alessio Morale
93bad2e8c2
Merge branch 'amorale/OP-917_f4_bootloader_updater' into next
...
***** PLEASE NOTE ***** From this revision all F4 based boards (Revolution/OSD) needs bootloader version 5 to boot properly
Conflicts:
flight/pios/stm32f4xx/libraries/CMSIS2/Device/ST/STM32F4xx/Source/osd/system_stm32f4xx.c
flight/targets/boards/osd/board-info.mk
make/boot-defs.mk
make/common-defs.mk
2013-05-07 21:02:41 +02:00
Richard Flay (Hyper)
a2d8544931
OP-931: adds -Wextra compiler option for the flight code, and makes the bazillion code changes required
...
to make the flight code compile again. Needs careful review, particularly all the fixes for the
signed vs unsigned comparisons.
+review OPReview-459
2013-05-05 16:32:24 +09:30
Richard Flay (Hyper)
5b61466259
OP-931: Adds -Wdouble-promotion compiler option and fixes problems that the compiler then identifies.
...
+review OPReview-459
2013-05-04 19:24:01 +09:30
Richard Flay (Hyper)
87fcf9fa8b
Merge branch 'next' into hyper/OP-931_extra_compiler_warnings and update as necessary.
...
Hopefully properly fixes conflicts:
flight/modules/Attitude/attitude.c
flight/modules/ManualControl/manualcontrol.c
flight/modules/Osd/WavPlayer/wavplayer.c
flight/modules/Osd/osdgen/osdgen.c
flight/modules/System/systemmod.c
ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp
2013-05-04 11:12:44 +09:30
Richard Flay (Hyper)
7937ae6296
OP-931: Makes flight code compile with -Wfloat-equal and -Wunsuffixed-float-constants enabled.
...
Also fixes warnings (and bugs) in F4 STM32_USB_OTG_Driver code, allowing -Werror to be enabled for all flight code.
Fixes all other compiler warnings that would otherwise cause the flight code to not compile with -Werror enabled.
Along the way, this also adds some uses of isnan() to various places rather than questionable tests for x != x and
x == x to check for NaNs.
+review OPReview
2013-04-30 20:36:42 +09:30
sambas
9fec3f5567
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-27 13:39:58 +03:00
Alessio Morale
2e6835a2a3
Merge remote-tracking branch 'origin/next' into amorale/OP-917_f4_bootloader_updater
2013-04-27 12:25:54 +02:00
Richard Flay (Hyper)
fd1181959c
Merge branch 'hyper/OP-913-flight-uavo-alignment' into next
2013-04-27 18:19:01 +09:30
Alessio Morale
b21146b8e3
OP-917 bootloader updater for F4 targets. Initial commit
2013-04-27 00:56:47 +02:00
Oleg Semyonov
e2fd821e97
Merge remote-tracking branch 'origin/next' into sambas/diffnext
...
Conflicts:
make/common-defs.mk
2013-04-26 16:31:19 +03:00
Oleg Semyonov
25d0e8fcab
Rename PiOS/STM32F10x->PiOS/stm32f10x, PiOS/STM32F4xx->PiOS/stm32f4xx
2013-04-25 13:13:39 +03:00
Oleg Semyonov
748b28f4f4
Move doxygen config from flight to make/doxygen/
2013-04-24 22:44:40 +03:00
Richard Flay (Hyper)
146e082e74
OP-913: ensured that UAVO data structs in .bss/.data sections and on the stack have 4 byte alignment. Also changed linker options to sort common and sort sections by alignment, which reduces the amount of fill/padding in the .bss and .data sections.
...
+review OPReview-444
2013-04-23 22:34:58 +09:30
sambas
8aa5748a8c
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-20 10:59:00 +03:00
Oleg Semyonov
f15249ff07
make: fix bu_* targets
2013-04-18 17:50:34 +03:00
Oleg Semyonov
509a1b4fe1
make: fix *_program targets (were broken for firmware)
2013-04-18 17:37:12 +03:00
sambas
388489226d
typo fix, fix EE_BANK usage
2013-04-14 13:08:09 +03:00
sambas
bb4aa08a15
Merge remote-tracking branch 'origin/sambas/diffnext' into amorale/osd_settings_on_flash
2013-04-14 12:32:26 +03:00
sambas
589290dbd7
POI orbit + some code run thru code formatter
2013-04-14 12:23:47 +03:00
sambas
fb8273459f
Normalize line endings
2013-04-07 09:49:13 +03:00
Oleg Semyonov
5bb6b56b4a
OP-772: Normalize line endings
2013-04-05 23:46:56 +03:00
Alessio Morale
8698bcfb84
Moved OSD settings from SDCard to mcu internal flash memory
2013-03-30 15:47:22 +01:00
Oleg Semyonov
8f977a4411
Final step: lot of small fixes, last commit in this commit series
...
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.
NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.
The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.
Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
configs, only comment/uncomment them. Adding new PIOS options, please
propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
Makefile. As such, all dependencies are checked and accounted, no
more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
on command line, GCS build will depend on the resource, so all fw_*.opfw
targets will be built and embedded into GCS. By default GCS does not
depend on resource, and will be built w/o firmware (unless the resource
files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.
Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.
Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style
Merging this, please use --no-ff git option to make it the real commit point
Conflicts:
A lot of... :-)
2013-03-24 13:06:24 +02:00
Oleg Semyonov
f3d587ad12
Makefile: better options sequence in common-defs.mk
2013-03-24 13:06:01 +02:00
Oleg Semyonov
9b3d3e62ab
Makefile: fix Makefile for BootloaderUpdater (STM32F10x only targets)
...
Conflicts:
flight/targets/Bootloaders/BootloaderUpdater/Makefile
2013-03-24 13:05:52 +02:00
Oleg Semyonov
91f14768db
Makefile: fix mk files, now both CC and PipX are buildable using common defs
...
Conflicts:
make/apps-defs.mk
2013-03-24 13:05:50 +02:00
Oleg Semyonov
f65ff0585f
Makefile: add make/common-defs.mk and use it to build bootloaders (STM32F10x)
...
Conflicts:
make/boot-defs.mk
2013-03-24 13:04:15 +02:00