1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 15:25:36 +03:00
Commit graph

239 commits

Author SHA1 Message Date
Dominic Clifton
012e8fac31 SPRACINGF3 - Configure beeper GPIO correctly. 2015-02-05 17:06:32 +00:00
Dominic Clifton
8aee0b25e2 Fix bug where current meter didn't work unless VBAT feature was enabled. 2015-02-03 16:20:14 +00:00
Dominic Clifton
55cac2bdeb Finally rename flight.c/.h to pid.c/.h. Cleanup some dependencies.
Relocate more code.
2015-02-01 00:39:38 +01:00
Dominic Clifton
53406a7ac7 Relocate some structures and code to the right places.
This cleans up the include file order somewhat and fixes a couple of
dependencies.

The goal of this is to rename flight.c/flight.h to pid.c/pid.h.
2015-01-31 23:47:51 +01:00
Dominic Clifton
a9b2c39872 printf naming cleanup 2015-01-31 22:29:17 +01:00
Dominic Clifton
01b2ce0b36 IMU naming cleanup. 2015-01-31 22:23:38 +01:00
Dominic Clifton
8b0a982931 Telemetry naming cleanup. 2015-01-31 22:12:11 +01:00
Nicholas Sherlock
ebff1bdcd7 Merge remote-tracking branch 'upstream/master' into blackbox-flash 2015-01-30 13:48:49 +13:00
Krzysztof Rosinski
34cd8f466e MSP command for sonar altitude 2015-01-29 15:17:15 +01:00
Nicholas Sherlock
f9e22a0461 Merge remote-tracking branch 'upstream/master' into blackbox-flash 2015-01-28 20:48:17 +13:00
Nicholas Sherlock
3eb28f16ea Basic read/write/erase flash functionality works from the CLI
Very little code coverage tested yet, only writes of small sizes
2015-01-28 17:45:36 +13:00
Dominic Clifton
a2b232e805 Detach midrc (input) from servo center (output).
This fixes incorrect servo center position when midrc was not 1500.
Most likely only experienced by futaba plane or servo/tilt users.
2015-01-27 23:04:41 +01:00
tracernz
496d706097 Merge upstream
Conflict in src/main/sensors/battery.c from blackbox logging of
amperage. Merged changes in so that blackbox can log the current meter
ADC raw value.
2015-01-25 19:51:59 +13:00
tracernz
6868999d63 Set default current meter type
Current meter type added to resetBatteryConfig in config.c so it
defaults to ADC.
PWM mapping skips the current meter ADC pin only if used.
2015-01-25 19:35:18 +13:00
Dominic Clifton
9e73dca591 CC3D - Use Flex port in I2C mode unless USART3 is used. Add I2C drivers
for compass, baro and display.
2015-01-22 19:19:43 +01:00
Pierre Hugo
ab8b5efe2c Switched initIMU to consistant name. 2015-01-21 19:36:41 -08:00
Dominic Clifton
650389afb6 Disable ADC initialisation on CJMCU. Replace MASSIVEF3 with SPRACINGF3.
Conditional VCP code inclusion.  Other minor F1/F3 cleanups.
2015-01-20 23:33:03 +01:00
Dominic Clifton
53faaff63c Add CJMCU revision detection. Use LEDs to indicate Spektrum binding
activity.
2015-01-08 01:19:25 +00:00
Dominic Clifton
83a5c319b5 CJMCU - Add support for LED2. Swap usage of LED0 and LED1.
Currently the LED2 (blue) is just enabled after the main board
initialisation is complete and then it stays on.
2015-01-07 23:02:05 +00:00
Nicholas Sherlock
321fc717ab Merge remote-tracking branch 'upstream/master' 2014-12-27 20:00:45 +13:00
Dominic Clifton
abe4fbbaae Merge branch 'PWM_mapping' of https://github.com/MJ666/cleanflight into MJ666-PWM_mapping
Conflicts:
	src/main/main.c
2014-12-26 18:51:40 +00:00
Nicholas Sherlock
dfd8e5b2b0 Merge branch 'master' of https://github.com/cleanflight/cleanflight 2014-12-26 11:56:00 +13:00
Dominic Clifton
ee19c1f071 Rename multiType to mixerMode. Rename MULTITYPE_* to MIXER_*.
'Type' is a noise word.

'Multi' is a mis-nomer - there is nothing 'multi' about a gimbal or
fixed wing.
2014-12-24 11:58:57 +00:00
Dominic Clifton
b123b4ef03 Cleanup disabling of mixers for CJMCU, this might be usefulfor the
AlienWii32 target too.

