Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-19 04:44:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge remote-tracking branch 'OFW/gsurkov/vcp_break_support' into dev" --nobuild

Browse Source 
This reverts commit fc25c9fba0, reversing
changes made to 41ae5d8981.
This commit is contained in:
Willy-JL
2025-04-04 11:54:46 +01:00
parent 7e3a65dfd3
commit 32ad9ea25b
8 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
targets/f7/api_symbols.csv
View File

@@ -1709,7 +1709,6 @@ Function,+,furi_hal_serial_get_gpio_pin,const GpioPin*,"FuriHalSerialHandle*, Fu
Function,+,furi_hal_serial_init,void,"FuriHalSerialHandle*, uint32_t"
Function,+,furi_hal_serial_is_baud_rate_supported,_Bool,"FuriHalSerialHandle*, uint32_t"
Function,+,furi_hal_serial_resume,void,FuriHalSerialHandle*
Function,+,furi_hal_serial_send_break,void,FuriHalSerialHandle*
Function,+,furi_hal_serial_set_br,void,"FuriHalSerialHandle*, uint32_t"
Function,+,furi_hal_serial_suspend,void,FuriHalSerialHandle*
Function,+,furi_hal_serial_tx,void,"FuriHalSerialHandle*, const uint8_t*, size_t"
1 entry status name type params
1709 Function + furi_hal_serial_init void FuriHalSerialHandle*, uint32_t
1710 Function + furi_hal_serial_is_baud_rate_supported _Bool FuriHalSerialHandle*, uint32_t
1711 Function + furi_hal_serial_resume void FuriHalSerialHandle*
Function + furi_hal_serial_send_break void FuriHalSerialHandle*
1712 Function + furi_hal_serial_set_br void FuriHalSerialHandle*, uint32_t
1713 Function + furi_hal_serial_suspend void FuriHalSerialHandle*
1714 Function + furi_hal_serial_tx void FuriHalSerialHandle*, const uint8_t*, size_t

10
targets/f7/furi_hal/furi_hal_serial.c
View File

@@ -1036,13 +1036,3 @@ const GpioPin*
return furi_hal_serial_config[handle->id].gpio[direction];
}
void furi_hal_serial_send_break(FuriHalSerialHandle* handle) {
furi_check(handle);
if(handle->id == FuriHalSerialIdUsart) {
LL_USART_RequestBreakSending(USART1);
} else {
LL_LPUART_RequestBreakSending(LPUART1);
}
}

6
targets/f7/furi_hal/furi_hal_serial.h
View File

@@ -256,12 +256,6 @@ void furi_hal_serial_dma_rx_stop(FuriHalSerialHandle* handle);
*/
size_t furi_hal_serial_dma_rx(FuriHalSerialHandle* handle, uint8_t* data, size_t len);
/** Send a break sequence (low level for the whole character duration)
*
* @param handle Serial handle
*/
void furi_hal_serial_send_break(FuriHalSerialHandle* handle);
#ifdef __cplusplus
}
#endif

13
targets/f7/furi_hal/furi_hal_usb_cdc.c
View File

@@ -122,7 +122,7 @@ static const struct CdcConfigDescriptorSingle cdc_cfg_desc_single = {
.bFunctionLength = sizeof(struct usb_cdc_acm_desc),
.bDescriptorType = USB_DTYPE_CS_INTERFACE,
.bDescriptorSubType = USB_DTYPE_CDC_ACM,
.bmCapabilities = USB_CDC_CAP_BRK,
.bmCapabilities = 0,
},
.cdc_union =
{
@@ -235,7 +235,7 @@ static const struct CdcConfigDescriptorDual
.bFunctionLength = sizeof(struct usb_cdc_acm_desc),
.bDescriptorType = USB_DTYPE_CS_INTERFACE,
.bDescriptorSubType = USB_DTYPE_CDC_ACM,
.bmCapabilities = USB_CDC_CAP_BRK,
.bmCapabilities = 0,
},
.cdc_union =
{
@@ -330,7 +330,7 @@ static const struct CdcConfigDescriptorDual
.bFunctionLength = sizeof(struct usb_cdc_acm_desc),
.bDescriptorType = USB_DTYPE_CS_INTERFACE,
.bDescriptorSubType = USB_DTYPE_CDC_ACM,
.bmCapabilities = USB_CDC_CAP_BRK,
.bmCapabilities = 0,
},
.cdc_union =
{
@@ -685,13 +685,6 @@ static usbd_respond cdc_control(usbd_device* dev, usbd_ctlreq* req, usbd_rqc_cal
dev->status.data_ptr = &cdc_config[if_num];
dev->status.data_count = sizeof(cdc_config[0]);
return usbd_ack;
case USB_CDC_SEND_BREAK:
if(callbacks[if_num] != NULL) {
if(callbacks[if_num]->break_callback != NULL) {
callbacks[if_num]->break_callback(cb_ctx[if_num], req->wValue);
}
}
return usbd_ack;
default:
return usbd_fail;
}

1
targets/f7/furi_hal/furi_hal_usb_cdc.h
View File

@@ -25,7 +25,6 @@ typedef struct {
void (*state_callback)(void* context, CdcState state);
void (*ctrl_line_callback)(void* context, CdcCtrlLine ctrl_lines);
void (*config_callback)(void* context, struct usb_cdc_line_coding* config);
void (*break_callback)(void* context, uint16_t duration);
} CdcCallbacks;
void furi_hal_cdc_set_callbacks(uint8_t if_num, CdcCallbacks* cb, void* context);