mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2024-12-22 04:41:36 +03:00
e02040107b
* WIP on stripping fw * Compact FW build - use RAM_EXEC=1 COMPACT=1 DEBUG=0 * Fixed uninitialized storage struct; small fixes to compact fw * Flasher srv w/mocked flash ops * Fixed typos & accomodated FFF changes * Alternative fw startup branch * Working load & jmp to RAM fw * +manifest processing for stage loader; + crc verification for stage payload * Fixed questionable code & potential leaks * Lowered screen update rate; added radio stack update stubs; working dfu write * Console EP with manifest & stage validation * Added microtar lib; minor ui fixes for updater * Removed microtar * Removed mtar #2 * Added a better version of microtar * TAR archive api; LFS backup & restore core * Recursive backup/restore * LFS worker thread * Added system apps to loader - not visible in UI; full update process with restarts * Typo fix * Dropped BL & f6; tooling for updater WIP * Minor py fixes * Minor fixes to make it build after merge * Ported flash workaround from BL + fixed visuals * Minor cleanup * Chmod + loader app search fix * Python linter fix * Removed usb stuff & float read support for staged loader == -10% of binary size * Added backup/restore & update pb requests * Added stub impl to RPC for backup/restore/update commands * Reworked TAR to use borrowed Storage api; slightly reduced build size by removing `static string`; hidden update-related RPC behind defines * Moved backup&restore to storage * Fixed new message types * Backup/restore/update RPC impl * Moved furi_hal_crc to LL; minor fixes * CRC HAL rework to LL * Purging STM HAL * Brought back minimal DFU boot mode (no gui); additional crc state checks * Added splash screen, BROKEN usb function * Clock init rework WIP * Stripped graphics from DFU mode * Temp fix for unused static fun * WIP update picker - broken! * Fixed UI * Bumping version * Fixed RTC setup * Backup to update folder instead of ext root * Removed unused scenes & more usb remnants from staged loader * CI updates * Fixed update bundle name * Temporary restored USB handler * Attempt to prevent .text corruption * Comments on how I spent this Saturday * Added update file icon * Documentation updates * Moved common code to lib folder * Storage: more unit tests * Storage: blocking dir open, differentiate file and dir when freed. * Major refactoring; added input processing to updater to allow retrying on failures (not very useful prob). Added API for extraction of thread return value * Removed re-init check for manifest * Changed low-level path manipulation to toolbox/path.h; makefile cleanup; tiny fix in lint.py * Increased update worker stack size * Text fixes in backup CLI * Displaying number of update stages to run; removed timeout in handling errors * Bumping version * Added thread cleanup for spawner thread * Updated build targets to exclude firmware bundle from 'ALL' * Fixed makefile for update_package; skipping VCP init for update mode (ugly) * Switched github build from ALL to update_package * Added +x for dist_update.sh * Cli: add total heap size to "free" command * Moved (RAM) suffix to build version instead of git commit no. * DFU comment * Some fixes suggested by clang-tidy * Fixed recursive PREFIX macro * Makefile: gather all new rules in updater namespace. FuriHal: rename bootloader to boot, isr safe delays * Github: correct build target name in firmware build * FuriHal: move target switch to boot * Makefile: fix firmware flash * Furi, FuriHal: move kernel start to furi, early init * Drop bootloader related stuff * Drop cube. Drop bootloader linker script. * Renamed update_hl, moved constants to #defines * Moved update-related boot mode to separate bitfield * Reworked updater cli to single entry point; fixed crash on tar cleanup * Added Python replacement for dist shell scripts * Linter fixes for dist.py +x * Fixes for environment suffix * Dropped bash scripts * Added dirty build flag to version structure & interfaces * Version string escapes * Fixed flag logic in dist.py; added support for App instances being imported and not terminating the whole program * Fixed fw address in ReadMe.md * Rpc: fix crash on double screen start * Return back original boot behavior and fix jump to system bootloader * Cleanup code, add error sequence for RTC * Update firmware readme * FuriHal: drop boot, restructure RTC registers usage and add header register check * Furi goes first * Toolchain: add ccache support * Renamed update bundle dir Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com> Co-authored-by: あく <alleteam@gmail.com>
311 lines
9.3 KiB
C
311 lines
9.3 KiB
C
#include <furi_hal_usb_cdc_i.h>
|
|
#include <furi_hal.h>
|
|
#include <furi.h>
|
|
#include <stream_buffer.h>
|
|
|
|
#define TAG "FuriHalVcp"
|
|
|
|
#define USB_CDC_PKT_LEN CDC_DATA_SZ
|
|
#define VCP_RX_BUF_SIZE (USB_CDC_PKT_LEN * 3)
|
|
#define VCP_TX_BUF_SIZE (USB_CDC_PKT_LEN * 3)
|
|
|
|
#define VCP_IF_NUM 0
|
|
|
|
typedef enum {
|
|
VcpEvtReserved = (1 << 0), // Reserved for StreamBuffer internal event
|
|
VcpEvtEnable = (1 << 1),
|
|
VcpEvtDisable = (1 << 2),
|
|
VcpEvtConnect = (1 << 3),
|
|
VcpEvtDisconnect = (1 << 4),
|
|
VcpEvtStreamRx = (1 << 5),
|
|
VcpEvtRx = (1 << 6),
|
|
VcpEvtStreamTx = (1 << 7),
|
|
VcpEvtTx = (1 << 8),
|
|
} WorkerEvtFlags;
|
|
|
|
#define VCP_THREAD_FLAG_ALL \
|
|
(VcpEvtEnable | VcpEvtDisable | VcpEvtConnect | VcpEvtDisconnect | VcpEvtRx | VcpEvtTx | \
|
|
VcpEvtStreamRx | VcpEvtStreamTx)
|
|
|
|
typedef struct {
|
|
FuriThread* thread;
|
|
|
|
StreamBufferHandle_t tx_stream;
|
|
StreamBufferHandle_t rx_stream;
|
|
|
|
volatile bool connected;
|
|
|
|
uint8_t data_buffer[USB_CDC_PKT_LEN];
|
|
} FuriHalVcp;
|
|
|
|
static int32_t vcp_worker(void* context);
|
|
static void vcp_on_cdc_tx_complete(void* context);
|
|
static void vcp_on_cdc_rx(void* context);
|
|
static void vcp_state_callback(void* context, uint8_t state);
|
|
static void vcp_on_cdc_control_line(void* context, uint8_t state);
|
|
|
|
static CdcCallbacks cdc_cb = {
|
|
vcp_on_cdc_tx_complete,
|
|
vcp_on_cdc_rx,
|
|
vcp_state_callback,
|
|
vcp_on_cdc_control_line,
|
|
NULL,
|
|
};
|
|
|
|
static FuriHalVcp* vcp = NULL;
|
|
|
|
static const uint8_t ascii_soh = 0x01;
|
|
static const uint8_t ascii_eot = 0x04;
|
|
|
|
void furi_hal_vcp_init() {
|
|
vcp = malloc(sizeof(FuriHalVcp));
|
|
vcp->connected = false;
|
|
|
|
vcp->tx_stream = xStreamBufferCreate(VCP_TX_BUF_SIZE, 1);
|
|
vcp->rx_stream = xStreamBufferCreate(VCP_RX_BUF_SIZE, 1);
|
|
|
|
if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
|
|
FURI_LOG_W(TAG, "Skipped worker init: device in special startup mode=");
|
|
return;
|
|
}
|
|
|
|
vcp->thread = furi_thread_alloc();
|
|
furi_thread_set_name(vcp->thread, "VcpDriver");
|
|
furi_thread_set_stack_size(vcp->thread, 1024);
|
|
furi_thread_set_callback(vcp->thread, vcp_worker);
|
|
furi_thread_start(vcp->thread);
|
|
|
|
FURI_LOG_I(TAG, "Init OK");
|
|
}
|
|
|
|
static int32_t vcp_worker(void* context) {
|
|
bool enabled = true;
|
|
bool tx_idle = false;
|
|
size_t missed_rx = 0;
|
|
uint8_t last_tx_pkt_len = 0;
|
|
|
|
furi_hal_usb_set_config(&usb_cdc_single, NULL);
|
|
furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb, NULL);
|
|
|
|
while(1) {
|
|
uint32_t flags = osThreadFlagsWait(VCP_THREAD_FLAG_ALL, osFlagsWaitAny, osWaitForever);
|
|
furi_assert((flags & osFlagsError) == 0);
|
|
|
|
// VCP enabled
|
|
if((flags & VcpEvtEnable) && !enabled) {
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "Enable");
|
|
#endif
|
|
flags |= VcpEvtTx;
|
|
furi_hal_cdc_set_callbacks(VCP_IF_NUM, &cdc_cb, NULL);
|
|
enabled = true;
|
|
furi_hal_cdc_receive(VCP_IF_NUM, vcp->data_buffer, USB_CDC_PKT_LEN); // flush Rx buffer
|
|
if(furi_hal_cdc_get_ctrl_line_state(VCP_IF_NUM) & (1 << 0)) {
|
|
vcp->connected = true;
|
|
xStreamBufferSend(vcp->rx_stream, &ascii_soh, 1, osWaitForever);
|
|
}
|
|
}
|
|
|
|
// VCP disabled
|
|
if((flags & VcpEvtDisable) && enabled) {
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "Disable");
|
|
#endif
|
|
enabled = false;
|
|
vcp->connected = false;
|
|
xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0);
|
|
xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, osWaitForever);
|
|
}
|
|
|
|
// VCP session opened
|
|
if((flags & VcpEvtConnect) && enabled) {
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "Connect");
|
|
#endif
|
|
if(vcp->connected == false) {
|
|
vcp->connected = true;
|
|
xStreamBufferSend(vcp->rx_stream, &ascii_soh, 1, osWaitForever);
|
|
}
|
|
}
|
|
|
|
// VCP session closed
|
|
if((flags & VcpEvtDisconnect) && enabled) {
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "Disconnect");
|
|
#endif
|
|
if(vcp->connected == true) {
|
|
vcp->connected = false;
|
|
xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0);
|
|
xStreamBufferSend(vcp->rx_stream, &ascii_eot, 1, osWaitForever);
|
|
}
|
|
}
|
|
|
|
// Rx buffer was read, maybe there is enough space for new data?
|
|
if((flags & VcpEvtStreamRx) && enabled && missed_rx > 0) {
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "StreamRx");
|
|
#endif
|
|
if(xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) {
|
|
flags |= VcpEvtRx;
|
|
missed_rx--;
|
|
}
|
|
}
|
|
|
|
// New data received
|
|
if((flags & VcpEvtRx)) {
|
|
if(xStreamBufferSpacesAvailable(vcp->rx_stream) >= USB_CDC_PKT_LEN) {
|
|
int32_t len = furi_hal_cdc_receive(VCP_IF_NUM, vcp->data_buffer, USB_CDC_PKT_LEN);
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "Rx %d", len);
|
|
#endif
|
|
if(len > 0) {
|
|
furi_check(
|
|
xStreamBufferSend(vcp->rx_stream, vcp->data_buffer, len, osWaitForever) ==
|
|
len);
|
|
}
|
|
} else {
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "Rx missed");
|
|
#endif
|
|
missed_rx++;
|
|
}
|
|
}
|
|
|
|
// New data in Tx buffer
|
|
if((flags & VcpEvtStreamTx) && enabled) {
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "StreamTx");
|
|
#endif
|
|
if(tx_idle) {
|
|
flags |= VcpEvtTx;
|
|
}
|
|
}
|
|
|
|
// CDC write transfer done
|
|
if((flags & VcpEvtTx) && enabled) {
|
|
size_t len =
|
|
xStreamBufferReceive(vcp->tx_stream, vcp->data_buffer, USB_CDC_PKT_LEN, 0);
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "Tx %d", len);
|
|
#endif
|
|
if(len > 0) { // Some data left in Tx buffer. Sending it now
|
|
tx_idle = false;
|
|
furi_hal_cdc_send(VCP_IF_NUM, vcp->data_buffer, len);
|
|
last_tx_pkt_len = len;
|
|
} else { // There is nothing to send.
|
|
if(last_tx_pkt_len == 64) {
|
|
// Send extra zero-length packet if last packet len is 64 to indicate transfer end
|
|
furi_hal_cdc_send(VCP_IF_NUM, NULL, 0);
|
|
} else {
|
|
// Set flag to start next transfer instantly
|
|
tx_idle = true;
|
|
}
|
|
last_tx_pkt_len = 0;
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void furi_hal_vcp_enable() {
|
|
osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtEnable);
|
|
}
|
|
|
|
void furi_hal_vcp_disable() {
|
|
osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtDisable);
|
|
}
|
|
|
|
size_t furi_hal_vcp_rx_with_timeout(uint8_t* buffer, size_t size, uint32_t timeout) {
|
|
furi_assert(vcp);
|
|
furi_assert(buffer);
|
|
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "rx %u start", size);
|
|
#endif
|
|
|
|
size_t rx_cnt = 0;
|
|
|
|
while(size > 0) {
|
|
size_t batch_size = size;
|
|
if(batch_size > VCP_RX_BUF_SIZE) batch_size = VCP_RX_BUF_SIZE;
|
|
|
|
size_t len = xStreamBufferReceive(vcp->rx_stream, buffer, batch_size, timeout);
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "rx %u ", batch_size);
|
|
#endif
|
|
if(len == 0) break;
|
|
osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtStreamRx);
|
|
size -= len;
|
|
buffer += len;
|
|
rx_cnt += len;
|
|
}
|
|
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "rx %u end", size);
|
|
#endif
|
|
return rx_cnt;
|
|
}
|
|
|
|
size_t furi_hal_vcp_rx(uint8_t* buffer, size_t size) {
|
|
furi_assert(vcp);
|
|
return furi_hal_vcp_rx_with_timeout(buffer, size, osWaitForever);
|
|
}
|
|
|
|
void furi_hal_vcp_tx(const uint8_t* buffer, size_t size) {
|
|
furi_assert(vcp);
|
|
furi_assert(buffer);
|
|
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "tx %u start", size);
|
|
#endif
|
|
|
|
while(size > 0 && vcp->connected) {
|
|
size_t batch_size = size;
|
|
if(batch_size > USB_CDC_PKT_LEN) batch_size = USB_CDC_PKT_LEN;
|
|
|
|
xStreamBufferSend(vcp->tx_stream, buffer, batch_size, osWaitForever);
|
|
osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtStreamTx);
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "tx %u", batch_size);
|
|
#endif
|
|
|
|
size -= batch_size;
|
|
buffer += batch_size;
|
|
}
|
|
|
|
#ifdef FURI_HAL_USB_VCP_DEBUG
|
|
FURI_LOG_D(TAG, "tx %u end", size);
|
|
#endif
|
|
}
|
|
|
|
static void vcp_state_callback(void* context, uint8_t state) {
|
|
if(state == 0) {
|
|
osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtDisconnect);
|
|
}
|
|
}
|
|
|
|
static void vcp_on_cdc_control_line(void* context, uint8_t state) {
|
|
// bit 0: DTR state, bit 1: RTS state
|
|
bool dtr = state & (1 << 0);
|
|
|
|
if(dtr == true) {
|
|
osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtConnect);
|
|
} else {
|
|
osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtDisconnect);
|
|
}
|
|
}
|
|
|
|
static void vcp_on_cdc_rx(void* context) {
|
|
uint32_t ret = osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtRx);
|
|
furi_check((ret & osFlagsError) == 0);
|
|
}
|
|
|
|
static void vcp_on_cdc_tx_complete(void* context) {
|
|
osThreadFlagsSet(furi_thread_get_thread_id(vcp->thread), VcpEvtTx);
|
|
}
|
|
|
|
bool furi_hal_vcp_is_connected(void) {
|
|
furi_assert(vcp);
|
|
return vcp->connected;
|
|
}
|