Merge pull request #38 from keyboardio/jesse/override-vid-pid-url

Allow more flexibility when configuring from config.h

Author: devanlai

src/dapboot.c

@@ -21,11 +21,11 @@
 
 #include "dapboot.h"
 #include "target.h"
+#include "config.h"
 #include "usb_conf.h"
 #include "dfu.h"
 #include "webusb.h"
 #include "winusb.h"
-#include "config.h"
 
 static inline void __set_MSP(uint32_t topOfMainStack) {
     asm("msr msp, %0" : : "r" (topOfMainStack));

src/dfu.c

@@ -25,11 +25,11 @@
 #include <libopencm3/usb/dfu.h>
 
 #include "dfu.h"
+#include "config.h"
 #include "usb_conf.h"
 #include "dfu_defs.h"
 #include "target.h"
 #include "dapboot.h"
-#include "config.h"
 
 #ifndef TARGET_DFU_WTRANSFERSIZE
 #define TARGET_DFU_WTRANSFERSIZE USB_CONTROL_BUF_SIZE

src/usb_conf.c

@@ -25,6 +25,7 @@
 #include "dfu.h"
 #include "webusb.h"
 
+#include "config.h"
 #include "usb_conf.h"
 
 static const struct usb_device_descriptor dev = {

src/webusb.c

@@ -19,8 +19,8 @@
 #include <libopencm3/usb/usbd.h>
 #include "webusb.h"
 
-#include "usb_conf.h"
 #include "config.h"
+#include "usb_conf.h"
 
 #ifndef LANDING_PAGE_URL
 #define LANDING_PAGE_URL "devanlai.github.io/webdfu/dfu-util/"

src/winusb.c

@@ -19,6 +19,7 @@
 #include <libopencm3/usb/usbd.h>
 #include "winusb.h"
 
+#include "config.h"
 #include "usb_conf.h"
 
 static const struct winusb_compatible_id_descriptor winusb_wcid = {