Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

add pull_up to names, change pg config to array of elements, use correct DEFs

Browse source
This commit is contained in:
Johannes Kasberger 2019-08-15 18:59:28 +02:00
parent cc9687a2bf
commit 6a713a0340
8 changed files with 54 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/source.mk
View file

@ -31,7 +31,7 @@ COMMON_SRC = \
drivers/mco.c \ drivers/mco.c \
drivers/motor.c \ drivers/motor.c \
drivers/pinio.c \ drivers/pinio.c \
drivers/pin_up_down.c \ drivers/pin_pull_up_down.c \
drivers/resource.c \ drivers/resource.c \
drivers/rcc.c \ drivers/rcc.c \
drivers/serial.c \ drivers/serial.c \

8
src/main/cli/cli.c
View file

@ -137,6 +137,7 @@ bool cliMode = false;
#include "pg/mco.h" #include "pg/mco.h"
#include "pg/motor.h" #include "pg/motor.h"
#include "pg/pinio.h" #include "pg/pinio.h"
#include "pg/pin_pull_up_down.h"
#include "pg/pg.h" #include "pg/pg.h"
#include "pg/pg_ids.h" #include "pg/pg_ids.h"
#include "pg/rx.h" #include "pg/rx.h"
@ -149,7 +150,6 @@ bool cliMode = false;
#include "pg/timerup.h" #include "pg/timerup.h"
#include "pg/usb.h" #include "pg/usb.h"
#include "pg/vtx_table.h" #include "pg/vtx_table.h"
#include "pg/pin_up_down.h"
#include "rx/rx.h" #include "rx/rx.h"
#include "rx/spektrum.h" #include "rx/spektrum.h"
@ -4914,9 +4914,9 @@ const cliResourceValue_t resourceTable[] = {
DEFS( OWNER_VTX_DATA, PG_VTX_IO_CONFIG, vtxIOConfig_t, dataTag ), DEFS( OWNER_VTX_DATA, PG_VTX_IO_CONFIG, vtxIOConfig_t, dataTag ),
DEFS( OWNER_VTX_CLK, PG_VTX_IO_CONFIG, vtxIOConfig_t, clockTag ), DEFS( OWNER_VTX_CLK, PG_VTX_IO_CONFIG, vtxIOConfig_t, clockTag ),
#endif #endif
#ifdef USE_PIN_UP_DOWN #ifdef USE_PIN_PULL_UP_DOWN
DEFA( OWNER_PULLUP, PG_PULLUP_CONFIG, pinUpDownConfig_t, ioTag, PIN_UP_DOWN_COUNT ), DEFA( OWNER_PULLUP, PG_PULLUP_CONFIG, pinPullUpDownConfig_t, ioTag, PIN_PULL_UP_DOWN_COUNT ),
DEFA( OWNER_PULLDOWN, PG_PULLDOWN_CONFIG, pinUpDownConfig_t, ioTag, PIN_UP_DOWN_COUNT ), DEFA( OWNER_PULLDOWN, PG_PULLDOWN_CONFIG, pinPullUpDownConfig_t, ioTag, PIN_PULL_UP_DOWN_COUNT ),
#endif #endif
}; };

35
src/main/drivers/pin_up_down.c → src/main/drivers/pin_pull_up_down.c
View file

