Skip to content

Commit f5874d6

Browse files
authored
Merge pull request #35 from kienvo/usb
feat: Receive data over USB
2 parents b25d62d + c3912e0 commit f5874d6

File tree

15 files changed

+1225
-296
lines changed

15 files changed

+1225
-296
lines changed

CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_usbdev.c

-113
This file was deleted.

CH5xx_ble_firmware_library/StdPeriphDriver/inc/CH58x_common.h

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
#include "CH58x_sys.h"
8585
#include "CH58x_timer.h"
8686
#include "CH58x_spi.h"
87-
#include "CH58x_usbdev.h"
8887
#include "CH58x_usbhost.h"
8988
#include "ISP583.h"
9089

CH5xx_ble_firmware_library/StdPeriphDriver/inc/CH58x_usbdev.h

-177
This file was deleted.

Makefile

+10-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ TARGET = badgemagic-ch582
77
######################################
88
# building variables
99
######################################
10-
# debug build?
11-
DEBUG = 1
10+
# Uncomment below line to enable debugging
11+
# DEBUG = 1
1212
# optimization for size
1313
OPT = -Os
1414

@@ -37,7 +37,6 @@ CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_uart0.c \
3737
CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_timer1.c \
3838
CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_pwm.c \
3939
CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_usbhostClass.c \
40-
CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_usbdev.c \
4140
CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_adc.c \
4241
CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_usbhostBase.c \
4342
CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_timer3.c \
@@ -58,7 +57,13 @@ src/ble/profile/devinfo.c \
5857
src/ble/setup.c \
5958
src/ble/peripheral.c \
6059
src/data.c \
61-
60+
src/usb/utils.c \
61+
src/usb/setup.c \
62+
src/usb/ctrl.c \
63+
src/usb/debug.c \
64+
src/usb/dev.c \
65+
src/usb/composite/hiddev.c \
66+
src/usb/composite/cdc-serial.c \
6267

6368
# ASM sources
6469
ASM_SOURCES = \
@@ -108,7 +113,7 @@ ASFLAGS = $(MCU) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
108113
CFLAGS = $(MCU) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
109114

110115
ifeq ($(DEBUG), 1)
111-
CFLAGS += -g -gdwarf-2
116+
CFLAGS += -g -gdwarf-2 -DDEBUG=$(DEBUG)
112117
endif
113118

114119

0 commit comments

Comments
 (0)