Oops, sorry missed these files

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1160 ebee16cc-31ac-478f-84a7-5cbb03baadba

flight/OpenPilot/System/inc/pios_config.h

@@ -42,9 +42,7 @@
 #define PIOS_INCLUDE_SPI
 #define PIOS_INCLUDE_SYS
 #define PIOS_INCLUDE_USART
-//#define PIOS_INCLUDE_USB_COM
 #define PIOS_INCLUDE_USB_HID
-#define PIOS_INCLUDE_USB
 #define PIOS_INCLUDE_BMP085
 #define PIOS_INCLUDE_OPAHRS
 #define PIOS_INCLUDE_COM

flight/OpenPilot/System/openpilot.c

@@ -28,7 +28,7 @@
 #include "openpilot.h"
 #include "uavobjectsinit.h"
 #include "systemmod.h"
-
+#include "stm32f10x.h"
 
 /* Task Priorities */
 #define PRIORITY_TASK_HOOKS             (tskIDLE_PRIORITY + 3)
@@ -71,7 +71,10 @@ int main()
 
 	/* Brings up System using CMSIS functions, enables the LEDs. */
 	PIOS_SYS_Init();
-
+	
+	WWDG_SetPrescaler(WWDG_Prescaler_8);
+	WWDG_SetWindowValue(0xff);
+	
 	/* Initialize the system thread */
 	SystemModInitialize();
 
@@ -101,6 +104,7 @@ void OpenPilotInit()
 	 * core subsystem initialisation
 	 * (see pios_board.c for your arch)
 	 * */
+	
 	PIOS_Board_Init();
 
 	/* Initialize modules */

flight/OpenPilot/System/pios_board.c

@@ -38,8 +38,8 @@
 void PIOS_Board_Init(void) {
 
 	/* Delay system */
-	PIOS_DELAY_Init();
-
+	PIOS_DELAY_Init();	
+	
 	/* SPI Init */
 	PIOS_SPI_Init();
 
@@ -69,8 +69,10 @@ void PIOS_Board_Init(void) {
 #if defined(PIOS_INCLUDE_PPM)
 	PIOS_PPM_Init();
 #endif
-	PIOS_USB_Init(0);
-	PIOS_I2C_Init();
+#if defined(PIOS_INCLUDE_USB_HID)
+	PIOS_USB_HID_Init(0);
+#endif
+	//PIOS_I2C_Init();
 
 }
 
@@ -485,10 +487,12 @@ struct pios_com_dev pios_com_devs[] = {
     .id     = PIOS_USART_GPS,
     .driver = &pios_usart_com_driver,
   },
+#ifdef PIOS_INCLUDE_USB_HID
   {
     .id     = 0,
     .driver = &pios_usb_com_driver,
   },
+#endif
 #ifdef PIOS_COM_AUX
   {
     .id     = PIOS_USART_AUX,