@ -22,41 +22,36 @@
#include "platform.h" #include "platform.h"
#ifdef USE_PIN_UP_DOWN #ifdef USE_PIN_PULL_UP_DOWN
#include "build/debug.h" #include "build/debug.h"
#include "pg/pin_up_down.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "pg/pin_pull_up_down.h"
#include "pin_pull_up_down.h"
static void initPins(const pinUpDownConfig_t * config, resourceOwner_e owner)
static void initPin(const pinPullUpDownConfig_t* config, resourceOwner_e owner, uint8_t index)
{ {
for (int i = 0; i < PIN_UP_DOWN_COUNT; i++) { IO_t io = IOGetByTag(config->ioTag);
IO_t io = IOGetByTag(config->ioTag[i]);
if (!io) { if (!io) {
continue; return;
} }
IOInit(io, OWNER_PINIO, RESOURCE_INDEX(i)); IOInit(io, owner, RESOURCE_INDEX(index));
if (owner == OWNER_PULLUP) { if (owner == OWNER_PULLUP) {
IOConfigGPIO(io, IOCFG_IPU); IOConfigGPIO(io, IOCFG_IPU);
} else if (owner == OWNER_PULLDOWN) { } else if (owner == OWNER_PULLDOWN) {
IOConfigGPIO(io, IOCFG_IPD); IOConfigGPIO(io, IOCFG_IPD);
} }
}
void pinPullupPulldownInit()
{
for (uint8_t i = 0; i < PIN_PULL_UP_DOWN_COUNT; i++) {
initPin(pinPullupConfig(i), OWNER_PULLUP, i);
initPin(pinPulldownConfig(i), OWNER_PULLDOWN, i);
} }
} }
void pinPullupInit(const pinUpDownConfig_t * pullupConfig)
{
initPins(pullupConfig, OWNER_PULLUP);
}
void pinPulldownInit(const pinUpDownConfig_t * pulldownConfig)
{
initPins(pulldownConfig, OWNER_PULLDOWN);
}
#endif #endif

9
src/main/drivers/pin_up_down.h → src/main/drivers/pin_pull_up_down.h
View file

@ -22,11 +22,10 @@
#include <stdbool.h> #include <stdbool.h>
#ifndef PIN_UP_DOWN_COUNT #ifndef PIN_PULL_UP_DOWN_COUNT
#define PIN_UP_DOWN_COUNT 2 #define PIN_PULL_UP_DOWN_COUNT 4
#endif #endif
struct pinUpDownConfig_s; struct pinPullUpDownConfig_s;
void pinPullupInit(const struct pinUpDownConfig_s *pinUpDownConfig); void pinPullupPulldownInit();
void pinPulldownInit(const struct pinUpDownConfig_s *pinUpDownConfig);

9
src/main/fc/init.c
View file

@ -59,6 +59,7 @@
#include "drivers/mco.h" #include "drivers/mco.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/persistent.h" #include "drivers/persistent.h"
#include "drivers/pin_pull_up_down.h"
#include "drivers/pwm_esc_detect.h" #include "drivers/pwm_esc_detect.h"
#include "drivers/pwm_output.h" #include "drivers/pwm_output.h"
#include "drivers/rx/rx_pwm.h" #include "drivers/rx/rx_pwm.h"
@ -80,7 +81,6 @@
#include "drivers/vtx_common.h" #include "drivers/vtx_common.h"
#include "drivers/vtx_rtc6705.h" #include "drivers/vtx_rtc6705.h"
#include "drivers/vtx_table.h" #include "drivers/vtx_table.h"
#include "drivers/pin_up_down.h"
#include "fc/board_info.h" #include "fc/board_info.h"
#include "fc/config.h" #include "fc/config.h"
@ -141,6 +141,7 @@
#include "pg/motor.h" #include "pg/motor.h"
#include "pg/pinio.h" #include "pg/pinio.h"
#include "pg/piniobox.h" #include "pg/piniobox.h"
#include "pg/pin_pull_up_down.h"
#include "pg/pg.h" #include "pg/pg.h"
#include "pg/rx.h" #include "pg/rx.h"
#include "pg/rx_spi.h" #include "pg/rx_spi.h"
@ -148,7 +149,6 @@
#include "pg/sdcard.h" #include "pg/sdcard.h"
#include "pg/vcd.h" #include "pg/vcd.h"
#include "pg/vtx_io.h" #include "pg/vtx_io.h"
#include "pg/pin_up_down.h"
#include "rx/rx.h" #include "rx/rx.h"
#include "rx/rx_spi.h" #include "rx/rx_spi.h"
@ -696,9 +696,8 @@ void init(void)
pinioInit(pinioConfig()); pinioInit(pinioConfig());
#endif #endif
#ifdef USE_PIN_UP_DOWN #ifdef USE_PIN_PULL_UP_DOWN
pinPullupInit(pinPullupConfig()); pinPullupPulldownInit();
pinPulldownInit(pinPulldownConfig());
#endif #endif
#ifdef USE_PINIOBOX #ifdef USE_PINIOBOX

