Merge pull request #16920 from maribu/cpu/avr8_common/bugfix
cpu/{atxmega,atmega_common}: fix invalid use of PSTR()
This commit is contained in:
commit
badadd1337
@ -26,8 +26,6 @@
|
|||||||
* @}
|
* @}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <avr/pgmspace.h>
|
|
||||||
|
|
||||||
#include "board.h"
|
#include "board.h"
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "panic.h"
|
#include "panic.h"
|
||||||
@ -100,8 +98,7 @@ ISR(BADISR_vect)
|
|||||||
LED_PANIC;
|
LED_PANIC;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
core_panic(PANIC_GENERAL_ERROR, PSTR("FATAL ERROR: BADISR_vect called, unprocessed Interrupt.\n"
|
core_panic(PANIC_GENERAL_ERROR, "BADISR");
|
||||||
"STOP Execution.\n"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CPU_ATMEGA128RFA1) || defined (CPU_ATMEGA256RFR2)
|
#if defined(CPU_ATMEGA128RFA1) || defined (CPU_ATMEGA256RFR2)
|
||||||
|
|||||||
@ -18,8 +18,6 @@
|
|||||||
* @}
|
* @}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <avr/pgmspace.h>
|
|
||||||
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "cpu_clock.h"
|
#include "cpu_clock.h"
|
||||||
#include "cpu_pm.h"
|
#include "cpu_pm.h"
|
||||||
@ -121,7 +119,5 @@ ISR(BADISR_vect)
|
|||||||
LED_PANIC;
|
LED_PANIC;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
core_panic(PANIC_GENERAL_ERROR,
|
core_panic(PANIC_GENERAL_ERROR, "BADISR");
|
||||||
PSTR("FATAL ERROR: BADISR_vect called, unprocessed Interrupt.\n"
|
|
||||||
"STOP Execution.\n"));
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user