MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🐛 Prevent AVR watchdogpile (#23075)

Browse Source
This commit is contained in:
Skruppy 2021-11-04 18:11:57 +01:00 committed by Scott Lahteine
parent fd136d5501
commit 9fffed7160
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/Configuration_adv.h
View File

@ -4224,3 +4224,6 @@
*/ */
//#define SOFT_RESET_VIA_SERIAL // 'KILL' and '^X' commands will soft-reset the controller //#define SOFT_RESET_VIA_SERIAL // 'KILL' and '^X' commands will soft-reset the controller
//#define SOFT_RESET_ON_KILL // Use a digital button to soft-reset the controller after KILL //#define SOFT_RESET_ON_KILL // Use a digital button to soft-reset the controller after KILL
// Report uncleaned reset reason from register r2 instead of MCUSR. Supported by Optiboot on AVR.
//#define OPTIBOOT_RESET_REASON

21
Marlin/src/HAL/AVR/HAL.cpp
View File

@ -35,12 +35,31 @@
// Public Variables // Public Variables
// ------------------------ // ------------------------
//uint8_t MCUSR; // Don't initialize/override variable (which would happen in .init4)
uint8_t reset_reason __attribute__((section(".noinit")));
// ------------------------ // ------------------------
// Public functions // Public functions
// ------------------------ // ------------------------
__attribute__((naked)) // Don't output function pro- and epilogue
__attribute__((used)) // Output the function, even if "not used"
__attribute__((section(".init3"))) // Put in an early user definable section
void HAL_save_reset_reason() {
#if ENABLED(OPTIBOOT_RESET_REASON)
__asm__ __volatile__(
A("STS %0, r2")
: "=m"(reset_reason)
);
#else
reset_reason = MCUSR;
#endif
// Clear within 16ms since WDRF bit enables a 16ms watchdog timer -> Boot loop
MCUSR = 0;
wdt_disable();
}
void HAL_init() { void HAL_init() {
// Init Servo Pins // Init Servo Pins
#define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW) #define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW)

6
Marlin/src/HAL/AVR/HAL.h
View File

@ -91,7 +91,7 @@ typedef int8_t pin_t;
// Public Variables // Public Variables
// ------------------------ // ------------------------
//extern uint8_t MCUSR; extern uint8_t reset_reason;
// Serial ports // Serial ports
#ifdef USBCON #ifdef USBCON
@ -152,8 +152,8 @@ void HAL_init();
//void _delay_ms(const int delay); //void _delay_ms(const int delay);
inline void HAL_clear_reset_source() { MCUSR = 0; } inline void HAL_clear_reset_source() { }
inline uint8_t HAL_get_reset_source() { return MCUSR; } inline uint8_t HAL_get_reset_source() { return reset_reason; }
void HAL_reboot(); void HAL_reboot();

5
Marlin/src/inc/SanityCheck.h
View File

@ -2489,6 +2489,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "An encoder button is required or SOFT_RESET_ON_KILL will reset the printer without notice!" #error "An encoder button is required or SOFT_RESET_ON_KILL will reset the printer without notice!"
#endif #endif
// Reset reason for AVR
#if ENABLED(OPTIBOOT_RESET_REASON) && !defined(__AVR__)
#error "OPTIBOOT_RESET_REASON only applies to AVR."
#endif
/** /**
* I2C bus * I2C bus
*/ */