Commit Graph

3135 Commits

Author SHA1 Message Date
Dominic Clifton 9d4dbb4871 Merge branch 'octomixer' of https://github.com/iforce2d/cleanflight into iforce2d-octomixer
Conflicts:
	src/main/config/config.c
2015-07-10 00:47:22 +01:00
Dominic Clifton 9f88439b4b Merge pull request #1101 from tannewt/patch-1
Correct rate comment
2015-07-10 00:35:24 +01:00
Dominic Clifton 5a1fb52f99 Merge pull request #1104 from digitalentity/fast-trig-improvements
Modify and improve fast trigonometry
2015-07-10 00:28:01 +01:00
Konstantin Sharlaimov (DigitalEntity) eb5fc7c0eb Refactored code 2015-07-10 09:07:28 +10:00
Dominic Clifton 783a4c4bfa Merge pull request #1066 from cleanflight/custom-servo-mixers
Custom servo mixers
2015-07-09 23:48:53 +01:00
Dominic Clifton 357e3bdc10 Merge pull request #1069 from pulsar256/ci_curl_fixes
Travis/CI Updates: retry failed HTTP requests, Updated GCC to 4.9-2015q2
2015-07-09 23:42:57 +01:00
Dominic Clifton 164fd4ec57 Merge pull request #1092 from digitalentity/fast-trig
Ported fast trigonometry functions over from @Crashpilot1000 Harakiri
2015-07-09 23:41:04 +01:00
Dominic Clifton 1ead7649fb Merge pull request #1095 from codepox/master
Bug Fix: Stop motors in 3D mode
2015-07-09 23:10:45 +01:00
Dominic Clifton eb53855cd1 Fix CJMCU build - caused by a missed rename of mixerResetMotors to
mixerResetDisarmedMotors
2015-07-09 22:52:04 +01:00
Dominic Clifton 4a3970c9ab Fix range argument processing. 2015-07-09 22:13:21 +01:00
Dominic Clifton 79e72760e1 Update mixer documentation. 2015-07-09 21:31:47 +01:00
Dominic Clifton 62d638b2d9 Update smix reverse to use 'r' or 'n' for reverse or normal to a) match
the table, b) be more user friendly.
2015-07-09 21:15:11 +01:00
Dominic Clifton 57eb44928e Update mixer unit test for 7b91524ba2 2015-07-09 21:11:46 +01:00
Dominic Clifton c9f5ca3faf Deleted code specific to fixed wing that set motors to mincommand when
disarmed.

Ensure that servo mixes that use calculated throttle output (motor 0)
adhere to the armed/disarmed state, this is achieved by ensuring that
motor outputs, including the effects of MOTOR_STOP are calculated BEFORE
using motor 0 as an input source for the servo mixer.
2015-07-09 20:23:37 +01:00
Scott Shawcroft e67a1435cd Correct rate comment 2015-07-09 12:13:03 -07:00
Dominic Clifton 84773a8c91 Fix vectored thrust code, flying wing != vectored thrust.
vectored thrust is too generic a term.  examples:
1) fixed wing with ailerons and fixed motors on each wing, yaw the plane
by changing the speeds of the motors 
2) fixed wing with ailerons and single motor at rear, yaw the plane by
pivoting the motor left or right

Both of the above scenarios are possible using MIXER_CUSTOM_AIRPLANE.

In baseflight vectored thrust was added in:
e3585df3a3 (diff-2c11cf77e56a7a330caeccadfc1d8bcdR448)

then broken in:
ce0300a344 (diff-2c11cf77e56a7a330caeccadfc1d8bcdL449)

see:
https://github.com/multiwii/baseflight/blob/master/src/mixer.c#L153
https://github.com/multiwii/baseflight/blob/master/src/mixer.c#L328-L329
https://github.com/multiwii/baseflight/blob/master/src/mixer.c#L546-L555
2015-07-09 19:53:37 +01:00
Dominic Clifton bc5f666069 Minor MSP cleanup and adding a FIXME. 2015-07-09 19:02:52 +01:00
Dominic Clifton c88a33495f Fix incorrect default flying wing servo mixer.
Baseflight code made both surfaces respond in the SAME direction when
using pitch OR roll.

Behaviour should be: 
apply pitch causes the control surfaces move in the SAME direction.
apply roll causes the control surfaces should move in the OPPOSITE
direction.
2015-07-09 18:10:52 +01:00
digitalentity a3b57386c2 Ported fast trigonometry functions over from @Crashpilot1000 Harakiri code
Fixed maths_unittest.cc to correctly handle float-point numbers
2015-07-09 22:38:17 +10:00
Dominic Clifton edeaf37031 Add throttle servo for internal combustion powered airplanes to default
airplane servo mixes.

Also corrects names for BICOPTER; BIPLANE was mistakenly used.
2015-07-08 17:17:59 +01:00
Dominic Clifton 7b91524ba2 Replace gimbal_flags with FEATURE_CHANNEL_FORWARDING and gimbal_mode.
Gimbals are only one use of channel forwarding, PWM video switchers and
PWM buzzers are others.
2015-07-08 16:41:29 +01:00
Dominic Clifton 4ead898f6f Minor mixer cleanup. 2015-07-08 15:39:00 +01:00
Dominic Clifton 8b727ecbf9 Fix pwm servo initialisation when using custom airplane. 2015-07-08 15:38:39 +01:00
Dominic Clifton 1431dfad7c Allow servo rules to use stabilised controlled throttle (e.g. for I.C
planes).

