84a8f7ea6d
This fixes the build for some esp32 and nrf boards (for example
`ARDUINO_NANO_33_BLE_SENSE` and `ARDUINO_NANO_ESP32`) due to commit
c98789a6d8. Changes are:
- Allow the CDC TX/RX functions in `mp_usbd_cdc.c` to be enabled
separately to those needed for `MICROPY_HW_USB_CDC_1200BPS_TOUCH`.
- Add `MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC` option as a temporary
workaround for the nrf port to use.
- Declare `mp_usbd_line_state_cb()` in a header as a public function.
- Fix warning with type cast of `.callback_line_state_changed`.
Signed-off-by: Damien George <damien@micropython.org>
125 lines
4.3 KiB
C
125 lines
4.3 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2023 Arduino SA
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include "py/mphal.h"
|
|
#include "shared/tinyusb/mp_usbd_cdc.h"
|
|
|
|
#include <esp_system.h>
|
|
#include <esp_ota_ops.h>
|
|
#include <esp_partition.h>
|
|
|
|
#include "double_tap.h"
|
|
#include "usb.h"
|
|
|
|
#include "tinyusb.h"
|
|
#include "tusb_cdc_acm.h"
|
|
|
|
#define LED_RED GPIO_NUM_46
|
|
#define LED_GREEN GPIO_NUM_0
|
|
#define LED_BLUE GPIO_NUM_45
|
|
#define DELAY_US 60000
|
|
|
|
static bool _recovery_marker_found; // double tap detected
|
|
static bool _recovery_active; // running from factory partition
|
|
|
|
static void rgb_pulse_delay() {
|
|
// initialize RGB signals from weak pinstraps
|
|
mp_hal_pin_output(LED_RED);
|
|
mp_hal_pin_output(LED_GREEN);
|
|
mp_hal_pin_output(LED_BLUE);
|
|
|
|
static const uint8_t SEQ[] = { 1, 3, 2, 6, 7, 5, 4, 5, 7, 6, 2, 3, 1 };
|
|
for (int idx = 0; idx < sizeof(SEQ); ++idx) {
|
|
int v = SEQ[idx & 7];
|
|
mp_hal_pin_write(LED_RED, !(v & 1));
|
|
mp_hal_pin_write(LED_GREEN, !(v & 2));
|
|
mp_hal_pin_write(LED_BLUE, !(v & 4));
|
|
|
|
// busy wait, we can't use task delay yet
|
|
mp_hal_delay_us_fast(DELAY_US);
|
|
}
|
|
|
|
// reset pins to digital HIGH before leaving
|
|
mp_hal_pin_write(LED_RED, 1);
|
|
mp_hal_pin_write(LED_GREEN, 1);
|
|
mp_hal_pin_write(LED_BLUE, 1);
|
|
}
|
|
|
|
void NANO_ESP32_enter_bootloader(void) {
|
|
if (!_recovery_active) {
|
|
// check for valid partition scheme
|
|
const esp_partition_t *ota_part = esp_ota_get_next_update_partition(NULL);
|
|
const esp_partition_t *fact_part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_FACTORY, NULL);
|
|
if (ota_part && fact_part) {
|
|
// set tokens so the recovery FW will find them
|
|
double_tap_mark();
|
|
// invalidate other OTA image
|
|
esp_partition_erase_range(ota_part, 0, 4096);
|
|
// activate factory partition
|
|
esp_ota_set_boot_partition(fact_part);
|
|
}
|
|
}
|
|
|
|
esp_restart();
|
|
}
|
|
|
|
void NANO_ESP32_usb_callback_line_state_changed(int itf, void *event_in) {
|
|
cdcacm_event_t *event = event_in;
|
|
mp_usbd_line_state_cb(itf, event->line_state_changed_data.dtr, event->line_state_changed_data.rts);
|
|
}
|
|
|
|
void NANO_ESP32_board_startup(void) {
|
|
boardctrl_startup();
|
|
|
|
// mark current partition as valid
|
|
const esp_partition_t *running = esp_ota_get_running_partition();
|
|
esp_ota_img_states_t ota_state;
|
|
if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK) {
|
|
if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) {
|
|
esp_ota_mark_app_valid_cancel_rollback();
|
|
}
|
|
}
|
|
|
|
const esp_partition_t *part = esp_ota_get_running_partition();
|
|
_recovery_active = (part->subtype == ESP_PARTITION_SUBTYPE_APP_FACTORY);
|
|
|
|
double_tap_init();
|
|
|
|
_recovery_marker_found = double_tap_check_match();
|
|
if (_recovery_marker_found && !_recovery_active) {
|
|
// double tap detected in user application, reboot to factory
|
|
NANO_ESP32_enter_bootloader();
|
|
}
|
|
|
|
// delay with mark set then proceed
|
|
// - for normal startup, to detect first double tap
|
|
// - in recovery mode, to ignore several short presses
|
|
double_tap_mark();
|
|
rgb_pulse_delay();
|
|
double_tap_invalidate();
|
|
}
|