high value Watchdog timeouts are defined incorrectly

[GoogleCodeExporter]

What steps will reproduce the problem?
1. Change the watchdog setting to WATCHDOG_4S or WATCHDOG_8S and attempt to 
compile
2.
3.

What is the expected output? What do you see instead?
Gets compile errors about undefined "WDE3"

What version of the product are you using? On what operating system?
Latest mercurial source

Please provide any additional information below.
There are typos in the large-value timeouts where WDE is used instead of WDP:

@@ -164,8 +181,8 @@
 #define WATCHDOG_1S     (_BV(WDP2) | _BV(WDP1) | _BV(WDE))
 #define WATCHDOG_2S     (_BV(WDP2) | _BV(WDP1) | _BV(WDP0) | _BV(WDE))
 #ifndef __AVR_ATmega8__
-#define WATCHDOG_4S     (_BV(WDE3) | _BV(WDE))
-#define WATCHDOG_8S     (_BV(WDE3) | _BV(WDE0) | _BV(WDE))
+#define WATCHDOG_4S     (_BV(WDP3) | _BV(WDE))
+#define WATCHDOG_8S     (_BV(WDP3) | _BV(WDP0) | _BV(WDE))
 #endif

Original issue reported on code.google.com by wes...@gmail.com on 24 Apr 2011 at 7:37

[GoogleCodeExporter]

Original comment by wes...@gmail.com on 29 Oct 2011 at 5:27

[GoogleCodeExporter]

Fixed as part of the great optiboot/Arduino sync-up
http://code.google.com/p/optiboot/source/detail?r=8559b64fd093d3976cae58778a1540
256cde5c8e

Original comment by wes...@gmail.com on 30 Oct 2011 at 8:19

• Changed state: Fixed