Note: The code ported from baseflight appears broken.
2015-07-08 15:25:12 +01:00
Dominic Clifton 774a36a2d5 Avoid print smix table header multiple times. 2015-07-08 14:48:23 +01:00
Chris Campbell 2205bdc095 Corrections for alienwii-specific custom mixer values 2015-07-08 22:45:00 +09:00
Dominic Clifton 3776bb07dc Update mixer documentation. 2015-07-08 13:59:53 +01:00
Dominic Clifton 99e0e55e17 Rename and re-order servo rule input sources 2015-07-08 13:59:52 +01:00
Dominic Clifton 7e12711763 Fix missing fixed wing throttle control. 2015-07-08 13:59:51 +01:00
Dominic Clifton 763c75873e Use 0 based index for motor and servo mix in CLI. Update
MSP_SERVO_MIX_RULES, MSP_SET_SERVO_MIX_RULE, MSP_SERVO_CONFIGURATIONS,
MSP_SET_SERVO_CONFIGURATION.  Delete MSP_CHANNEL_FORWARDING,
MSP_SET_CHANNEL_FORWARDING.
2015-07-08 12:54:09 +01:00
Dominic Clifton bb0f909e83 Merge branch 'master' into custom-servo-mixers 2015-07-08 12:11:49 +01:00
codepox a76d956358 Fixed a bug: in 3D mode to stop the motors, send neutral3d value to the ESCs instead of mincommand.
This was causing the motors to go full negative for a short time everytime I left the CLI mode tab in the Configurator GUI.
2015-07-07 18:53:11 -04:00
Dominic Clifton cae718559c Merge pull request #1086 from stuphi/Manual-add_stick_diagram
Add a diagram of stick positions to the manual.
2015-07-07 19:06:14 +01:00
Chris Campbell 1a0fdead4e Corrected default mixer values for octo flat X 2015-07-07 15:43:38 +09:00
stuphi 76937d8730 Add a diagram of stick postions 2015-07-06 21:27:38 +01:00
Nicholas Sherlock 8a06849657 Improve flashfs codegen by fixing pagesize at a constant 256 bytes 2015-07-05 14:10:12 +12:00
Paul Rogalinski 2340bdaadb updated to latest (4.9-2015q2) arm-gcc version 2015-07-01 22:50:43 +02:00
Paul Rogalinski 9c58764dd5 updated travis documentation 2015-07-01 22:50:43 +02:00
Paul Rogalinski c4141d5f3c using curl instead of wget in .travis.yml
added retry option to all remaining curl requests
2015-07-01 22:50:42 +02:00
Paul Rogalinski 4062bd4145 fixed wrong parameter name 2015-07-01 22:50:42 +02:00
Paul Rogalinski ba146d99d8 more robust curl / CI Server integration 2015-07-01 22:50:41 +02:00
Dominic Clifton cfdb1bdc56 Merge pull request #1070 from nzmichaelh/usb
USB - Mark register accesses as volatile, fixes compilation using GCC 4.9 with LTO enabled.
2015-07-01 12:21:08 +01:00
Nicholas Sherlock e7865eb3f0 Merge pull request #1035 from MJ666/W25Q128
Support for 128Mbit SPI flash
2015-07-01 11:12:05 +12:00
Michael Hope e569a71c60 usb: add volatile in more places.
Fixes the remaining (and valid) warnings.

Signed-off-by: Michael Hope <mlhx@google.com>
2015-06-30 22:44:11 +02:00
Steveis f0aec2e31d Unit tests for BMP085 2015-06-30 17:33:44 +01:00
Michael Jakob 033e47ebc9 16Mbyte SPI flash memory support
Add Winbond W25Q128
Add Micron N25Q128
Fix datatype for flash gemometry
Blackbox documentation update
2015-06-30 10:09:20 +02:00
Michael Hope ebc0f53b59 usb: mark register accesses as volatile.
Fixes the LTO build with GCC 4.9.  Tested on the STM32F3DISCOVERY.  I
assume the compiler was doing cross function optimisation, saw that
the same non-volatile address was read twice, and dropped the second
read.

Fixes #763.

Signed-off-by: Michael Hope <mlhx@google.com>
2015-06-30 08:12:24 +02:00
Nicholas Sherlock 4f860dd6f1 Reduce standard deviation of flash logging execution time by 80% 2015-06-30 17:43:49 +12:00
Nicholas Sherlock bf18f212d9 Merge pull request #907 from sherlockflight/blackbox-status-frame
Blackbox - Add logging for flight state, flight mode, and failsafe state
2015-06-30 16:04:28 +12:00
Dominic Clifton e48e50512e Merge pull request #1028 from borisbstyle/dterm_filter
Selective Software Filtering (Gyro, Dterm, Pterm)

Thanks for the code boris and thanks to everyone else for their testing and feedback
2015-06-29 16:00:49 +01:00