From e0be6b656984beb7263975acf3c79fc77be2c5e8 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Mon, 1 Oct 2018 19:16:55 +0200 Subject: [PATCH] Rename webcam to uvc. --- src/Makefile | 48 ++++++++++---------- src/{webcam => uvc}/Makefile | 0 src/{webcam => uvc}/include/stm32fxxx_it.h | 0 src/{webcam => uvc}/include/usbd_conf.h | 0 src/{webcam => uvc}/include/usbd_core.h | 0 src/{webcam => uvc}/include/usbd_ctlreq.h | 0 src/{webcam => uvc}/include/usbd_def.h | 0 src/{webcam => uvc}/include/usbd_desc.h | 0 src/{webcam => uvc}/include/usbd_ioreq.h | 0 src/{webcam => uvc}/include/usbd_types.h | 0 src/{webcam => uvc}/include/usbd_uvc.h | 0 src/{webcam => uvc}/include/usbd_uvc_if.h | 0 src/{webcam => uvc}/include/uvc.h | 0 src/{webcam => uvc}/include/uvc_desc.h | 0 src/{webcam => uvc}/include/uvc_desc_conf.h | 0 src/{webcam => uvc}/include/uvc_desc_va.h | 0 src/{webcam => uvc}/include/uvc_desc_vc.h | 0 src/{webcam => uvc}/include/uvc_desc_vs.h | 0 src/{webcam => uvc}/include/uvc_desc_vs_if.h | 0 src/{webcam => uvc}/src/main.c | 0 src/{webcam => uvc}/src/stm32fxxx_it.c | 0 src/{webcam => uvc}/src/string0.c | 0 src/{webcam => uvc}/src/systick.c | 0 src/{webcam => uvc}/src/usbd_conf.c | 0 src/{webcam => uvc}/src/usbd_core.c | 0 src/{webcam => uvc}/src/usbd_ctlreq.c | 0 src/{webcam => uvc}/src/usbd_desc.c | 0 src/{webcam => uvc}/src/usbd_ioreq.c | 0 src/{webcam => uvc}/src/usbd_uvc.c | 0 src/{webcam => uvc}/src/usbd_uvc_if.c | 0 src/{webcam => uvc}/stm32fxxx.ld.S | 0 31 files changed, 24 insertions(+), 24 deletions(-) rename src/{webcam => uvc}/Makefile (100%) rename src/{webcam => uvc}/include/stm32fxxx_it.h (100%) rename src/{webcam => uvc}/include/usbd_conf.h (100%) rename src/{webcam => uvc}/include/usbd_core.h (100%) rename src/{webcam => uvc}/include/usbd_ctlreq.h (100%) rename src/{webcam => uvc}/include/usbd_def.h (100%) rename src/{webcam => uvc}/include/usbd_desc.h (100%) rename src/{webcam => uvc}/include/usbd_ioreq.h (100%) rename src/{webcam => uvc}/include/usbd_types.h (100%) rename src/{webcam => uvc}/include/usbd_uvc.h (100%) rename src/{webcam => uvc}/include/usbd_uvc_if.h (100%) rename src/{webcam => uvc}/include/uvc.h (100%) rename src/{webcam => uvc}/include/uvc_desc.h (100%) rename src/{webcam => uvc}/include/uvc_desc_conf.h (100%) rename src/{webcam => uvc}/include/uvc_desc_va.h (100%) rename src/{webcam => uvc}/include/uvc_desc_vc.h (100%) rename src/{webcam => uvc}/include/uvc_desc_vs.h (100%) rename src/{webcam => uvc}/include/uvc_desc_vs_if.h (100%) rename src/{webcam => uvc}/src/main.c (100%) rename src/{webcam => uvc}/src/stm32fxxx_it.c (100%) rename src/{webcam => uvc}/src/string0.c (100%) rename src/{webcam => uvc}/src/systick.c (100%) rename src/{webcam => uvc}/src/usbd_conf.c (100%) rename src/{webcam => uvc}/src/usbd_core.c (100%) rename src/{webcam => uvc}/src/usbd_ctlreq.c (100%) rename src/{webcam => uvc}/src/usbd_desc.c (100%) rename src/{webcam => uvc}/src/usbd_ioreq.c (100%) rename src/{webcam => uvc}/src/usbd_uvc.c (100%) rename src/{webcam => uvc}/src/usbd_uvc_if.c (100%) rename src/{webcam => uvc}/stm32fxxx.ld.S (100%) diff --git a/src/Makefile b/src/Makefile index 7a1dbb471..9f87bb680 100755 --- a/src/Makefile +++ b/src/Makefile @@ -27,7 +27,7 @@ CAT = $(Q)cat # Targets OPENMV = openmv BOOTLOADER = bootloader -WEBCAM = webcam +UVC = uvc FIRMWARE = firmware # Directories @@ -41,7 +41,7 @@ LEPTON_DIR=lepton MLX_DIR=mlx WINC1500_DIR=winc1500 BOOTLDR_DIR=bootloader -WEBCAM_DIR=webcam +UVC_DIR=uvc # Additional qstr definitions for OpenMV OMV_QSTR_DEFS = $(TOP_DIR)/$(OMV_DIR)/py/qstrdefsomv.h @@ -108,9 +108,9 @@ OMV_CFLAGS += -I$(TOP_DIR)/$(LEPTON_DIR)/include/ OMV_CFLAGS += -I$(TOP_DIR)/$(MLX_DIR)/include/ OMV_CFLAGS += -I$(TOP_DIR)/$(WINC1500_DIR)/include/ -WEBCAM_CFLAGS = $(CFLAGS) -WEBCAM_CFLAGS += -I$(OMV_BOARD_CONFIG_DIR) -WEBCAM_CFLAGS += -I$(TOP_DIR)/$(WEBCAM_DIR)/include/ +UVC_CFLAGS = $(CFLAGS) +UVC_CFLAGS += -I$(OMV_BOARD_CONFIG_DIR) +UVC_CFLAGS += -I$(TOP_DIR)/$(UVC_DIR)/include/ BOOTLDR_CFLAGS = $(CFLAGS) BOOTLDR_CFLAGS += -I$(OMV_BOARD_CONFIG_DIR) @@ -127,8 +127,8 @@ BOOTLDR_LDFLAGS = -mcpu=$(CPU) -mabi=aapcs-linux -mthumb -mfpu=$(FPU) -mfloat-ab -nostdlib -Wl,--gc-sections -Wl,-T$(BUILD)/$(BOOTLDR_DIR)/stm32fxxx.lds # Linker Flags -WEBCAM_LDFLAGS = -mcpu=$(CPU) -mabi=aapcs-linux -mthumb -mfpu=$(FPU) -mfloat-abi=hard\ - -nostdlib -Wl,--gc-sections -Wl,-T$(BUILD)/$(WEBCAM_DIR)/stm32fxxx.lds +UVC_LDFLAGS = -mcpu=$(CPU) -mabi=aapcs-linux -mthumb -mfpu=$(FPU) -mfloat-abi=hard\ + -nostdlib -Wl,--gc-sections -Wl,-T$(BUILD)/$(UVC_DIR)/stm32fxxx.lds #------------- Libraries ----------------# FIRM_OBJ += $(wildcard $(BUILD)/$(CMSIS_DIR)/src/dsp/CommonTables/*.o) @@ -414,15 +414,15 @@ BOOT_OBJ += $(addprefix $(BUILD)/$(CMSIS_DIR)/src/st/,\ system_stm32fxxx.o \ ) -# Webcam object files -WEBCAM_OBJ += $(wildcard $(BUILD)/$(WEBCAM_DIR)/src/*.o) -WEBCAM_OBJ += $(wildcard $(BUILD)/$(STHAL_DIR)/src/*.o) -WEBCAM_OBJ += $(addprefix $(BUILD)/$(CMSIS_DIR)/src/st/,\ +# UVC object files +UVC_OBJ += $(wildcard $(BUILD)/$(UVC_DIR)/src/*.o) +UVC_OBJ += $(wildcard $(BUILD)/$(STHAL_DIR)/src/*.o) +UVC_OBJ += $(addprefix $(BUILD)/$(CMSIS_DIR)/src/st/,\ $(STARTUP).o \ system_stm32fxxx.o \ ) -WEBCAM_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/, \ +UVC_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/, \ fb_alloc.o \ framebuffer.o \ array.o \ @@ -439,7 +439,7 @@ WEBCAM_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/, \ trace.o \ ) -WEBCAM_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/img/,\ +UVC_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/img/,\ lab_tab.o \ xyz_tab.o \ yuv_tab.o \ @@ -451,8 +451,8 @@ WEBCAM_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/img/,\ imlib.o \ ) -WEBCAM_OBJ += $(wildcard $(BUILD)/$(LEPTON_DIR)/src/*.o) -WEBCAM_OBJ += $(wildcard $(BUILD)/$(MLX_DIR)/src/*.o) +UVC_OBJ += $(wildcard $(BUILD)/$(LEPTON_DIR)/src/*.o) +UVC_OBJ += $(wildcard $(BUILD)/$(MLX_DIR)/src/*.o) ################################################### #Export Variables export Q @@ -480,8 +480,8 @@ $(BUILD): BOOTLOADER_OBJS: FIRMWARE_OBJS $(MAKE) -C $(BOOTLDR_DIR) BUILD=$(BUILD)/$(BOOTLDR_DIR) CFLAGS="$(BOOTLDR_CFLAGS) -MMD" -WEBCAM_OBJS: FIRMWARE_OBJS - $(MAKE) -C $(WEBCAM_DIR) BUILD=$(BUILD)/$(WEBCAM_DIR) CFLAGS="$(WEBCAM_CFLAGS) -MMD" +UVC_OBJS: FIRMWARE_OBJS + $(MAKE) -C $(UVC_DIR) BUILD=$(BUILD)/$(UVC_DIR) CFLAGS="$(UVC_CFLAGS) -MMD" FIRMWARE_OBJS: $(MAKE) -C $(CMSIS_DIR) BUILD=$(BUILD)/$(CMSIS_DIR) CFLAGS="$(CFLAGS) -fno-strict-aliasing -MMD" @@ -509,15 +509,15 @@ $(BOOTLOADER): FIRMWARE_OBJS BOOTLOADER_OBJS $(PYTHON) $(MKDFU) -b 0x08000000:$(FW_DIR)/$(BOOTLOADER).bin $(FW_DIR)/$(BOOTLOADER).dfu $(OBJCOPY) -Obinary --pad-to=$(MAIN_APP_ADDR) --gap-fill=0xFF $(FW_DIR)/$(BOOTLOADER).elf $(FW_DIR)/$(BOOTLOADER).bin -# This target generates the webcam firmware. -$(WEBCAM): FIRMWARE_OBJS WEBCAM_OBJS - $(CPP) -P -E -I$(OMV_BOARD_CONFIG_DIR) $(WEBCAM_DIR)/stm32fxxx.ld.S > $(BUILD)/$(WEBCAM_DIR)/stm32fxxx.lds - $(CC) $(WEBCAM_LDFLAGS) $(WEBCAM_OBJ) -o $(FW_DIR)/$(WEBCAM).elf - $(OBJCOPY) -Obinary $(FW_DIR)/$(WEBCAM).elf $(FW_DIR)/$(WEBCAM).bin - $(PYTHON) $(MKDFU) -b $(MAIN_APP_ADDR):$(FW_DIR)/$(WEBCAM).bin $(FW_DIR)/$(WEBCAM).dfu +# This target generates the UVC firmware. +$(UVC): FIRMWARE_OBJS UVC_OBJS + $(CPP) -P -E -I$(OMV_BOARD_CONFIG_DIR) $(UVC_DIR)/stm32fxxx.ld.S > $(BUILD)/$(UVC_DIR)/stm32fxxx.lds + $(CC) $(UVC_LDFLAGS) $(UVC_OBJ) -o $(FW_DIR)/$(UVC).elf + $(OBJCOPY) -Obinary $(FW_DIR)/$(UVC).elf $(FW_DIR)/$(UVC).bin + $(PYTHON) $(MKDFU) -b $(MAIN_APP_ADDR):$(FW_DIR)/$(UVC).bin $(FW_DIR)/$(UVC).dfu # This target generates a combined bootloader+main firmware image. -$(OPENMV): $(BOOTLOADER) $(WEBCAM) $(FIRMWARE) | $(BUILD) +$(OPENMV): $(BOOTLOADER) $(UVC) $(FIRMWARE) | $(BUILD) $(CAT) $(FW_DIR)/$(BOOTLOADER).bin $(FW_DIR)/$(FIRMWARE).bin > $(FW_DIR)/$(OPENMV).bin $(PYTHON) $(MKDFU) -b 0x08000000:$(FW_DIR)/$(BOOTLOADER).bin -b $(MAIN_APP_ADDR):$(FW_DIR)/$(FIRMWARE).bin $(FW_DIR)/$(OPENMV).dfu $(SIZE) $(FW_DIR)/$(BOOTLOADER).elf diff --git a/src/webcam/Makefile b/src/uvc/Makefile similarity index 100% rename from src/webcam/Makefile rename to src/uvc/Makefile diff --git a/src/webcam/include/stm32fxxx_it.h b/src/uvc/include/stm32fxxx_it.h similarity index 100% rename from src/webcam/include/stm32fxxx_it.h rename to src/uvc/include/stm32fxxx_it.h diff --git a/src/webcam/include/usbd_conf.h b/src/uvc/include/usbd_conf.h similarity index 100% rename from src/webcam/include/usbd_conf.h rename to src/uvc/include/usbd_conf.h diff --git a/src/webcam/include/usbd_core.h b/src/uvc/include/usbd_core.h similarity index 100% rename from src/webcam/include/usbd_core.h rename to src/uvc/include/usbd_core.h diff --git a/src/webcam/include/usbd_ctlreq.h b/src/uvc/include/usbd_ctlreq.h similarity index 100% rename from src/webcam/include/usbd_ctlreq.h rename to src/uvc/include/usbd_ctlreq.h diff --git a/src/webcam/include/usbd_def.h b/src/uvc/include/usbd_def.h similarity index 100% rename from src/webcam/include/usbd_def.h rename to src/uvc/include/usbd_def.h diff --git a/src/webcam/include/usbd_desc.h b/src/uvc/include/usbd_desc.h similarity index 100% rename from src/webcam/include/usbd_desc.h rename to src/uvc/include/usbd_desc.h diff --git a/src/webcam/include/usbd_ioreq.h b/src/uvc/include/usbd_ioreq.h similarity index 100% rename from src/webcam/include/usbd_ioreq.h rename to src/uvc/include/usbd_ioreq.h diff --git a/src/webcam/include/usbd_types.h b/src/uvc/include/usbd_types.h similarity index 100% rename from src/webcam/include/usbd_types.h rename to src/uvc/include/usbd_types.h diff --git a/src/webcam/include/usbd_uvc.h b/src/uvc/include/usbd_uvc.h similarity index 100% rename from src/webcam/include/usbd_uvc.h rename to src/uvc/include/usbd_uvc.h diff --git a/src/webcam/include/usbd_uvc_if.h b/src/uvc/include/usbd_uvc_if.h similarity index 100% rename from src/webcam/include/usbd_uvc_if.h rename to src/uvc/include/usbd_uvc_if.h diff --git a/src/webcam/include/uvc.h b/src/uvc/include/uvc.h similarity index 100% rename from src/webcam/include/uvc.h rename to src/uvc/include/uvc.h diff --git a/src/webcam/include/uvc_desc.h b/src/uvc/include/uvc_desc.h similarity index 100% rename from src/webcam/include/uvc_desc.h rename to src/uvc/include/uvc_desc.h diff --git a/src/webcam/include/uvc_desc_conf.h b/src/uvc/include/uvc_desc_conf.h similarity index 100% rename from src/webcam/include/uvc_desc_conf.h rename to src/uvc/include/uvc_desc_conf.h diff --git a/src/webcam/include/uvc_desc_va.h b/src/uvc/include/uvc_desc_va.h similarity index 100% rename from src/webcam/include/uvc_desc_va.h rename to src/uvc/include/uvc_desc_va.h diff --git a/src/webcam/include/uvc_desc_vc.h b/src/uvc/include/uvc_desc_vc.h similarity index 100% rename from src/webcam/include/uvc_desc_vc.h rename to src/uvc/include/uvc_desc_vc.h diff --git a/src/webcam/include/uvc_desc_vs.h b/src/uvc/include/uvc_desc_vs.h similarity index 100% rename from src/webcam/include/uvc_desc_vs.h rename to src/uvc/include/uvc_desc_vs.h diff --git a/src/webcam/include/uvc_desc_vs_if.h b/src/uvc/include/uvc_desc_vs_if.h similarity index 100% rename from src/webcam/include/uvc_desc_vs_if.h rename to src/uvc/include/uvc_desc_vs_if.h diff --git a/src/webcam/src/main.c b/src/uvc/src/main.c similarity index 100% rename from src/webcam/src/main.c rename to src/uvc/src/main.c diff --git a/src/webcam/src/stm32fxxx_it.c b/src/uvc/src/stm32fxxx_it.c similarity index 100% rename from src/webcam/src/stm32fxxx_it.c rename to src/uvc/src/stm32fxxx_it.c diff --git a/src/webcam/src/string0.c b/src/uvc/src/string0.c similarity index 100% rename from src/webcam/src/string0.c rename to src/uvc/src/string0.c diff --git a/src/webcam/src/systick.c b/src/uvc/src/systick.c similarity index 100% rename from src/webcam/src/systick.c rename to src/uvc/src/systick.c diff --git a/src/webcam/src/usbd_conf.c b/src/uvc/src/usbd_conf.c similarity index 100% rename from src/webcam/src/usbd_conf.c rename to src/uvc/src/usbd_conf.c diff --git a/src/webcam/src/usbd_core.c b/src/uvc/src/usbd_core.c similarity index 100% rename from src/webcam/src/usbd_core.c rename to src/uvc/src/usbd_core.c diff --git a/src/webcam/src/usbd_ctlreq.c b/src/uvc/src/usbd_ctlreq.c similarity index 100% rename from src/webcam/src/usbd_ctlreq.c rename to src/uvc/src/usbd_ctlreq.c diff --git a/src/webcam/src/usbd_desc.c b/src/uvc/src/usbd_desc.c similarity index 100% rename from src/webcam/src/usbd_desc.c rename to src/uvc/src/usbd_desc.c diff --git a/src/webcam/src/usbd_ioreq.c b/src/uvc/src/usbd_ioreq.c similarity index 100% rename from src/webcam/src/usbd_ioreq.c rename to src/uvc/src/usbd_ioreq.c diff --git a/src/webcam/src/usbd_uvc.c b/src/uvc/src/usbd_uvc.c similarity index 100% rename from src/webcam/src/usbd_uvc.c rename to src/uvc/src/usbd_uvc.c diff --git a/src/webcam/src/usbd_uvc_if.c b/src/uvc/src/usbd_uvc_if.c similarity index 100% rename from src/webcam/src/usbd_uvc_if.c rename to src/uvc/src/usbd_uvc_if.c diff --git a/src/webcam/stm32fxxx.ld.S b/src/uvc/stm32fxxx.ld.S similarity index 100% rename from src/webcam/stm32fxxx.ld.S rename to src/uvc/stm32fxxx.ld.S