Deleted old out of date comments.  Various other minor cleanups.
2014-12-24 11:33:14 +00:00
Nicholas Sherlock
1b1a285b4a Syncing with Cleanflight upstream 2014-12-22 23:23:26 +13:00
Dominic Clifton
183c5f8e16 Add MPU9150 mag support and mag autodetection. Add AK8975 mag driver.
Note: not working on the sparky, MPU9150 needs passthough enabling but
when enabled the mag and gyro won't ack on the default addresses.  Needs
further investigation.
2014-12-21 23:40:48 +00:00
Nicholas Sherlock
c85a172370 Merge remote-tracking branch 'upstream/master' 2014-12-18 18:17:59 +13:00
Dominic Clifton
19525fdd3c Removing unnecessary comment. 2014-12-17 23:15:34 +00:00
Michael Jakob
1766857da6 Spectrum bind code to be more geenic
Actualy only activated for the NAZE taget for USART2

#define SPEKTRUM_BIND
#define BIND_PORT  GPIOA
#define BIND_PIN   Pin_3

This is to activate the Hardware bind pug feature
#define HARDWARE_BIND_PLUG
#define BINDPLUG_PORT  GPIOB
#define BINDPLUG_PIN   Pin_5

can now be easyly added and configured for other tagets after testing.
2014-12-17 23:15:28 +00:00
Michael Jakob
3aaaa3f9f5 Updates and fixes
fix FEATURE_RX_SERIAL
Delay for the hardware bind plug
Bind code will only work on default NAZE serial port (document
limitation)
2014-12-17 23:15:28 +00:00
Michael Jakob
c80090f39f Spektrum Satelitte bind code ported from Baseflight
includes support for a hardware bind plug (PB5 pin 41)
Activate via OPTIONS="HARDWARE_BIND_PLUG" during make
2014-12-17 23:15:27 +00:00
Michael Jakob
4b0d5e7e15 Use same PWM mapping for PPM and Serial RX
Without this fix an Octocopter with serialh RX will not work. Standard
 receiver mapping with only 6 motors outputs will apply.
2014-12-15 07:46:47 +01:00
Dominic Clifton
ce6582b88a GPS - remove temporary hack for fixing the OLED page to the GPS page.
Fix incorrect flag usage.
2014-12-13 03:45:39 +00:00
Dominic Clifton
80acc39a46 GPS page on the display to aid GPS outdoor testing. 2014-12-11 15:41:18 +00:00
Dominic Clifton
6c96b8dd86 Support the Sparky board by peabody124 - work in progress, not flight
ready.

https://github.com/TauLabs/TauLabs/wiki/Sparky

http://buildandcrash.blogspot.co.uk/2013/05/sparky-testing-and-building-no-crashing.html
2014-12-09 03:12:38 +00:00
Nicholas Sherlock
8c41772584 Add Blackbox 0.1.0 2014-12-08 22:06:57 +13:00
Dominic Clifton
e802e2d032 Remove usage of feature() from pwm driver code so that driver code does
not have a dependency on config.c.
2014-12-06 11:39:31 +00:00
Kyle Manna
b49bdcd169 main: Remove duplicated includes
* Remove duplicate includes from 50391f2c
* No functional change.
2014-11-26 10:13:29 -06:00
Kyle Manna
c806046181 perms: Remove execute bit on source files
* Remove the execute bit on source files.
* No functional change.
2014-11-26 10:13:29 -06:00
Dominic Clifton
c5139fb9dc CC3D - fix cc3d build.
SERIAL_PORT_USART2 is undefined for CC3D.
2014-11-22 01:16:07 +00:00
Petr Ledvina
3ee60ef857 Merge remote-tracking branch 'refs/remotes/upstream/master' into feature-timer 2014-11-11 12:50:11 +01:00
Dominic Clifton
893023d21b Delete some baseflight test code. 2014-11-10 00:40:22 +00:00
Petr Ledvina
aa7f5c4a1e New timer implementation
This is first part of new softserial code. Main timer code is changed, changes to rest of code are kept to minimum.

macros for BASEPRI based synchronization are added to project (atomic.h)

TIMER_PERIOD fixed in pwm_rx.c
2014-11-07 15:38:26 +01:00
Dominic Clifton
9f41f9aba4 Merge pull request #128 from Pierre-A/cc3d-updates-1
Current monitoring on CC3D
2014-10-24 08:42:57 +01:00
Petr Ledvina
e58afe9d64 quick fix
it is impossible to build some targets. This is quick fix to get it working again
2014-10-23 16:32:16 +02:00
Pierre-A
d0ec471d03 Current monitoring on CC3D 2014-10-21 20:30:40 +02:00
Dominic Clifton
63236d5a2a Fixed bug where channel mapping was incorrect when using GPS and RX
Parallel PWM on STM32F10X targets. Fixes #80.

The check to see if usart2 should always be done.  The PWM mapping code
decides on a per-target base if possible pwm input channels need to be
skipped due to pin usage clashes.
2014-10-18 18:16:58 +01:00
Dominic Clifton
50391f2c8e Use Naze hardware revision when initialising beeper. Cleanup inverted
beeper configuration.
2014-10-16 00:44:56 +01:00
Dominic Clifton
a4879cc2e3 Use Naze hardware revision when initialising ADC. 2014-10-15 21:14:49 +01:00
Dominic Clifton
8ef70abaa0 NAZE32 - Add hardware revision detection. 2014-10-15 20:59:06 +01:00