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

Minor HAL patches

Browse source
This commit is contained in:
Scott Lahteine 2019-08-19 02:28:12 -05:00
parent 1432d44eed
commit 29c12905f5
2 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
View file

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

4
Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.cpp
View file

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