emergency parser for usb composite in stm32f1

MarlinFirmware · Sep 6, 2020 · 9a5fae4 · 9a5fae4
1 parent d19fc64
commit 9a5fae4
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/Marlin/src/HAL/STM32F1/msc_sd.cpp b/Marlin/src/HAL/STM32F1/msc_sd.cpp
@@ -21,7 +21,7 @@
 #define PRODUCT_ID 0x29
 
 USBMassStorage MarlinMSC;
-USBCompositeSerial MarlinCompositeSerial;
+MarlinUSBCompositeSerial MarlinCompositeSerial;
 
 #include "../../inc/MarlinConfig.h"
 
@@ -38,6 +38,19 @@ USBCompositeSerial MarlinCompositeSerial;
 
 #endif
 
+#if ENABLED(EMERGENCY_PARSER)
+  void (*real_rx_callback)(void);
+
+  void my_rx_callback(void) {
+    real_rx_callback();
+    int len = MarlinCompositeSerial.available();
+    // > 0 because available() return int... and we may get a -1 here...
+    while(len-- > 0){
+      emergency_parser.update(MarlinCompositeSerial.emergency_state, MarlinCompositeSerial.peek());
+    }
+  }
+#endif
+
 void MSC_SD_init() {
   USBComposite.setProductId(PRODUCT_ID);
   // Just set MarlinCompositeSerial enabled to true
@@ -59,6 +72,11 @@ void MSC_SD_init() {
   // Register composite Serial
   MarlinCompositeSerial.registerComponent();
   USBComposite.begin();
+  #if ENABLED(EMERGENCY_PARSER)
+    //rx is usbSerialPart.endpoints[2]
+    real_rx_callback = usbSerialPart.endpoints[2].callback;
+    usbSerialPart.endpoints[2].callback = my_rx_callback;
+  #endif
 }
 
 #endif // USE_USB_COMPOSITE
diff --git a/Marlin/src/HAL/STM32F1/msc_sd.h b/Marlin/src/HAL/STM32F1/msc_sd.h
@@ -17,7 +17,25 @@
 
 #include <USBComposite.h>
 
+#include "../../inc/MarlinConfigPre.h"
+#if ENABLED(EMERGENCY_PARSER)
+  #include "../../feature/e_parser.h"
+#endif
+
+class MarlinUSBCompositeSerial : public USBCompositeSerial {
+public:
+  MarlinUSBCompositeSerial() : USBCompositeSerial()
+    #if ENABLED(EMERGENCY_PARSER)
+      , emergency_state(EmergencyParser::State::EP_RESET)
+    #endif
+    { }
+
+  #if ENABLED(EMERGENCY_PARSER)
+    EmergencyParser::State emergency_state;
+  #endif
+};
+
 extern USBMassStorage MarlinMSC;
-extern USBCompositeSerial MarlinCompositeSerial;
+extern MarlinUSBCompositeSerial MarlinCompositeSerial;
 
 void MSC_SD_init();