浏览代码

Fix STM32 HW Serial + EP compile (#19990)

Victor Oliveira 4 年前
父节点
当前提交
e7ebb66200
没有帐户链接到提交者的电子邮件
共有 3 个文件被更改,包括 10 次插入3 次删除
  1. 8
    2
      Marlin/src/HAL/STM32/HAL.cpp
  2. 1
    0
      Marlin/src/HAL/STM32/HAL.h
  3. 1
    1
      Marlin/src/HAL/STM32/usb_serial.cpp

+ 8
- 2
Marlin/src/HAL/STM32/HAL.cpp 查看文件

81
 
81
 
82
   SetTimerInterruptPriorities();
82
   SetTimerInterruptPriorities();
83
 
83
 
84
-  TERN_(EMERGENCY_PARSER, USB_Hook_init());
84
+  #if ENABLED(EMERGENCY_PARSER) && USBD_USE_CDC
85
+    USB_Hook_init();
86
+  #endif
85
 }
87
 }
86
 
88
 
87
 void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
89
 void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
128
 void flashFirmware(const int16_t) { NVIC_SystemReset(); }
130
 void flashFirmware(const int16_t) { NVIC_SystemReset(); }
129
 
131
 
130
 // Maple Compatibility
132
 // Maple Compatibility
133
+volatile uint32_t systick_uptime_millis = 0;
131
 systickCallback_t systick_user_callback;
134
 systickCallback_t systick_user_callback;
132
 void systick_attach_callback(systickCallback_t cb) { systick_user_callback = cb; }
135
 void systick_attach_callback(systickCallback_t cb) { systick_user_callback = cb; }
133
-void HAL_SYSTICK_Callback() { if (systick_user_callback) systick_user_callback(); }
136
+void HAL_SYSTICK_Callback() {
137
+  systick_uptime_millis++;
138
+  if (systick_user_callback) systick_user_callback();
139
+}
134
 
140
 
135
 #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
141
 #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC

+ 1
- 0
Marlin/src/HAL/STM32/HAL.h 查看文件

184
 typedef void (*systickCallback_t)(void);
184
 typedef void (*systickCallback_t)(void);
185
 void systick_attach_callback(systickCallback_t cb);
185
 void systick_attach_callback(systickCallback_t cb);
186
 void HAL_SYSTICK_Callback();
186
 void HAL_SYSTICK_Callback();
187
+extern volatile uint32_t systick_uptime_millis;

+ 1
- 1
Marlin/src/HAL/STM32/usb_serial.cpp 查看文件

21
 
21
 
22
 #include "../../inc/MarlinConfigPre.h"
22
 #include "../../inc/MarlinConfigPre.h"
23
 
23
 
24
-#if ENABLED(EMERGENCY_PARSER)
24
+#if ENABLED(EMERGENCY_PARSER) && USBD_USE_CDC
25
 
25
 
26
 #include "usb_serial.h"
26
 #include "usb_serial.h"
27
 #include "../../feature/e_parser.h"
27
 #include "../../feature/e_parser.h"

正在加载...
取消
保存