diff options
| author | Nathan Ross Powell <nathanrosspowell@gmail.com> | 2015-03-18 23:33:42 -0400 |
|---|---|---|
| committer | Nathan Ross Powell <nathanrosspowell@gmail.com> | 2015-03-18 23:33:42 -0400 |
| commit | 80c4cdb245a3ff55627d40a3a164073b30382def (patch) | |
| tree | e134969a2fc20979101a7e9e7aa06c1877bf82eb /protocol/pjrc/main.c | |
| parent | e7289bb029b28b824eb0ef7be23dba279057d7ac (diff) | |
| parent | 9c3a95663410a294f2c85ad2d1c016f328730e0b (diff) | |
| download | firmware-80c4cdb245a3ff55627d40a3a164073b30382def.tar.gz firmware-80c4cdb245a3ff55627d40a3a164073b30382def.tar.bz2 firmware-80c4cdb245a3ff55627d40a3a164073b30382def.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'protocol/pjrc/main.c')
| -rw-r--r-- | protocol/pjrc/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/protocol/pjrc/main.c b/protocol/pjrc/main.c index 1ef87f865..e7bdcc059 100644 --- a/protocol/pjrc/main.c +++ b/protocol/pjrc/main.c @@ -24,6 +24,7 @@ #include <stdbool.h> #include <avr/io.h> #include <avr/interrupt.h> +#include <avr/wdt.h> #include <util/delay.h> #include "keyboard.h" #include "usb.h" |