Ver código fonte

Minor HAL patches

Scott Lahteine 5 anos atrás
pai
commit
29c12905f5

+ 31
- 7
Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp Ver arquivo

@@ -1,13 +1,37 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
1 23
 #ifdef TARGET_LPC1768
24
+
2 25
 #include "../../inc/MarlinConfigPre.h"
3 26
 
4 27
 #if ENABLED(EMERGENCY_PARSER)
5
-  #include "../../feature/emergency_parser.h"
6
-  EmergencyParser::State emergency_state;
7
-  bool CDC_RecvCallback(const char buffer) {
8
-    emergency_parser.update(emergency_state, buffer);
9
-    return true;
10
-  }
11
-#endif // ENABLED(EMERGENCY_PARSER)
12 28
 
29
+#include "../../feature/emergency_parser.h"
30
+EmergencyParser::State emergency_state;
31
+bool CDC_RecvCallback(const char buffer) {
32
+  emergency_parser.update(emergency_state, buffer);
33
+  return true;
34
+}
35
+
36
+#endif // EMERGENCY_PARSER
13 37
 #endif // TARGET_LPC1768

+ 3
- 1
Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.cpp Ver arquivo

@@ -86,6 +86,8 @@ uint16_t EE_Initialize(void) {
86 86
   pEraseInit.NbSectors = 1;
87 87
   pEraseInit.VoltageRange = VOLTAGE_RANGE;
88 88
 
89
+  HAL_StatusTypeDef FlashStatus; // = HAL_OK
90
+
89 91
   /* Check for invalid header states and repair if necessary */
90 92
   uint32_t SectorError;
91 93
   switch (PageStatus0) {
@@ -135,7 +137,7 @@ uint16_t EE_Initialize(void) {
135 137
           }
136 138
         }
137 139
         /* Mark Page0 as valid */
138
-        HAL_StatusTypeDef FlashStatus = HAL_FLASH_Program(TYPEPROGRAM_HALFWORD, PAGE0_BASE_ADDRESS, VALID_PAGE);
140
+        FlashStatus = HAL_FLASH_Program(TYPEPROGRAM_HALFWORD, PAGE0_BASE_ADDRESS, VALID_PAGE);
139 141
         /* If program operation was failed, a Flash error code is returned */
140 142
         if (FlashStatus != HAL_OK) return FlashStatus;
141 143
         pEraseInit.Sector = PAGE1_ID;

Carregando…
Cancelar
Salvar