Bladeren bron

Use "reset reason" defines (#18462)

Giuliano Zaro 5 jaren geleden
bovenliggende
commit
bfcf7ac2fd
No account linked to committer's email address
2 gewijzigde bestanden met toevoegingen van 6 en 7 verwijderingen
  1. 1
    2
      Marlin/src/HAL/STM32F1/HAL.cpp
  2. 5
    5
      Marlin/src/MarlinCore.cpp

+ 1
- 2
Marlin/src/HAL/STM32F1/HAL.cpp Bestand weergeven

277
 
277
 
278
 /**
278
 /**
279
  * TODO: Check this and change or remove.
279
  * TODO: Check this and change or remove.
280
- * currently returns 1 that's equal to poweron reset.
281
  */
280
  */
282
-uint8_t HAL_get_reset_source() { return 1; }
281
+uint8_t HAL_get_reset_source() { return RST_POWER_ON; }
283
 
282
 
284
 void _delay_ms(const int delay_ms) { delay(delay_ms); }
283
 void _delay_ms(const int delay_ms) { delay(delay_ms); }
285
 
284
 

+ 5
- 5
Marlin/src/MarlinCore.cpp Bestand weergeven

936
 
936
 
937
   // Check startup - does nothing if bootloader sets MCUSR to 0
937
   // Check startup - does nothing if bootloader sets MCUSR to 0
938
   const byte mcu = HAL_get_reset_source();
938
   const byte mcu = HAL_get_reset_source();
939
-  if (mcu &  1) SERIAL_ECHOLNPGM(STR_POWERUP);
940
-  if (mcu &  2) SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
941
-  if (mcu &  4) SERIAL_ECHOLNPGM(STR_BROWNOUT_RESET);
942
-  if (mcu &  8) SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
943
-  if (mcu & 32) SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
939
+  if (mcu & RST_POWER_ON) SERIAL_ECHOLNPGM(STR_POWERUP);
940
+  if (mcu & RST_EXTERNAL) SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
941
+  if (mcu & RST_BROWN_OUT) SERIAL_ECHOLNPGM(STR_BROWNOUT_RESET);
942
+  if (mcu & RST_WATCHDOG) SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
943
+  if (mcu & RST_SOFTWARE) SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
944
   HAL_clear_reset_source();
944
   HAL_clear_reset_source();
945
 
945
 
946
   serialprintPGM(GET_TEXT(MSG_MARLIN));
946
   serialprintPGM(GET_TEXT(MSG_MARLIN));

Laden…
Annuleren
Opslaan