rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change button code For SPRACINGF3MINI and OMNIBUS targets to new IO

This commit is contained in:
Michael Jakob 2016-12-09 19:56:28 +01:00
parent 590b01a77e
commit fcb3ebf066
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/main.c
View File

@ -35,7 +35,6 @@
#include "drivers/sensor.h" #include "drivers/sensor.h"
#include "drivers/system.h" #include "drivers/system.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/gpio.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/light_led.h" #include "drivers/light_led.h"
#include "drivers/sound_beeper.h" #include "drivers/sound_beeper.h"
@ -188,28 +187,22 @@ void init(void)
#endif #endif
#if defined(BUTTONS) #if defined(BUTTONS)
gpio_config_t buttonAGpioConfig = { IO_t buttonAPin = IOGetByTag(IO_TAG(BUTTON_A_PIN));
BUTTON_A_PIN, IOInit(buttonAPin, OWNER_SYSTEM, 0);
Mode_IPU, IOConfigGPIO(buttonAPin, IOCFG_IPU);
Speed_2MHz
};
gpioInit(BUTTON_A_PORT, &buttonAGpioConfig);
gpio_config_t buttonBGpioConfig = { IO_t buttonBPin = IOGetByTag(IO_TAG(BUTTON_B_PIN));
BUTTON_B_PIN, IOInit(buttonBPin, OWNER_SYSTEM, 0);
Mode_IPU, IOConfigGPIO(buttonBPin, IOCFG_IPU);
Speed_2MHz
};
gpioInit(BUTTON_B_PORT, &buttonBGpioConfig);
// Check status of bind plug and exit if not active // Check status of bind plug and exit if not active
delayMicroseconds(10); // allow GPIO configuration to settle delayMicroseconds(10); // allow configuration to settle
if (!isMPUSoftReset()) { if (!isMPUSoftReset()) {
uint8_t secondsRemaining = 5; uint8_t secondsRemaining = 5;
bool bothButtonsHeld; bool bothButtonsHeld;
do { do {
bothButtonsHeld = !digitalIn(BUTTON_A_PORT, BUTTON_A_PIN) && !digitalIn(BUTTON_B_PORT, BUTTON_B_PIN); bothButtonsHeld = !IORead(buttonAPin) && !IORead(buttonBPin);
if (bothButtonsHeld) { if (bothButtonsHeld) {
if (--secondsRemaining == 0) { if (--secondsRemaining == 0) {
resetEEPROM(); resetEEPROM();

6
src/main/target/OMNIBUS/target.h
View File

@ -171,10 +171,8 @@
#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_CURRENT_METER | FEATURE_BLACKBOX) #define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_CURRENT_METER | FEATURE_BLACKBOX)
#define BUTTONS #define BUTTONS
#define BUTTON_A_PORT GPIOB #define BUTTON_A_PIN PB1
#define BUTTON_A_PIN Pin_1 #define BUTTON_B_PIN PB0
#define BUTTON_B_PORT GPIOB
#define BUTTON_B_PIN Pin_0
#define AVOID_UART3_FOR_PWM_PPM #define AVOID_UART3_FOR_PWM_PPM

6
src/main/target/SPRACINGF3MINI/target.h
View File

@ -147,10 +147,8 @@
#define DEFAULT_FEATURES FEATURE_BLACKBOX #define DEFAULT_FEATURES FEATURE_BLACKBOX
#define BUTTONS #define BUTTONS
#define BUTTON_A_PORT GPIOB #define BUTTON_A_PIN PB1
#define BUTTON_A_PIN Pin_1 #define BUTTON_B_PIN PB0
#define BUTTON_B_PORT GPIOB
#define BUTTON_B_PIN Pin_0
#define SPEKTRUM_BIND #define SPEKTRUM_BIND
// USART3, // USART3,