Skip to content

Allow more flexibility when configuring from config.h #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devanlai merged 1 commit into from
Sep 4, 2021
Merged

Allow more flexibility when configuring from config.h #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dapboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/dfu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/usb_conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "dfu.h"
#include "webusb.h"

#include "config.h"
#include "usb_conf.h"

static const struct usb_device_descriptor dev = {
Expand Down
2 changes: 1 addition & 1 deletion src/webusb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
1 change: 1 addition & 0 deletions src/winusb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down