sd detect pin feature (#222)
* test sd detect pin * sd detect support for f2 board
This commit is contained in:
parent
748f7e4fc3
commit
49fdb28871
@ -51,6 +51,13 @@ void fatfs_list(void* p) {
|
|||||||
|
|
||||||
furi_log = get_default_log();
|
furi_log = get_default_log();
|
||||||
fuprintf(furi_log, "[fatfs_list] app start\n");
|
fuprintf(furi_log, "[fatfs_list] app start\n");
|
||||||
|
fuprintf(furi_log, "[fatfs_list] wait for sd insert\n");
|
||||||
|
|
||||||
|
while(!hal_gpio_read_sd_detect()) {
|
||||||
|
delay(100);
|
||||||
|
}
|
||||||
|
|
||||||
|
fuprintf(furi_log, "[fatfs_list] sd inserted\n");
|
||||||
|
|
||||||
FuriRecordSubscriber* fb_record =
|
FuriRecordSubscriber* fb_record =
|
||||||
furi_open_deprecated("u8g2_fb", false, false, NULL, NULL, NULL);
|
furi_open_deprecated("u8g2_fb", false, false, NULL, NULL, NULL);
|
||||||
|
@ -2,6 +2,7 @@ PROJECT_ROOT = $(abspath $(dir $(abspath $(firstword $(MAKEFILE_LIST))))..)
|
|||||||
PROJECT = bootloader
|
PROJECT = bootloader
|
||||||
|
|
||||||
include $(PROJECT_ROOT)/make/base.mk
|
include $(PROJECT_ROOT)/make/base.mk
|
||||||
|
include $(PROJECT_ROOT)/make/git.mk
|
||||||
|
|
||||||
CFLAGS += -Itargets/include
|
CFLAGS += -Itargets/include
|
||||||
ASM_SOURCES += $(wildcard src/*.s)
|
ASM_SOURCES += $(wildcard src/*.s)
|
||||||
|
@ -7,6 +7,7 @@ CPPFLAGS += -Werror
|
|||||||
include $(PROJECT_ROOT)/make/base.mk
|
include $(PROJECT_ROOT)/make/base.mk
|
||||||
include $(PROJECT_ROOT)/assets/assets.mk
|
include $(PROJECT_ROOT)/assets/assets.mk
|
||||||
include $(PROJECT_ROOT)/core/core.mk
|
include $(PROJECT_ROOT)/core/core.mk
|
||||||
|
include $(PROJECT_ROOT)/make/git.mk
|
||||||
include $(PROJECT_ROOT)/applications/applications.mk
|
include $(PROJECT_ROOT)/applications/applications.mk
|
||||||
include $(PROJECT_ROOT)/lib/lib.mk
|
include $(PROJECT_ROOT)/lib/lib.mk
|
||||||
|
|
||||||
|
@ -12,3 +12,7 @@ void hal_gpio_init(GpioPin* gpio, GpioMode mode, GpioPull pull, GpioSpeed speed)
|
|||||||
|
|
||||||
HAL_GPIO_Init(gpio->port, &GPIO_InitStruct);
|
HAL_GPIO_Init(gpio->port, &GPIO_InitStruct);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool hal_gpio_read_sd_detect(void) {
|
||||||
|
return true;
|
||||||
|
}
|
@ -58,4 +58,6 @@ static inline bool hal_gpio_read(const GpioPin* gpio) {
|
|||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool hal_gpio_read_sd_detect(void);
|
@ -1,4 +1,5 @@
|
|||||||
#include "api-hal-gpio.h"
|
#include "api-hal-gpio.h"
|
||||||
|
#include "api-hal-resources.h"
|
||||||
|
|
||||||
// init GPIO
|
// init GPIO
|
||||||
void hal_gpio_init(GpioPin* gpio, GpioMode mode, GpioPull pull, GpioSpeed speed) {
|
void hal_gpio_init(GpioPin* gpio, GpioMode mode, GpioPull pull, GpioSpeed speed) {
|
||||||
@ -12,3 +13,24 @@ void hal_gpio_init(GpioPin* gpio, GpioMode mode, GpioPull pull, GpioSpeed speed)
|
|||||||
|
|
||||||
HAL_GPIO_Init(gpio->port, &GPIO_InitStruct);
|
HAL_GPIO_Init(gpio->port, &GPIO_InitStruct);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool hal_gpio_read_sd_detect(void) {
|
||||||
|
bool result = false;
|
||||||
|
// create pin
|
||||||
|
GpioPin sd_cs_pin = sd_cs_gpio;
|
||||||
|
// TODO open record
|
||||||
|
GpioPin* sd_cs_record = &sd_cs_pin;
|
||||||
|
|
||||||
|
// configure pin as input
|
||||||
|
gpio_init_ex(sd_cs_record, GpioModeInput, GpioPullUp, GpioSpeedVeryHigh);
|
||||||
|
delay(50);
|
||||||
|
|
||||||
|
// if gpio_read == 0 return true else return false
|
||||||
|
result = !gpio_read(sd_cs_record);
|
||||||
|
|
||||||
|
// configure pin back
|
||||||
|
gpio_init_ex(sd_cs_record, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
|
||||||
|
delay(50);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
@ -58,4 +58,6 @@ static inline bool hal_gpio_read(const GpioPin* gpio) {
|
|||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool hal_gpio_read_sd_detect(void);
|
@ -24,4 +24,5 @@ const GpioPin led_gpio[3] = {
|
|||||||
{LED_GREEN_GPIO_Port, LED_GREEN_Pin},
|
{LED_GREEN_GPIO_Port, LED_GREEN_Pin},
|
||||||
{LED_BLUE_GPIO_Port, LED_BLUE_Pin}};
|
{LED_BLUE_GPIO_Port, LED_BLUE_Pin}};
|
||||||
|
|
||||||
const GpioPin backlight_gpio = {DISPLAY_BACKLIGHT_GPIO_Port, DISPLAY_BACKLIGHT_Pin};
|
const GpioPin backlight_gpio = {DISPLAY_BACKLIGHT_GPIO_Port, DISPLAY_BACKLIGHT_Pin};
|
||||||
|
const GpioPin sd_cs_gpio = {SD_CS_GPIO_Port, SD_CS_Pin};
|
||||||
|
@ -9,4 +9,5 @@ extern const GpioPin input_gpio[GPIO_INPUT_PINS_COUNT];
|
|||||||
extern const bool input_invert[GPIO_INPUT_PINS_COUNT];
|
extern const bool input_invert[GPIO_INPUT_PINS_COUNT];
|
||||||
|
|
||||||
extern const GpioPin led_gpio[3];
|
extern const GpioPin led_gpio[3];
|
||||||
extern const GpioPin backlight_gpio;
|
extern const GpioPin backlight_gpio;
|
||||||
|
extern const GpioPin sd_cs_gpio;
|
||||||
|
@ -4,4 +4,4 @@ GIT_BRANCH_NUM = $(shell git rev-list --count $(GIT_BRANCH) || echo 'nan')
|
|||||||
BUILD_DATE = $(shell date '+%d-%m-%Y' || echo 'unknown')
|
BUILD_DATE = $(shell date '+%d-%m-%Y' || echo 'unknown')
|
||||||
|
|
||||||
CFLAGS += -DGIT_COMMIT="\"$(GIT_COMMIT)\"" -DGIT_BRANCH="\"$(GIT_BRANCH)\"" -DGIT_BRANCH_NUM="\"$(GIT_BRANCH_NUM)\""
|
CFLAGS += -DGIT_COMMIT="\"$(GIT_COMMIT)\"" -DGIT_BRANCH="\"$(GIT_BRANCH)\"" -DGIT_BRANCH_NUM="\"$(GIT_BRANCH_NUM)\""
|
||||||
CFLAGS += -DBUILD_DATE="\"$(BUILD_DATE)\"" -DTARGET="\"$(TARGET)\""
|
CFLAGS += -DBUILD_DATE="\"$(BUILD_DATE)\"" -DTARGET="\"$(TARGET)\""
|
||||||
|
Loading…
Reference in New Issue
Block a user