rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'op-public/next' into revo-next

Browse Source
This commit is contained in:
Stacey Sheldon 2012-09-16 17:14:20 -04:00
commit ffe88eec5e
5 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -160,7 +160,7 @@ $(BUILD_DIR):
############################################################### ###############################################################
# Set up QT toolchain # Set up QT toolchain
QT_SDK_DIR := $(TOOLS_DIR)/qtsdk-v1.2 QT_SDK_DIR := $(TOOLS_DIR)/qtsdk-v1.2.1
.PHONY: qt_sdk_install .PHONY: qt_sdk_install
qt_sdk_install: QT_SDK_URL := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/8ea74da4-fec1-4277-8b26-c58cc82e204b/Qt_SDK_Lin32_offline qt_sdk_install: QT_SDK_URL := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/8ea74da4-fec1-4277-8b26-c58cc82e204b/Qt_SDK_Lin32_offline

20
flight/PiOS/STM32F10x/pios_led.c
View File

@ -93,7 +93,10 @@ void PIOS_LED_On(uint32_t led_id)
const struct pios_led * led = &(led_cfg->leds[led_id]); const struct pios_led * led = &(led_cfg->leds[led_id]);
GPIO_ResetBits(led->pin.gpio, led->pin.init.GPIO_Pin); if (led->active_high)
GPIO_SetBits(led->pin.gpio, led->pin.init.GPIO_Pin);
else
GPIO_ResetBits(led->pin.gpio, led->pin.init.GPIO_Pin);
} }
/** /**
@ -111,7 +114,10 @@ void PIOS_LED_Off(uint32_t led_id)
const struct pios_led * led = &(led_cfg->leds[led_id]); const struct pios_led * led = &(led_cfg->leds[led_id]);
GPIO_SetBits(led->pin.gpio, led->pin.init.GPIO_Pin); if (led->active_high)
GPIO_ResetBits(led->pin.gpio, led->pin.init.GPIO_Pin);
else
GPIO_SetBits(led->pin.gpio, led->pin.init.GPIO_Pin);
} }
/** /**
@ -130,9 +136,15 @@ void PIOS_LED_Toggle(uint32_t led_id)
const struct pios_led * led = &(led_cfg->leds[led_id]); const struct pios_led * led = &(led_cfg->leds[led_id]);
if (GPIO_ReadOutputDataBit(led->pin.gpio, led->pin.init.GPIO_Pin) == Bit_SET) { if (GPIO_ReadOutputDataBit(led->pin.gpio, led->pin.init.GPIO_Pin) == Bit_SET) {
PIOS_LED_On(led_id); if (led->active_high)
PIOS_LED_Off(led_id);
else
PIOS_LED_On(led_id);
} else { } else {
PIOS_LED_Off(led_id); if (led->active_high)
PIOS_LED_On(led_id);
else
PIOS_LED_Off(led_id);
} }
} }

20
flight/PiOS/STM32F4xx/pios_led.c
View File

@ -77,7 +77,10 @@ void PIOS_LED_On(uint32_t led_id)
const struct pios_led * led = &(led_cfg->leds[led_id]); const struct pios_led * led = &(led_cfg->leds[led_id]);
GPIO_ResetBits(led->pin.gpio, led->pin.init.GPIO_Pin); if (led->active_high)
GPIO_SetBits(led->pin.gpio, led->pin.init.GPIO_Pin);
else
GPIO_ResetBits(led->pin.gpio, led->pin.init.GPIO_Pin);
} }
/** /**
@ -95,7 +98,10 @@ void PIOS_LED_Off(uint32_t led_id)
const struct pios_led * led = &(led_cfg->leds[led_id]); const struct pios_led * led = &(led_cfg->leds[led_id]);
GPIO_SetBits(led->pin.gpio, led->pin.init.GPIO_Pin); if (led->active_high)
GPIO_ResetBits(led->pin.gpio, led->pin.init.GPIO_Pin);
else
GPIO_SetBits(led->pin.gpio, led->pin.init.GPIO_Pin);
} }
/** /**
@ -114,9 +120,15 @@ void PIOS_LED_Toggle(uint32_t led_id)
const struct pios_led * led = &(led_cfg->leds[led_id]); const struct pios_led * led = &(led_cfg->leds[led_id]);
if (GPIO_ReadOutputDataBit(led->pin.gpio, led->pin.init.GPIO_Pin) == Bit_SET) { if (GPIO_ReadOutputDataBit(led->pin.gpio, led->pin.init.GPIO_Pin) == Bit_SET) {
PIOS_LED_On(led_id); if (led->active_high)
PIOS_LED_Off(led_id);
else
PIOS_LED_On(led_id);
} else { } else {
PIOS_LED_Off(led_id); if (led->active_high)
PIOS_LED_On(led_id);
else
PIOS_LED_Off(led_id);
} }
} }

1
flight/PiOS/inc/pios_led_priv.h
View File

@ -37,6 +37,7 @@
struct pios_led { struct pios_led {
struct stm32_gpio pin; struct stm32_gpio pin;
uint32_t remap; uint32_t remap;
bool active_high;
}; };
struct pios_led_cfg { struct pios_led_cfg {

3
flight/SimPosix/Makefile
View File

@ -141,6 +141,9 @@ SRC += $(FLIGHTLIB)/paths.c
SRC += $(MATHLIB)/sin_lookup.c SRC += $(MATHLIB)/sin_lookup.c
SRC += $(MATHLIB)/pid.c SRC += $(MATHLIB)/pid.c
SRC += $(MATHLIB)/sin_lookup.c
SRC += $(MATHLIB)/pid.c
## PIOS Hardware (STM32F4xx) ## PIOS Hardware (STM32F4xx)
include $(PIOS)/posix/library.mk include $(PIOS)/posix/library.mk