mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
Merge remote-tracking branch 'op-public/next' into revo-next
This commit is contained in:
commit
ffe88eec5e
2
Makefile
2
Makefile
@ -160,7 +160,7 @@ $(BUILD_DIR):
|
||||
###############################################################
|
||||
|
||||
# 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
|
||||
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
|
||||
|
@ -93,7 +93,10 @@ void PIOS_LED_On(uint32_t 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]);
|
||||
|
||||
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]);
|
||||
|
||||
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 {
|
||||
PIOS_LED_Off(led_id);
|
||||
if (led->active_high)
|
||||
PIOS_LED_On(led_id);
|
||||
else
|
||||
PIOS_LED_Off(led_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -77,7 +77,10 @@ void PIOS_LED_On(uint32_t 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]);
|
||||
|
||||
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]);
|
||||
|
||||
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 {
|
||||
PIOS_LED_Off(led_id);
|
||||
if (led->active_high)
|
||||
PIOS_LED_On(led_id);
|
||||
else
|
||||
PIOS_LED_Off(led_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -37,6 +37,7 @@
|
||||
struct pios_led {
|
||||
struct stm32_gpio pin;
|
||||
uint32_t remap;
|
||||
bool active_high;
|
||||
};
|
||||
|
||||
struct pios_led_cfg {
|
||||
|
@ -141,6 +141,9 @@ SRC += $(FLIGHTLIB)/paths.c
|
||||
SRC += $(MATHLIB)/sin_lookup.c
|
||||
SRC += $(MATHLIB)/pid.c
|
||||
|
||||
SRC += $(MATHLIB)/sin_lookup.c
|
||||
SRC += $(MATHLIB)/pid.c
|
||||
|
||||
## PIOS Hardware (STM32F4xx)
|
||||
include $(PIOS)/posix/library.mk
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user