xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove metro52 define, remove 1s forced DFU when startup

Browse Source
This commit is contained in:
hathach 2018-07-05 13:40:40 +07:00
parent 928379430a
commit 63fe2ffeac
1 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main.c
View File

@ -131,35 +131,12 @@ bool button_pressed(uint32_t pin)
static void led_pin_init(uint32_t pin) static void led_pin_init(uint32_t pin)
{ {
#ifdef BOARD_METRO52
// LED BLUE is muxed with FRESET. We need to make sure it is
// not wired to GND before configuring it as output.
// Only check if it is not yet configured as OUTPUT
if (pin == LED_BLUE && !bit_test(NRF_GPIO->PIN_CNF[pin], GPIO_PIN_CNF_DIR_Pos))
{
// skip and configure as input if grounded instead of output !!!
if ( button_pressed(pin) ) return;
}
#endif
nrf_gpio_cfg_output(pin); nrf_gpio_cfg_output(pin);
led_off(pin); led_off(pin);
} }
void led_control(uint32_t pin, bool state) void led_control(uint32_t pin, bool state)
{ {
#ifdef BOARD_METRO52
// Skip if LED_BLUE is configured as input and wiring to GND
// Otherwise configure it as output (it may just transition from hardware GND to open)
if ( pin == LED_2 && !bit_test(NRF_GPIO->PIN_CNF[pin], GPIO_PIN_CNF_DIR_Pos) )
{
if ( button_pressed(pin) ) return;
// configure as output
nrf_gpio_cfg_output(pin);
}
#endif
nrf_gpio_pin_write(pin, state ? LED_STATE_ON : (1-LED_STATE_ON)); nrf_gpio_pin_write(pin, state ? LED_STATE_ON : (1-LED_STATE_ON));
} }
@ -357,49 +334,21 @@ int main(void)
tusb_init(); tusb_init();
/*------------- Determine DFU mode (Serial, OTA, FRESET or normal) -------------*/ /*------------- Determine DFU mode (Serial, OTA, FRESET or normal) -------------*/
/* For metro52 LED_BLUE is muxed with FRESET. We only init FRESET BUTTON
* as needed and reconfigure as LED BLUE when done. */
#ifdef BOARD_METRO52
button_pin_init(FRESET_BUTTON);
nrf_delay_us(100); // wait for the pin state is stable
#endif
// DFU button pressed // DFU button pressed
dfu_start = dfu_start || button_pressed(BOOTLOADER_BUTTON); dfu_start = dfu_start || button_pressed(BOOTLOADER_BUTTON);
// DFU + FRESET are pressed --> OTA // DFU + FRESET are pressed --> OTA
_ota_update = _ota_update || ( button_pressed(BOOTLOADER_BUTTON) && button_pressed(FRESET_BUTTON) ) ; _ota_update = _ota_update || ( button_pressed(BOOTLOADER_BUTTON) && button_pressed(FRESET_BUTTON) ) ;
#ifdef BOARD_METRO52
led_pin_init(LED_BLUE);
#endif
if (dfu_start || (!bootloader_app_is_valid(DFU_BANK_0_REGION_START))) if (dfu_start || (!bootloader_app_is_valid(DFU_BANK_0_REGION_START)))
{ {
// Initiate an update of the firmware. // Initiate an update of the firmware.
APP_ERROR_CHECK( bootloader_dfu_start(_ota_update, 0) ); APP_ERROR_CHECK( bootloader_dfu_start(_ota_update, 0) );
} }
else
{
/* Adafruit Modification
* Even DFU is not active, we still force an 1000 ms dfu serial mode when startup
* to support auto programming from Arduino IDE */
(void) bootloader_dfu_start(false, BOOTLOADER_STARTUP_DFU_INTERVAL);
}
/*------------- Adafruit Factory reset -------------*/ /*------------- Adafruit Factory reset -------------*/
#ifdef BOARD_METRO52
button_pin_init(FRESET_BUTTON);
nrf_delay_us(100); // wait for the pin state is stable
#endif
bool is_freset = ( !button_pressed(BOOTLOADER_BUTTON) && button_pressed(FRESET_BUTTON) ); bool is_freset = ( !button_pressed(BOOTLOADER_BUTTON) && button_pressed(FRESET_BUTTON) );
#ifdef BOARD_METRO52
led_pin_init(LED_BLUE);
#endif
if (is_freset) if (is_freset)
{ {
adafruit_factory_reset(); adafruit_factory_reset();