31
src/main/pg/pin_up_down.c → src/main/pg/pin_pull_up_down.c
View file

@ -20,26 +20,23 @@
#include "platform.h" #include "platform.h"
#ifdef USE_PINIO #ifdef USE_PIN_PULL_UP_DOWN
#include "pg/pg_ids.h"
#include "pin_up_down.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "pg/pg_ids.h"
#include "pin_pull_up_down.h"
PG_REGISTER_WITH_RESET_TEMPLATE(pinUpDownConfig_t, pinPullupConfig, PG_PULLUP_CONFIG, 0); PG_REGISTER_ARRAY_WITH_RESET_FN(pinPullUpDownConfig_t, PIN_PULL_UP_DOWN_COUNT, pinPullupConfig, PG_PULLUP_CONFIG, 0);
PG_REGISTER_WITH_RESET_TEMPLATE(pinUpDownConfig_t, pinPulldownConfig, PG_PULLDOWN_CONFIG, 0);
PG_RESET_TEMPLATE(pinUpDownConfig_t, pinPullupConfig, void pgResetFn_pinPullupConfig(pinPullUpDownConfig_t *config)
.ioTag = { {
IO_TAG(NONE), config->ioTag = IO_TAG(NONE);
IO_TAG(NONE), }
}
);
PG_RESET_TEMPLATE(pinUpDownConfig_t, pinPulldownConfig, PG_REGISTER_ARRAY_WITH_RESET_FN(pinPullUpDownConfig_t, PIN_PULL_UP_DOWN_COUNT, pinPulldownConfig, PG_PULLDOWN_CONFIG, 0);
.ioTag = {
IO_TAG(NONE), void pgResetFn_pinPulldownConfig(pinPullUpDownConfig_t *config)
IO_TAG(NONE), {
} config->ioTag = IO_TAG(NONE);
); }
#endif #endif

15
src/main/pg/pin_up_down.h → src/main/pg/pin_pull_up_down.h
View file

@ -20,14 +20,13 @@
#pragma once #pragma once
#include "../drivers/pin_up_down.h"
#include "pg/pg.h"
#include "drivers/io_types.h" #include "drivers/io_types.h"
#include "drivers/pin_pull_up_down.h"
#include "pg/pg.h"
typedef struct pinUpDownConfig_s { typedef struct pinPullUpDownConfig_s {
ioTag_t ioTag[PIN_UP_DOWN_COUNT]; ioTag_t ioTag;
} pinUpDownConfig_t; } pinPullUpDownConfig_t;
PG_DECLARE(pinUpDownConfig_t, pinPullupConfig); PG_DECLARE_ARRAY(pinPullUpDownConfig_t, PIN_PULL_UP_DOWN_COUNT, pinPullupConfig);
PG_DECLARE(pinUpDownConfig_t, pinPulldownConfig); PG_DECLARE_ARRAY(pinPullUpDownConfig_t, PIN_PULL_UP_DOWN_COUNT, pinPulldownConfig);

2
src/main/target/common_pre.h
View file

@ -264,7 +264,6 @@
#define USE_HUFFMAN #define USE_HUFFMAN
#define USE_PINIO #define USE_PINIO
#define USE_PINIOBOX #define USE_PINIOBOX
#define USE_PIN_UP_DOWN
#endif #endif
#if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 3)) #if ((FLASH_SIZE > 256) || (FEATURE_CUT_LEVEL < 3))
@ -277,6 +276,7 @@
#define USE_SPEKTRUM_VTX_CONTROL #define USE_SPEKTRUM_VTX_CONTROL
#define USE_SPEKTRUM_VTX_TELEMETRY #define USE_SPEKTRUM_VTX_TELEMETRY
#define USE_SPEKTRUM_CMS_TELEMETRY #define USE_SPEKTRUM_CMS_TELEMETRY
#define USE_PIN_PULL_UP_DOWN
#endif #endif
#endif #endif