Browse Source

Fix STM32F1 emergency parser (#21011)

vanilla_fb_2.0.x
Arjan Mels 4 years ago
committed by Scott Lahteine
parent
commit
897d29ea31
  1. 29
      Marlin/src/HAL/STM32F1/HAL.cpp
  2. 32
      Marlin/src/HAL/STM32F1/msc_sd.cpp

29
Marlin/src/HAL/STM32F1/HAL.cpp

@ -84,7 +84,32 @@
#if defined(SERIAL_USB) && !HAS_SD_HOST_DRIVE #if defined(SERIAL_USB) && !HAS_SD_HOST_DRIVE
USBSerial SerialUSB; USBSerial SerialUSB;
DefaultSerial MSerial(false, SerialUSB); DefaultSerial MSerial(true, SerialUSB);
#if ENABLED(EMERGENCY_PARSER)
#include "../libmaple/usb/stm32f1/usb_reg_map.h"
#include "libmaple/usb_cdcacm.h"
// The original callback is not called (no way to retrieve address).
// That callback detects a special STM32 reset sequence: this functionality is not essential
// as M997 achieves the same.
void my_rx_callback(unsigned int, void*) {
// max length of 16 is enough to contain all emergency commands
uint8 buf[16];
//rx is usbSerialPart.endpoints[2]
uint16 len = usb_get_ep_rx_count(USB_CDCACM_RX_ENDP);
uint32 total = usb_cdcacm_data_available();
if (len == 0 || total == 0 || !WITHIN(total, len, COUNT(buf)))
return;
// cannot get character by character due to bug in composite_cdcacm_peek_ex
len = usb_cdcacm_peek(buf, total);
for (uint32 i = 0; i < len; i++)
emergency_parser.update(MSerial.emergency_state, buf[i + total - len]);
}
#endif
#endif #endif
uint16_t HAL_adc_result; uint16_t HAL_adc_result;
@ -254,6 +279,8 @@ void HAL_init() {
#endif #endif
#if HAS_SD_HOST_DRIVE #if HAS_SD_HOST_DRIVE
MSC_SD_init(); MSC_SD_init();
#elif BOTH(SERIAL_USB, EMERGENCY_PARSER)
usb_cdcacm_set_hooks(USB_CDCACM_HOOK_RX, my_rx_callback);
#endif #endif
#if PIN_EXISTS(USB_CONNECT) #if PIN_EXISTS(USB_CONNECT)
OUT_WRITE(USB_CONNECT_PIN, !USB_CONNECT_INVERTING); // USB clear connection OUT_WRITE(USB_CONNECT_PIN, !USB_CONNECT_INVERTING); // USB clear connection

32
Marlin/src/HAL/STM32F1/msc_sd.cpp

@ -19,6 +19,7 @@
#include "msc_sd.h" #include "msc_sd.h"
#include "SPI.h" #include "SPI.h"
#include "usb_reg_map.h"
#define PRODUCT_ID 0x29 #define PRODUCT_ID 0x29
@ -41,14 +42,27 @@ Serial0Type<USBCompositeSerial> MarlinCompositeSerial(true);
#endif #endif
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER)
void (*real_rx_callback)(void);
void my_rx_callback(void) { // The original callback is not called (no way to retrieve address).
real_rx_callback(); // That callback detects a special STM32 reset sequence: this functionality is not essential
int len = MarlinCompositeSerial.available(); // as M997 achieves the same.
while (len-- > 0) // >0 because available() may return a negative value void my_rx_callback(unsigned int, void*) {
emergency_parser.update(MarlinCompositeSerial.emergency_state, MarlinCompositeSerial.peek()); // max length of 16 is enough to contain all emergency commands
} uint8 buf[16];
//rx is usbSerialPart.endpoints[2]
uint16 len = usb_get_ep_rx_count(usbSerialPart.endpoints[2].address);
uint32 total = composite_cdcacm_data_available();
if (len == 0 || total == 0 || !WITHIN(total, len, COUNT(buf)))
return;
// cannot get character by character due to bug in composite_cdcacm_peek_ex
len = composite_cdcacm_peek(buf, total);
for (uint32 i = 0; i < len; i++)
emergency_parser.update(MarlinCompositeSerial.emergency_state, buf[i+total-len]);
}
#endif #endif
void MSC_SD_init() { void MSC_SD_init() {
@ -73,9 +87,7 @@ void MSC_SD_init() {
MarlinCompositeSerial.registerComponent(); MarlinCompositeSerial.registerComponent();
USBComposite.begin(); USBComposite.begin();
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER)
//rx is usbSerialPart.endpoints[2] composite_cdcacm_set_hooks(USBHID_CDCACM_HOOK_RX, my_rx_callback);
real_rx_callback = usbSerialPart.endpoints[2].callback;
usbSerialPart.endpoints[2].callback = my_rx_callback;
#endif #endif
} }

Loading…
Cancel
Save