Commit graph

2712 commits

Author SHA1 Message Date
Dominic Clifton
6c3a2e1cbb Latest binaries 2014-05-03 22:52:22 +01:00
Dominic Clifton
ee2140d324 Merge remote-tracking branch 'multiwii/master'
Conflicts:
	src/board.h
	src/drivers/adc_common.c
	src/drivers/pwm_common.c
	src/drivers/pwm_common.h
	src/main.c
	src/mw.c
	src/mw.h
	src/sensors.c
	src/utils.h
2014-05-03 22:50:57 +01:00
Dominic Clifton
0a441a9bb6 Merge commit 'fd4bb1eb1c40feb32a4b07223fd398529c6af514'
Conflicts:
	src/rxmsp.c
2014-05-03 21:58:44 +01:00
Dominic Clifton
1750bfbc2b Fixing missed commit #2 2014-05-03 21:50:58 +01:00
Dominic Clifton
a2862a5cfb Fixing missing commit 2014-05-03 21:50:39 +01:00
Dominic Clifton
a10528b103 Merge pull request #99 from treymarc/serialrx_msp
Serialrx msp
Conflicts:
	src/board.h
	src/drv_gpio.h
	src/mw.h
	src/sensors.c
2014-05-03 21:48:30 +01:00
dongie
65ba0fdf30 support 1S battery for voltage monitoring
Conflicts:

	src/sensors.c
2014-05-03 18:36:54 +01:00
dongie
78a335792d add support for GPIO remapping (copied from stm32f_gpio.c)
Conflicts:

	src/drv_gpio.h
2014-05-03 18:23:25 +01:00
treymarc
42b8faa8bb check frameComplete
Conflicts:

	src/mw.c
2014-05-03 18:21:16 +01:00
treymarc
9e8b05dc0e add serial_rx msp
Conflicts:

	Makefile
	src/board.h
	src/main.c
	src/mw.h
	src/serial_cli.c
2014-05-03 18:20:17 +01:00
dongie
771edeb29f building hex for gps initialization fix
Conflicts:

	obj/baseflight.hex
2014-05-03 17:57:30 +01:00
Dominic Clifton
68266d7eba Merge commit '2c9849cd33e8cd998ee3853bb5836cf4fe13cbf9' 2014-05-03 17:56:39 +01:00
DTF UHF
02bb2089c1 Set SBAS mode in GPS for worldwide use instead of exclusively European use 2014-05-03 17:56:03 +01:00
Dominic Clifton
3bfe8a81bc Merge commit 'fdddb841a4db93ad7d21ea000118f8bee3c4a467'
Conflicts:
	src/flight_mixer.c
2014-05-03 17:55:22 +01:00
Dominic Clifton
9b672791f4 Cleanup Fake GYRO and Fake ACC support. 2014-05-02 21:31:06 +01:00
Dominic Clifton
8be5e63faa Fix FY90Q build. 2014-05-02 21:30:29 +01:00
Dominic Clifton
019bb450c8 Adding a FIXME regarding failureMode() method signature. 2014-05-02 21:20:01 +01:00
Dominic Clifton
9a3c922efc STM32F30x - de-duplicate common uart code. 2014-05-02 21:19:19 +01:00
Dominic Clifton
89b9a0492f Cleanup OLIMEXINO softserial loopback support. 2014-05-02 21:17:18 +01:00
Dominic Clifton
ef06d438e4 STM32F30x - Use USART2 non-DMA RX. This enables the use of serial-rx. 2014-05-02 19:56:40 +01:00
Dominic Clifton
9b84d47d33 STM32F30x - Enable USART2 (not for serialRx)
Since it uses DMA to receive it means that serialRx is broken because
the RX callback function is only used when DMA is NOT used.

Currently only serialRx uses USART callbacks.

Attempting to disable RX DMA didn't work, the USART2 IRQ handler is
never called.
2014-05-02 18:39:03 +01:00
Dominic Clifton
92bed4a33d STM32F30x - Working parallel PWM. Timer IRQ handle was not defined for
TIM8 correctly. Software serial conficted with parallel PWM input. Fixed
crash due to incorrect timerConfig index calculation code.

The crash occurred when capture compare interrupt handlers attempted to
call an invalid callback.

Note: the crash does not affect existing baseflight code since the
formula is OK when using a 2 dimensional array with equal dimensions.

