Dominic Clifton
08d998e9a4
Fix editor mishap in battery warning activation code.
2014-05-30 15:12:30 +01:00
dongie
3c0f0f7ed4
fixed frsky temeletry gps output to match with what is actually expected. props to KC_703 for spotting this stuff.
2014-05-30 21:37:22 +09:00
dongie
d7c77c3fe2
formatting fixes and rename one of ADC channels.
2014-05-30 19:28:46 +09:00
Dominic Clifton
5b1b6fe98e
Latest binaries with autotune, I2C fixes and current meter support.
2014-05-30 11:13:06 +01:00
Dominic Clifton
0ec5c2cdca
Use debug outputs to show ADC readings.
2014-05-30 11:10:23 +01:00
Dominic Clifton
e79438d930
Fix editor mishap in current meter conflict resolution.
...
See e6fdfd3c32
2014-05-30 11:09:41 +01:00
Dominic Clifton
a8ae4a156b
Merge remote-tracking branch 'multiwii/master'
2014-05-30 10:47:53 +01:00
luggi
e6fdfd3c32
current sensor support added
...
also optimized the vbat code a bit
Conflicts:
src/config.c
src/drv_adc.c
src/drv_adc.h
src/mw.c
src/mw.h
src/sensors.c
src/serial_cli.c
2014-05-30 10:46:14 +01:00
dongie
4e3ab221ac
increased ADC sample time to 239.5 cycles (~10uS at 24MHz ADC clock).
2014-05-30 09:49:16 +01:00
dongie
a3476cf59c
Remove FY90Q support.
...
Conflicts:
Makefile
src/board.h
src/drivers/adc_fy90q.c
src/drivers/pwm_fy90q.c
src/drv_adc.h
src/sensors.c
src/startup/startup_stm32f10x_md_fy90q.s
2014-05-30 09:45:15 +01:00
dongie
0e80dbf025
reformat I2C driver and align comments. add timeout checking and move hardware reinit common code into separate function.
...
moved nvic priority group init into drv_system, where it belongs
Conflicts:
src/drivers/system_common.c
src/drv_i2c.c
2014-05-30 09:38:03 +01:00
dongie
31297de7fa
remove i2c driver function calls and directly read/write I2C->DR
...
Conflicts:
src/drivers/bus_i2c_stm32f10x.c
2014-05-30 09:29:43 +01:00
Dominic Clifton
4e7aa1b4b6
Merge remote-tracking branch 'origin/autotune'
2014-05-30 09:04:13 +01:00
Dominic Clifton
e083a3266d
Decreasing autotune max oscillation value since a value of 4 was found
...
to always cause P to increase.
2014-05-30 09:01:37 +01:00
dongie
a0fce3c449
Merge pull request #113 from luggi/Powermeter
...
Current sensor support added, with defaults for Allegro ACS758 current sensor.
2014-05-30 16:04:26 +09:00
luggi
5cc9750d12
current sensor support added
...
also optimized the vbat code a bit
2014-05-30 08:58:54 +02:00
dongie
d050c7df0c
fixed ADC initialization with skipped channels - spotted by Lux.
...
Also increased ADC sample time to 239.5 cycles (~10uS at 24MHz ADC clock).
2014-05-30 03:18:58 +02:00
Crashpilot1000
65e4d89d44
Update telemetry_frsky.c
...
Correct Frsky Gps output format DDDMM.MMMM
2014-05-29 20:27:26 +02:00
dongie
3d39ece50f
Remove FY90Q support. Dead hardware, not even available anymore, and doesn't offer anything over already cheap acroafro.
2014-05-29 11:38:20 +09:00
dongie
8b6ff25bdb
reformat I2C driver and align comments. add timeout checking and move hardware reinit common code into separate function.
...
moved nvic priority group init into drv_system, where it belongs
2014-05-29 11:07:52 +09:00
dongie
61f18a122d
remove i2c driver function calls and directly read/write I2C->DR
2014-05-29 09:28:09 +09:00
Dominic Clifton
bbfebc5de9
Updating HoTT GPS Altitude code to match spec.
...
Unit test added.
2014-05-28 21:32:13 +01:00
Dominic Clifton
79a90b09ef
Merge remote-tracking branch 'multiwii/master'
...
Conflicts:
src/board.h
src/drv_timer.c
src/mw.c
src/sensors.c
2014-05-28 21:04:02 +01:00
Dominic Clifton
5913266ce0
Update autotune comments, defaults and functional description. Add
...
reference to sources.
2014-05-28 20:36:53 +01:00
Dominic Clifton
7ec0df8abe
Merge branch 'master' into autotune
...
for some union members. remove type
prefix from a typedef.
Conflicts:
obj/cleanflight_OLIMEXINO.hex
src/flight_common.c
Conflicts:
obj/cleanflight_OLIMEXINO.hex
src/flight_common.c
2014-05-28 20:18:38 +01:00
Dominic Clifton
b712e8e325
Updating NAZE binary with autotune eeprom write enable.
2014-05-28 20:13:13 +01:00
Dominic Clifton
695c6a0628
Enable writing to EEPROM when using the autotune switch after landing.
2014-05-28 20:13:13 +01:00
Dominic Clifton
4a23491d49
Introduce better naming consistency for some union members. remove type
...
prefix from a typedef.
Conflicts:
obj/cleanflight_OLIMEXINO.hex
src/flight_common.c
2014-05-28 20:13:13 +01:00
Dominic Clifton
dcbb82c845
Update Development.md
2014-05-28 20:13:06 +01:00
Dominic Clifton
3b347fa839
Introduce better naming consistency for some union members. remove type
...
prefix from a typedef.
2014-05-28 19:49:42 +01:00
Dominic Clifton
bd3d853b61
Reorder code to remove not operator and improve readability.
2014-05-28 19:10:37 +01:00
Dominic Clifton
80d4f80f7d
Update Development.md
2014-05-28 15:11:29 +01:00
Dominic Clifton
d0ec7e25ce
Merge branch 'master' into autotune
...
Conflicts:
obj/cleanflight_CHEBUZZF3.hex
obj/cleanflight_NAZE.hex
obj/cleanflight_OLIMEXINO.hex
2014-05-28 13:37:40 +01:00
dongie
88036ec551
remove unnecessary averaging of PWM/PPM rc input
2014-05-28 17:30:55 +09:00
dongie
0028fa2ce4
re-enable hardware i2c; update NVIC priority to use define from CMSIS instead of magic 0x500 number
2014-05-28 17:29:06 +09:00
Dominic Clifton
342aabeb5d
Latest binaries with autotune.
2014-05-28 03:41:06 +01:00
Dominic Clifton
0acc4ff496
Latest binaries with RSSI ADC.
2014-05-28 03:32:01 +01:00
Dominic Clifton
5484e5fddd
Replace PWM RSSI with ADC RSSI.
...
The primary reason is to support the D4R-II with it's much faster PWM
frequency. The PWM RSSI code could not keep up, and since there are no
timers free for using capture compare of PWM signals in hardware one
solution is to use the ADC at a slow sample rate.
RC2 is used as before and it expects a signal between 0 and 3.3v. An
inline smoothing capacitor may help.
This commit also removes the cli command adc_power_channel since the
reading was never actually exposed anywhere.
2014-05-28 03:30:53 +01:00
Dominic Clifton
bc84f6d5d4
Update autotune so it now actually changes the pid values.
...
This commit also fixes a few missing const keywords after the map file
was inspected.
2014-05-27 21:20:29 +01:00
Dominic Clifton
2cf686b36b
If auto tune was used, and the user landed the aircraft, then before it
...
is used again it must be reset.
Otherwise the first flip of the switch would start the next phase which
could mean that PID settings were restored.
2014-05-27 18:11:55 +01:00
Dominic Clifton
0280e96a9a
Replace unused runtime warning beep code with autotune beep code.
2014-05-27 18:11:55 +01:00
Dominic Clifton
4c764aacf4
Autotune phase changes.
...
Add an additional phase to allow previous pid settings to be restored,
in flight, after auto tuning.
2014-05-27 18:11:55 +01:00
Dominic Clifton
f7c38af7fc
Initial commit for implementation of autotune.
2014-05-27 18:11:55 +01:00
Dominic Clifton
49c283fe59
Update Failsafe.md
...
formatting.
2014-05-27 18:11:54 +01:00
Dominic Clifton
f74a31f800
Update Failsafe.md
2014-05-27 18:11:54 +01:00
Dominic Clifton
4f5d32af36
Disable ADC debug output
2014-05-27 18:11:46 +01:00
Dominic Clifton
4c9f9093b8
Disable ADC debug output
2014-05-27 18:02:26 +01:00
Dominic Clifton
f61232de13
Update Failsafe.md
...
formatting.
2014-05-26 19:59:21 +01:00
Dominic Clifton
2bbbd05cc7
Update Failsafe.md
2014-05-26 19:54:30 +01:00
Dominic Clifton
b957def2f3
Fix powerAdcChannel on STM32F1.
...
Initialisation of ADC was incorrect.
2014-05-26 17:50:33 +01:00