zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

STM32F1 EP with USB_COMPOSITE (#19281)

Browse source
This commit is contained in:
Victor Oliveira 2020-09-06 22:04:20 -03:00 committed by Scott Lahteine
parent a8db9f52ec
commit 643f192515
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Marlin/src/HAL/STM32F1/msc_sd.cpp
View file

@ -21,7 +21,7 @@
#define PRODUCT_ID 0x29 #define PRODUCT_ID 0x29
USBMassStorage MarlinMSC; USBMassStorage MarlinMSC;
USBCompositeSerial MarlinCompositeSerial; MarlinUSBCompositeSerial MarlinCompositeSerial;
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
@ -38,6 +38,17 @@ USBCompositeSerial MarlinCompositeSerial;
#endif #endif
#if ENABLED(EMERGENCY_PARSER)
void (*real_rx_callback)(void);
void my_rx_callback(void) {
real_rx_callback();
int len = MarlinCompositeSerial.available();
while (len-- > 0) // >0 because available() may return a negative value
emergency_parser.update(MarlinCompositeSerial.emergency_state, MarlinCompositeSerial.peek());
}
#endif
void MSC_SD_init() { void MSC_SD_init() {
USBComposite.setProductId(PRODUCT_ID); USBComposite.setProductId(PRODUCT_ID);
// Just set MarlinCompositeSerial enabled to true // Just set MarlinCompositeSerial enabled to true
@ -59,6 +70,11 @@ void MSC_SD_init() {
// Register composite Serial // Register composite Serial
MarlinCompositeSerial.registerComponent(); MarlinCompositeSerial.registerComponent();
USBComposite.begin(); 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 #endif // USE_USB_COMPOSITE

20
Marlin/src/HAL/STM32F1/msc_sd.h
View file

@ -17,7 +17,25 @@
#include <USBComposite.h> #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 USBMassStorage MarlinMSC;
extern USBCompositeSerial MarlinCompositeSerial; extern MarlinUSBCompositeSerial MarlinCompositeSerial;
void MSC_SD_init(); void MSC_SD_init();