Formula details here:
https://docs.google.com/spreadsheets/d/1UuxnC0VKiprvt1wt3KXffefEWJUb_-ILFLQuP377Anw
2014-05-02 17:09:41 +01:00
dongie
c1fcdabdc1 rearranged startup / sensor detection for production testing. moved dead gyro endless loop out of the way. 2014-05-02 18:27:23 +09:00
dongie
2d248676f5 slight refactoring of PPM/PWM failsafe to make it actually work and honor failsafeThreshold value. 2014-05-02 16:12:31 +09:00
Dominic Clifton
fbe2f82c05 STM32F30x - Enable serial PWM (PPM) input on PWM1.
This might also fix parallel PWM input too, but untested.
2014-05-01 20:20:24 +01:00
Dominic Clifton
133f75a17b Update PWM driver so that all 10 PWM outputs work. Softserial also now
works as expected.  PWM/PPM input untested.  UART2 probably broken.
2014-05-01 15:09:32 +01:00
dongie
cce4d4975d moved some of init logic around to get sensors + other important hardware checked first; added dummy implementation of production test for future use, outputting debug info over PB6 (USART1_TX remap) 2014-05-01 19:05:13 +09:00
dongie
be5896f5b3 updated ADC driver to use more of available inputs, as well as made input selection more sane 2014-05-01 19:03:58 +09:00
dongie
fd4bb1eb1c adding rxmsp to uvision project 2014-05-01 12:37:20 +09:00
dongie
ef0c28ae0a Merge pull request #99 from treymarc/serialrx_msp
Serialrx msp
2014-05-01 12:33:44 +09:00
dongie
98bd9c5cda support 1S battery for voltage monitoring 2014-05-01 12:24:48 +09:00
treymarc
9d15009ad3 check frameComplete 2014-05-01 05:22:06 +02:00
dongie
25ec04763b add support for GPIO remapping (copied from stm32f_gpio.c) 2014-05-01 12:10:33 +09:00
treymarc
ed46b4e4ac add serial_rx msp 2014-05-01 05:06:36 +02:00
dongie
8a5f424421 building hex for gps initialization fix 2014-04-30 00:34:16 +09:00
dongie
2c9849cd33 Merge pull request #97 from DTFUHF/master
Set SBAS mode in GPS for worldwide use instead of exclusively European u...
2014-04-30 00:32:00 +09:00
DTF UHF
5393d83e4d Set SBAS mode in GPS for worldwide use instead of exclusively European use 2014-04-29 11:23:49 -04:00
Dominic Clifton
7e79a245c2 Cobbled together some bits of code to read and format the gyro data from
the L3GD29 gyro.  Some code borrowed again from AQ32PlusF3 and the
existing MPU6050 driver.
2014-04-28 22:29:51 +01:00
Dominic Clifton
5c9b16ccde Convert the acc readings so that the 1G value is correct. 2014-04-28 21:40:17 +01:00
Dominic Clifton
4febeb3969 Ported some I2C code from AQ32PlusF3 which itself looked ported from the
STM32 examples.
2014-04-28 19:18:57 +01:00
kh4
cf780bbad6 Enable input filtering on input capture timers. 2014-04-27 22:37:45 +03:00
Dominic Clifton
8d9ce86a5a get GPIO and USART ports working.
The STM32F3DISCOVERY board would crash when setting GPIOA Pin_13 or
Pin_14 to analog mode so they are excluded in the gpio initialisation.

The USART GPIO configuration did not work when using the F10x code.  The
USART status and DMA registers are different too.
2014-04-25 15:19:28 +01:00
Dominic Clifton
2cc3a50c01 Avoid calling SetSysClock twice. 2014-04-25 12:10:51 +01:00
Dominic Clifton
cde26ac1a2 Fix eeprom writing. Update some clocks. Add fake implementation of acc
and gyro to allow the main loop to run.
2014-04-25 03:50:33 +01:00
Dominic Clifton
f9ceb0c40f fix transposed gpio driver filenames and content 2014-04-25 01:17:08 +01:00
Dominic Clifton
0598704872 First commit of port to STM32F3DISCOVERY board.
work-in-progress, it does compile and run though but hangs early on in
main() because of unimplemented features.
2014-04-25 01:09:19 +01:00
dongie
fdddb841a4 Merge pull request #93 from hydra/3d-flight-midrc-fix
BUG FIX - Fixes 3d flight mixer so that it uses midrc
2014-04-24 20:12:01 +09:00
Dominic Clifton
dc3e7decbd BUG FIX - Fixes 3d flight mixer so that it uses midrc
Previously it was using a hardcoded value of 1500.

Without this commit it would mean that any midrc configuration was not
being applied to 3d flight.

lready applied in a6c22d2115
Conflicts:

	src/flight_mixer.c
2014-04-24 11:31:27 +01:00
Dominic Clifton
e4cf3d941a BUG FIX - Fixes 3d flight mixer so that it uses midrc
Previously it was using a hardcoded value of 1500.

Without this commit it would mean that any midrc configuration was not
being applied to 3d flight.
2014-04-24 11:23:57 +01:00
Dominic Clifton
92f74ac0c2 Removing final dependency on board.h.
board.h is no-longer required.
2014-04-24 02:16:16 +01:00