josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: get watchdog.c in. 

The last .c file of the generic ARM port! Again made sure it
doesn't accidentially slip in.
This commit is contained in:
Markus Hitter 2015-08-10 22:06:15 +02:00
parent f8230d6565
commit 5c203b6689
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile-ARM
View File

@ -101,9 +101,9 @@ SOURCES = mendel.c cpu.c serial.c sermsg.c sersendf.c delay.c
SOURCES += gcode_parse.c gcode_process.c pinio.c timer.c clock.c SOURCES += gcode_parse.c gcode_process.c pinio.c timer.c clock.c
SOURCES += dda_queue.c dda_maths.c dda_kinematics.c dda.c dda_lookahead.c SOURCES += dda_queue.c dda_maths.c dda_kinematics.c dda.c dda_lookahead.c
SOURCES += analog.c temp.c heater.c home.c debug.c crc.c pff.c pff_diskio.c SOURCES += analog.c temp.c heater.c home.c debug.c crc.c pff.c pff_diskio.c
SOURCES += spi.c intercom.c graycode.c usb_serial.c SOURCES += spi.c intercom.c graycode.c usb_serial.c watchdog.c
# Sources left: # Sources left:
# watchdog.c #
ifeq ($(MCU), lpc1114) ifeq ($(MCU), lpc1114)
SOURCES += cmsis-system_lpc11xx.c SOURCES += cmsis-system_lpc11xx.c

2
gcode_process.c
View File

@ -593,10 +593,8 @@ void process_gcode_command() {
queue_flush(); queue_flush();
power_off(); power_off();
cli(); cli();
#ifndef __ARMEL_NOTYET__
for (;;) for (;;)
wd_reset(); wd_reset();
#endif /* __ARMEL_NOTYET__ */
break; break;
case 114: case 114:

7
watchdog.h
View File

@ -5,6 +5,13 @@
#ifdef USE_WATCHDOG #ifdef USE_WATCHDOG
/**
Test configuration.
*/
#ifdef __ARMEL__
#error Watchdog (USE_WATCHDOG) not yet supported on ARM.
#endif
// initialize // initialize
void wd_init(void) __attribute__ ((cold)); void wd_init(void) __attribute__ ((cold));