More work to merge revF and 2020/2021 branches
authorMichael McMaster <michael@codesrc.com>
Mon, 8 Mar 2021 03:11:20 +0000 (13:11 +1000)
committerMichael McMaster <michael@codesrc.com>
Mon, 8 Mar 2021 03:11:20 +0000 (13:11 +1000)
Makefile.2020c
Makefile.revF
STM32CubeMX/revF/Inc/main.h
STM32CubeMX/revF/Src/gpio.c
STM32CubeMX/revF/TrueSTUDIO/SCSI2SD-V6 Configuration/.cproject [deleted file]
STM32CubeMX/revF/TrueSTUDIO/SCSI2SD-V6 Configuration/.project [deleted file]
STM32CubeMX/revF/TrueSTUDIO/revF/revF.elf.launch
STM32CubeMX/revF/revF.ioc
src/firmware/hwversion.c
src/firmware/main.c

index bbc1f9f1aa5aafff4da825fb3ca8f225282d2a8e..bb2afd60eb949dd62e2011ae73dd515aad154b53 100644 (file)
@@ -2,7 +2,7 @@
 ARMCC=arm-none-eabi-gcc
 OBJCOPY=arm-none-eabi-objcopy
 
-CPPFLAGS=-DSTM32F205xx -DSTM32F2xx -DUSE_HAL_DRIVER -Wall -DS2S_USB_FS
+CPPFLAGS=-DSTM32F205xx -DSTM32F2xx -DUSE_HAL_DRIVER -Wall -DS2S_USB_FS -DREV_2020
 CFLAGS=-mcpu=cortex-m3 -mthumb -mslow-flash-data \
        -std=gnu11 \
        -specs=nosys.specs \
index 4099808b87f61cb702a32ade4f17cb9503f5077e..5dadcc24861caeaddd516de721b0a5134d9d99b1 100644 (file)
@@ -2,7 +2,7 @@
 ARMCC=arm-none-eabi-gcc
 OBJCOPY=arm-none-eabi-objcopy
 
-CPPFLAGS=-DSTM32F2xx -DSTM32F205xx -DUSE_HAL_DRIVER -Wall 
+CPPFLAGS=-DSTM32F2xx -DSTM32F205xx -DUSE_HAL_DRIVER -Wall -DS2S_USB_FS -DREV_2019
 CFLAGS=-mcpu=cortex-m3 -mthumb -mslow-flash-data \
        -std=gnu11 \
        -specs=nosys.specs \
@@ -26,96 +26,80 @@ STM32CubeMX_INCUDE = \
        -ISTM32CubeMX/revF/Middlewares/ST/STM32_USB_Device_Library/Core/Inc \
        -Isrc/firmware/usb_device \
 
-all: build/firmware.dfu
-
-build/stm32cubemx/bsp_driver_sd.o: STM32CubeMX/revF/Src/bsp_driver_sd.c
-build/stm32cubemx/fsmc.o: STM32CubeMX/revF/Src/fsmc.c
-build/stm32cubemx/gpio.o: STM32CubeMX/revF/Src/gpio.c
-build/stm32cubemx/main.o: STM32CubeMX/revF/Src/main.c
-build/stm32cubemx/sdio.o: STM32CubeMX/revF/Src/sdio.c
-build/stm32cubemx/spi.o: STM32CubeMX/revF/Src/spi.c
-build/stm32cubemx/stm32f2xx_hal_msp.o: STM32CubeMX/revF/Src/stm32f2xx_hal_msp.c
-build/stm32cubemx/stm32f2xx_it.o: STM32CubeMX/revF/Src/stm32f2xx_it.c
-build/stm32cubemx/usart.o: STM32CubeMX/revF/Src/usart.c
-build/stm32cubemx/usbd_conf.o: STM32CubeMX/revF/Src/usbd_conf.c
-build/stm32cubemx/usbh_conf.o: STM32CubeMX/revF/Src/usbh_conf.c
-build/stm32cubemx/usb_host.o: STM32CubeMX/revF/Src/usb_host.c
-build/stm32cubemx/stm32f2xx_hal.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal.c
-build/stm32cubemx/stm32f2xx_hal_cortex.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_cortex.c
-build/stm32cubemx/stm32f2xx_hal_dma.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_dma.c
-build/stm32cubemx/stm32f2xx_hal_flash.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_flash.c
-build/stm32cubemx/stm32f2xx_hal_flash_ex.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_flash_ex.c
-build/stm32cubemx/stm32f2xx_hal_gpio.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_gpio.c
-build/stm32cubemx/stm32f2xx_hal_hcd.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_hcd.c
-build/stm32cubemx/stm32f2xx_hal_pcd.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd.c
-build/stm32cubemx/stm32f2xx_hal_pcd_ex.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd_ex.c
-build/stm32cubemx/stm32f2xx_hal_rcc.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_rcc.c
-build/stm32cubemx/stm32f2xx_hal_sd.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_sd.c
-build/stm32cubemx/stm32f2xx_hal_spi.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_spi.c
-build/stm32cubemx/stm32f2xx_hal_sram.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_sram.c
-build/stm32cubemx/stm32f2xx_hal_tim.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_tim.c
-build/stm32cubemx/stm32f2xx_hal_tim_ex.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_tim_ex.c
-build/stm32cubemx/stm32f2xx_hal_uart.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_uart.c
-build/stm32cubemx/stm32f2xx_ll_fsmc.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_fsmc.c
-build/stm32cubemx/stm32f2xx_ll_sdmmc.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_sdmmc.c
-build/stm32cubemx/stm32f2xx_ll_usb.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_usb.c
-build/stm32cubemx/usbd_core.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
-build/stm32cubemx/usbd_ctlreq.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
-build/stm32cubemx/usbd_ioreq.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
-build/stm32cubemx/usbh_core.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_core.c
-build/stm32cubemx/usbh_ctlreq.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c
-build/stm32cubemx/usbh_ioreq.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ioreq.c
-build/stm32cubemx/usbh_pipes.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_pipes.c
-build/stm32cubemx/usbh_msc.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc.c
-build/stm32cubemx/usbh_msc_bot.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c
-build/stm32cubemx/usbh_msc_scsi.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_scsi.c
-build/stm32cubemx/system_stm32f2xx.o: STM32CubeMX/revF/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
-build/stm32cubemx/startup_stm32f205xx.o: STM32CubeMX/revF/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f205xx.s
+all: build/firmware.V6.revF.dfu
+
+build/revF/stm32cubemx/dma.o: STM32CubeMX/revF/Src/dma.c
+build/revF/stm32cubemx/fsmc.o: STM32CubeMX/revF/Src/fsmc.c
+build/revF/stm32cubemx/gpio.o: STM32CubeMX/revF/Src/gpio.c
+build/revF/stm32cubemx/main.o: STM32CubeMX/revF/Src/main.c
+build/revF/stm32cubemx/sdio.o: STM32CubeMX/revF/Src/sdio.c
+build/revF/stm32cubemx/spi.o: STM32CubeMX/revF/Src/spi.c
+build/revF/stm32cubemx/tim.o: STM32CubeMX/revF/Src/tim.c
+build/revF/stm32cubemx/stm32f2xx_hal_msp.o: STM32CubeMX/revF/Src/stm32f2xx_hal_msp.c
+build/revF/stm32cubemx/stm32f2xx_it.o: STM32CubeMX/revF/Src/stm32f2xx_it.c
+build/revF/stm32cubemx/usart.o: STM32CubeMX/revF/Src/usart.c
+build/revF/stm32cubemx/usbd_conf.o: STM32CubeMX/revF/Src/usbd_conf.c
+build/revF/stm32cubemx/stm32f2xx_hal.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal.c
+build/revF/stm32cubemx/stm32f2xx_hal_cortex.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_cortex.c
+build/revF/stm32cubemx/stm32f2xx_hal_dma.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_dma.c
+build/revF/stm32cubemx/stm32f2xx_hal_flash.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_flash.c
+build/revF/stm32cubemx/stm32f2xx_hal_flash_ex.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_flash_ex.c
+build/revF/stm32cubemx/stm32f2xx_hal_gpio.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_gpio.c
+build/revF/stm32cubemx/stm32f2xx_hal_hcd.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_hcd.c
+build/revF/stm32cubemx/stm32f2xx_hal_pcd.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd.c
+build/revF/stm32cubemx/stm32f2xx_hal_pcd_ex.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd_ex.c
+build/revF/stm32cubemx/stm32f2xx_hal_rcc.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_rcc.c
+build/revF/stm32cubemx/stm32f2xx_hal_sd.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_sd.c
+build/revF/stm32cubemx/stm32f2xx_hal_spi.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_spi.c
+build/revF/stm32cubemx/stm32f2xx_hal_sram.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_sram.c
+build/revF/stm32cubemx/stm32f2xx_hal_tim.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_tim.c
+build/revF/stm32cubemx/stm32f2xx_hal_tim_ex.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_tim_ex.c
+build/revF/stm32cubemx/stm32f2xx_hal_uart.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_uart.c
+build/revF/stm32cubemx/stm32f2xx_ll_fsmc.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_fsmc.c
+build/revF/stm32cubemx/stm32f2xx_ll_sdmmc.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_sdmmc.c
+build/revF/stm32cubemx/stm32f2xx_ll_usb.o: STM32CubeMX/revF/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_usb.c
+build/revF/stm32cubemx/usbd_core.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
+build/revF/stm32cubemx/usbd_ctlreq.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
+build/revF/stm32cubemx/usbd_ioreq.o: STM32CubeMX/revF/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
+build/revF/stm32cubemx/system_stm32f2xx.o: STM32CubeMX/revF/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
+build/revF/stm32cubemx/startup_stm32f205xx.o: STM32CubeMX/revF/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f205xx.s
 
 STM32OBJS = \
-       build/stm32cubemx/bsp_driver_sd.o \
-       build/stm32cubemx/fsmc.o \
-       build/stm32cubemx/gpio.o \
-       build/stm32cubemx/main.o \
-       build/stm32cubemx/sdio.o \
-       build/stm32cubemx/spi.o \
-       build/stm32cubemx/stm32f2xx_hal_msp.o \
-       build/stm32cubemx/stm32f2xx_it.o \
-       build/stm32cubemx/usart.o \
-       build/stm32cubemx/usbd_conf.o \
-       build/stm32cubemx/usbh_conf.o \
-       build/stm32cubemx/usb_host.o \
-       build/stm32cubemx/stm32f2xx_hal.o \
-       build/stm32cubemx/stm32f2xx_hal_cortex.o \
-       build/stm32cubemx/stm32f2xx_hal_dma.o \
-       build/stm32cubemx/stm32f2xx_hal_flash.o \
-       build/stm32cubemx/stm32f2xx_hal_flash_ex.o \
-       build/stm32cubemx/stm32f2xx_hal_gpio.o \
-       build/stm32cubemx/stm32f2xx_hal_hcd.o \
-       build/stm32cubemx/stm32f2xx_hal_pcd.o \
-       build/stm32cubemx/stm32f2xx_hal_pcd_ex.o \
-       build/stm32cubemx/stm32f2xx_hal_rcc.o \
-       build/stm32cubemx/stm32f2xx_hal_sd.o \
-       build/stm32cubemx/stm32f2xx_hal_spi.o \
-       build/stm32cubemx/stm32f2xx_hal_sram.o \
-       build/stm32cubemx/stm32f2xx_hal_tim.o \
-       build/stm32cubemx/stm32f2xx_hal_tim_ex.o \
-       build/stm32cubemx/stm32f2xx_hal_uart.o \
-       build/stm32cubemx/stm32f2xx_ll_fsmc.o \
-       build/stm32cubemx/stm32f2xx_ll_sdmmc.o \
-       build/stm32cubemx/stm32f2xx_ll_usb.o \
-       build/stm32cubemx/usbd_core.o \
-       build/stm32cubemx/usbd_ctlreq.o \
-       build/stm32cubemx/usbd_ioreq.o \
-       build/stm32cubemx/usbh_core.o \
-       build/stm32cubemx/usbh_ctlreq.o \
-       build/stm32cubemx/usbh_ioreq.o \
-       build/stm32cubemx/usbh_pipes.o \
-       build/stm32cubemx/usbh_msc.o \
-       build/stm32cubemx/usbh_msc_bot.o \
-       build/stm32cubemx/usbh_msc_scsi.o \
-       build/stm32cubemx/system_stm32f2xx.o \
-       build/stm32cubemx/startup_stm32f205xx.o \
+       build/revF/stm32cubemx/dma.o \
+       build/revF/stm32cubemx/fsmc.o \
+       build/revF/stm32cubemx/gpio.o \
+       build/revF/stm32cubemx/main.o \
+       build/revF/stm32cubemx/sdio.o \
+       build/revF/stm32cubemx/spi.o \
+       build/revF/stm32cubemx/tim.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_msp.o \
+       build/revF/stm32cubemx/stm32f2xx_it.o \
+       build/revF/stm32cubemx/usart.o \
+       build/revF/stm32cubemx/usbd_conf.o \
+       build/revF/stm32cubemx/stm32f2xx_hal.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_cortex.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_dma.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_flash.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_flash_ex.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_gpio.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_hcd.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_pcd.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_pcd_ex.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_rcc.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_sd.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_spi.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_sram.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_tim.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_tim_ex.o \
+       build/revF/stm32cubemx/stm32f2xx_hal_uart.o \
+       build/revF/stm32cubemx/stm32f2xx_ll_fsmc.o \
+       build/revF/stm32cubemx/stm32f2xx_ll_sdmmc.o \
+       build/revF/stm32cubemx/stm32f2xx_ll_usb.o \
+       build/revF/stm32cubemx/usbd_core.o \
+       build/revF/stm32cubemx/usbd_ctlreq.o \
+       build/revF/stm32cubemx/usbd_ioreq.o \
+       build/revF/stm32cubemx/system_stm32f2xx.o \
+       build/revF/stm32cubemx/startup_stm32f205xx.o \
 
 # Modified versin from stm32cubemx for a composite class with both
 # mass-storage and HID interfaces
@@ -153,46 +137,47 @@ SRC = \
        src/firmware/tape.c \
        src/firmware/time.c \
        src/firmware/vendor.c \
+       src/firmware/bsp_driver_sd.c \
        ${USBCOMPOSITE_SRC}
 
-build/firmware.elf: $(SRC) rtl/fpga_bitmap.o $(STM32OBJS)
+build/revF/firmware.elf: $(SRC) rtl/fpga_bitmap.o $(STM32OBJS)
        $(ARMCC) $(CPPFLAGS) $(CFLAGS) -o $@ $(STM32CubeMX_INCUDE) $(INCLUDE) $^ $(LDFLAGS)
-       @EBSS=`arm-none-eabi-nm build/firmware.elf | grep _ebss | cut -f1 "-d "`; \
+       @EBSS=`arm-none-eabi-nm build/revF/firmware.elf | grep _ebss | cut -f1 "-d "`; \
        echo HEAPSIZE = $$((0x2001C000 - 0x$${EBSS})) bytes
        @echo STACKSIZE = 16384 bytes
 
 
-build/firmware.bin: build/firmware.elf
+build/revF/firmware.bin: build/revF/firmware.elf
        $(OBJCOPY) -O binary $< $@
 
 # Example to hard-code config within firmware
 #sudo arm-none-eabi-objcopy --update-section .fixed_config=config.dat firmware.elf -O binary firmware.bin
 
-build/stm32cubemx/%.o:
-       mkdir -p build/stm32cubemx
+build/revF/stm32cubemx/%.o:
+       mkdir -p build/revF/stm32cubemx
        $(ARMCC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(STM32CubeMX_INCUDE) $(INCLUDE) $^
 
 
-build/stm32cubemx/stm32f2xx_it.o:
-       mkdir -p build/stm32cubemx
+build/revF/stm32cubemx/stm32f2xx_it.o:
+       mkdir -p build/revF/stm32cubemx
        $(ARMCC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(STM32CubeMX_INCUDE) $(INCLUDE) $^
        $(OBJCOPY) -N EXTI4_IRQHandler $@
 
-build/stm32cubemx/system_stm32f2xx.o:
-       mkdir -p build/stm32cubemx
+build/revF/stm32cubemx/system_stm32f2xx.o:
+       mkdir -p build/revF/stm32cubemx
        $(ARMCC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(STM32CubeMX_INCUDE) $(INCLUDE) $^
        $(OBJCOPY) --redefine-sym SystemInit=OrigSystemInit $@
 
-build/scsiPhy.s: src/firmware/scsiPhy.c
+build/revF/scsiPhy.s: src/firmware/scsiPhy.c
        $(ARMCC) $(CPPFLAGS) $(CFLAGS) -S -o $@ $(STM32CubeMX_INCUDE) $(INCLUDE) $^
 
 
-build/firmware.dfu: build/firmware.bin
+build/firmware.V6.revF.dfu: build/revF/firmware.bin
        python tools/dfu-convert.py -b 0x08000000:$< $@
 
 clean:
-       rm -f build/firmware.elf build/firmware.bin
+       rm -rf build/revF build/firmware.V6.revF.dfu
 
 program:
-       dfu-util --download build/firmware.dfu --alt 0
+       dfu-util --download build/firmware.V6.revF.dfu --alt 0
 
index a257d76c2e09bd7d3705aa2f89823bb735f4ab26..cb5272c08b2d0c40b22fa35fee11caa7eb7956e7 100644 (file)
@@ -91,12 +91,12 @@ void Error_Handler(void);
 #define UNUSED_PA3_GPIO_Port GPIOA
 #define nSPICFG_CS_Pin GPIO_PIN_4
 #define nSPICFG_CS_GPIO_Port GPIOA
-#define UNUSED_PC4_Pin GPIO_PIN_4
-#define UNUSED_PC4_GPIO_Port GPIOC
-#define UNUSED_PC5_Pin GPIO_PIN_5
-#define UNUSED_PC5_GPIO_Port GPIOC
-#define LED_Pin GPIO_PIN_0
-#define LED_GPIO_Port GPIOB
+#define VER_ID1_Pin GPIO_PIN_4
+#define VER_ID1_GPIO_Port GPIOC
+#define VER_ID2_Pin GPIO_PIN_5
+#define VER_ID2_GPIO_Port GPIOC
+#define LED_IO_Pin GPIO_PIN_0
+#define LED_IO_GPIO_Port GPIOB
 #define nTERM_EN_Pin GPIO_PIN_1
 #define nTERM_EN_GPIO_Port GPIOB
 #define BOOT1_Pin GPIO_PIN_2
index c33a04cba65739beb3d105cbb4e2c39485fb2cdb..c3b55254f7558fd3765a1ba4cf53a1021d30969b 100644 (file)
@@ -54,7 +54,7 @@ void MX_GPIO_Init(void)
   __HAL_RCC_GPIOD_CLK_ENABLE();
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, LED_Pin|nTERM_EN_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOB, LED_IO_Pin|nTERM_EN_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(FPGA_RST_GPIO_Port, FPGA_RST_Pin, GPIO_PIN_RESET);
@@ -72,11 +72,9 @@ void MX_GPIO_Init(void)
   HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
 
   /*Configure GPIO pins : PCPin PCPin PCPin PCPin 
-                           PCPin PCPin PCPin PCPin 
-                           PCPin */
+                           PCPin PCPin PCPin */
   GPIO_InitStruct.Pin = UNUSED_PC13_Pin|UNUSED_PC14_Pin|UNUSED_PC15_Pin|UNUSED_PC0_Pin 
-                          |UNUSED_PC1_Pin|UNUSED_PC2_Pin|UNUSED_PC3_Pin|UNUSED_PC4_Pin 
-                          |UNUSED_PC5_Pin;
+                          |UNUSED_PC1_Pin|UNUSED_PC2_Pin|UNUSED_PC3_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLDOWN;
   HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
@@ -93,12 +91,18 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   HAL_GPIO_Init(nSPICFG_CS_GPIO_Port, &GPIO_InitStruct);
 
+  /*Configure GPIO pins : PCPin PCPin */
+  GPIO_InitStruct.Pin = VER_ID1_Pin|VER_ID2_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
   /*Configure GPIO pin : PtPin */
-  GPIO_InitStruct.Pin = LED_Pin;
+  GPIO_InitStruct.Pin = LED_IO_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_PULLDOWN;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(LED_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init(LED_IO_GPIO_Port, &GPIO_InitStruct);
 
   /*Configure GPIO pin : PtPin */
   GPIO_InitStruct.Pin = nTERM_EN_Pin;
diff --git a/STM32CubeMX/revF/TrueSTUDIO/SCSI2SD-V6 Configuration/.cproject b/STM32CubeMX/revF/TrueSTUDIO/SCSI2SD-V6 Configuration/.cproject
deleted file mode 100644 (file)
index b322318..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-       <storageModule moduleId="org.eclipse.cdt.core.settings">
-               <cconfiguration id="com.atollic.truestudio.exe.debug.1518366166">
-                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.atollic.truestudio.exe.debug.1518366166" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-                               <externalSettings />
-                               <extensions>
-                                       <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser" />
-                                       <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser" />
-                                       <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser" />
-                                       <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser" />
-                               </extensions>
-                       </storageModule>
-                       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactExtension="elf" artifactName="SCSI2SD-V6 Configuration" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="com.atollic.truestudio.exe.debug.1518366166" name="Debug" parent="com.atollic.truestudio.exe.debug" postbuildStep="" prebuildStep="">
-                                       <folderInfo id="com.atollic.truestudio.exe.debug.1518366166.2031504340" name="/" resourcePath="">
-                                               <toolChain id="com.atollic.truestudio.exe.debug.toolchain.683225115" name="Atollic ARM Tools" superClass="com.atollic.truestudio.exe.debug.toolchain">
-                                                       <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.atollic.truestudio.exe.debug.toolchain.platform.2054752829" isAbstract="false" name="Debug platform" superClass="com.atollic.truestudio.exe.debug.toolchain.platform" />
-                                                       <builder buildPath="${workspace_loc:/STM32100B-EVAL/Debug}" id="com.atollic.truestudio.mbs.builder1.1222194476" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="com.atollic.truestudio.mbs.builder1">
-                                                               <outputEntries>
-                                                                       <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="Debug" />
-                                                               </outputEntries>
-                                                       </builder>
-                                                       <tool command="arm-atollic-eabi-gcc -c" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX} ${OUTPUT} ${INPUTS}" id="com.atollic.truestudio.exe.debug.toolchain.as.1545899283" name="Assembler" superClass="com.atollic.truestudio.exe.debug.toolchain.as">
-                                                               <option id="com.atollic.truestudio.common_options.target.endianess.1608144567" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess" value="com.atollic.truestudio.common_options.target.endianess.little" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.mcpu.286463162" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F205VC" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.instr_set.2033833414" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.as.general.incpath.770237934" name="Include path" superClass="com.atollic.truestudio.as.general.incpath" valueType="includePath" />
-                                                                <option id="com.atollic.truestudio.gcc.symbols.defined.1670122205" name="Defined symbols" superClass="com.atollic.truestudio.gcc.symbols.defined" valueType="definedSymbols" />
-                                                                <option id="com.atollic.truestudio.as.general.otherflags.51384659" superClass="com.atollic.truestudio.as.general.otherflags" value="" valueType="string" />
-                                                                <option id="com.atollic.truestudio.as.general.warnings.1324541152" superClass="com.atollic.truestudio.as.general.warnings" value="true" valueType="boolean" />
-                                                                <inputType id="com.atollic.truestudio.as.input.374932590" name="Input" superClass="com.atollic.truestudio.as.input" />
-                                                                <option id="com.atollic.truestudio.common_options.target.fpu.829683864" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" value="com.atollic.truestudio.common_options.target.fpu.soft" valueType="enumerated" />
-                                                                <option id="com.atollic.truestudio.common_options.target.fpucore.1297069055" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated" />
-                                                        </tool>
-                                                       <tool command="arm-atollic-eabi-gcc -c " commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX} ${OUTPUT} ${INPUTS}" id="com.atollic.truestudio.exe.debug.toolchain.gcc.1836874447" name="C Compiler" superClass="com.atollic.truestudio.exe.debug.toolchain.gcc">
-                                                               <option id="com.atollic.truestudio.gcc.directories.select.330946435" name="Include path" superClass="com.atollic.truestudio.gcc.directories.select" valueType="includePath"><listOptionValue builtIn="false" value="../../../Inc" /><listOptionValue builtIn="false" value="../../../Drivers/STM32F2xx_HAL_Driver/Inc" /><listOptionValue builtIn="false" value="../../../Drivers/STM32F2xx_HAL_Driver/Inc/Legacy" /><listOptionValue builtIn="false" value="../../../Middlewares/Third_Party/FatFs/src/drivers" /><listOptionValue builtIn="false" value="../../../Middlewares/ST/STM32_USB_Device_Library/Core/Inc" /><listOptionValue builtIn="false" value="../../../Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc" /><listOptionValue builtIn="false" value="../../../Middlewares/ST/STM32_USB_Host_Library/Core/Inc" /><listOptionValue builtIn="false" value="../../../Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc" /><listOptionValue builtIn="false" value="../../../Middlewares/Third_Party/FatFs/src" /><listOptionValue builtIn="false" value="../../../Drivers/CMSIS/Include" /><listOptionValue builtIn="false" value="../../../Drivers/CMSIS/Device/ST/STM32F2xx/Include" /><listOptionValue builtIn="false" value="" /><listOptionValue builtIn="false" value="" /><listOptionValue builtIn="false" value="" /></option>
-                                                               <option id="com.atollic.truestudio.gcc.symbols.defined.1670122205" name="Defined symbols" superClass="com.atollic.truestudio.gcc.symbols.defined" valueType="definedSymbols"><listOptionValue builtIn="false" value="__weak=&quot;__attribute__((weak))&quot;" /><listOptionValue builtIn="false" value="__packed=&quot;__attribute__((__packed__))&quot;" /><listOptionValue builtIn="false" value="USE_HAL_DRIVER" /><listOptionValue builtIn="false" value="STM32F205xx" /><listOptionValue builtIn="false" value="" /><listOptionValue builtIn="false" value="" /></option>
-                                                               <option id="com.atollic.truestudio.common_options.target.endianess.1854274048" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess" value="com.atollic.truestudio.common_options.target.endianess.little" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.mcpu.191909026" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F205VC" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.instr_set.1503159865" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.gcc.optimization.prep_garbage.586275206" name="Prepare dead code removal" superClass="com.atollic.truestudio.gcc.optimization.prep_garbage" value="true" valueType="boolean" />
-                                                               <option id="com.atollic.truestudio.gcc.optimization.prep_data.1044766448" name="Prepare dead data removal" superClass="com.atollic.truestudio.gcc.optimization.prep_data" value="true" valueType="boolean" />
-                                                                <!--option id="com.atollic.truestudio.gcc.misc.otherflags.895097519" name="Other options" superClass="com.atollic.truestudio.gcc.misc.otherflags" value=" -Os -w -mlong-callss" valueType="string"/-->
-                                                               <option id="com.atollic.truestudio.exe.debug.toolchain.gcc.optimization.level.1763412676" name="Optimization Level" superClass="com.atollic.truestudio.exe.debug.toolchain.gcc.optimization.level" value="com.atollic.truestudio.gcc.optimization.level.0s" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.fpu.829683864" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" value="com.atollic.truestudio.common_options.target.fpu.soft" valueType="enumerated" />
-                                                                <option id="com.atollic.truestudio.common_options.target.fpucore.1297069055" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated" />
-                                                               <inputType id="com.atollic.truestudio.gcc.input.850396938" superClass="com.atollic.truestudio.gcc.input" />
-                                                       </tool>
-                                                       <tool id="com.atollic.truestudio.exe.debug.toolchain.ld.1444973427" name="C Linker" superClass="com.atollic.truestudio.exe.debug.toolchain.ld">
-                                                               <option id="com.atollic.truestudio.common_options.target.endianess.662778612" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess" value="com.atollic.truestudio.common_options.target.endianess.little" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.mcpu.35700531" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F205VC" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.instr_set.566688004" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.ld.general.scriptfile.1350476438" name="Linker script" superClass="com.atollic.truestudio.ld.general.scriptfile" value="../STM32F205VC_FLASH.ld" valueType="string" />
-                                                               <option id="com.atollic.truestudio.ld.optimization.do_garbage.1816004776" name="Dead code removal" superClass="com.atollic.truestudio.ld.optimization.do_garbage" value="true" valueType="boolean" />
-                                                                <option id="com.atollic.truestudio.ld.libraries.list.848669414" superClass="com.atollic.truestudio.ld.libraries.list" valueType="libs" />
-                                                                <option id="com.atollic.truestudio.ld.libraries.searchpath.1273009461" superClass="com.atollic.truestudio.ld.libraries.searchpath" valueType="libPaths" />
-                                                                <!--option id="com.atollic.truestudio.ld.misc.linkerflags.1948405714" superClass="com.atollic.truestudio.ld.misc.linkerflags" value="" valueType="string"/>-->
-                                                                <option id="com.atollic.truestudio.common_options.target.fpu.829683864" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" value="com.atollic.truestudio.common_options.target.fpu.soft" valueType="enumerated" />
-                                                                <option id="com.atollic.truestudio.common_options.target.fpucore.1297069055" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated" />
-                                                                <inputType id="com.atollic.truestudio.ld.input.1372975870" name="Input" superClass="com.atollic.truestudio.ld.input">
-                                                                       <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)" />
-                                                                       <additionalInput kind="additionalinput" paths="$(LIBS)" />
-                                                               </inputType>
-                                                       </tool>
-                                                       <tool id="com.atollic.truestudio.exe.debug.toolchain.gpp.981298185" name="C++ Compiler" superClass="com.atollic.truestudio.exe.debug.toolchain.gpp">
-                                                               <option id="com.atollic.truestudio.gpp.symbols.defined.1619552487" name="Defined symbols" superClass="com.atollic.truestudio.gpp.symbols.defined" valueType="stringList">
-                                                                       <listOptionValue builtIn="false" value="STM32F10X_MD" />
-                                                                       <listOptionValue builtIn="false" value="USE_STDPERIPH_DRIVER" />
-                                                               </option>
-                                                               <option id="com.atollic.truestudio.common_options.target.endianess.176262651" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess" value="com.atollic.truestudio.common_options.target.endianess.little" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.mcpu.630487808" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F205VC" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.instr_set.227324580" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.gpp.optimization.prep_garbage.26464025" name="Prepare dead code removal" superClass="com.atollic.truestudio.gpp.optimization.prep_garbage" value="true" valueType="boolean" />
-                                                               <option id="com.atollic.truestudio.gpp.optimization.fno_rtti.1009504734" name="Disable RTTI" superClass="com.atollic.truestudio.gpp.optimization.fno_rtti" />
-                                                               <option id="com.atollic.truestudio.gpp.optimization.fno_exceptions.342217745" name="Disable exception handling" superClass="com.atollic.truestudio.gpp.optimization.fno_exceptions" />
-                                                                <option id="com.atollic.truestudio.common_options.target.fpu.829683864" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" value="com.atollic.truestudio.common_options.target.fpu.soft" valueType="enumerated" />
-                                                                <option id="com.atollic.truestudio.common_options.target.fpucore.1297069055" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated" />
-                                                        </tool>
-                                                       <tool id="com.atollic.truestudio.exe.debug.toolchain.ldcc.428260" name="C++ Linker" superClass="com.atollic.truestudio.exe.debug.toolchain.ldcc">
-                                                               <option id="com.atollic.truestudio.common_options.target.endianess.2051741049" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess" value="com.atollic.truestudio.common_options.target.endianess.little" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.mcpu.1701726850" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F205VC" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.common_options.target.instr_set.1600237525" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated" />
-                                                               <option id="com.atollic.truestudio.ldcc.optimization.do_garbage.956844137" name="Dead code removal" superClass="com.atollic.truestudio.ldcc.optimization.do_garbage" value="true" valueType="boolean" />
-                                                               <option id="com.atollic.truestudio.ldcc.general.scriptfile.561304432" name="Linker script" superClass="com.atollic.truestudio.ldcc.general.scriptfile" value="../STM32F205VC_FLASH.ld" valueType="string" />
-                                                                <option id="com.atollic.truestudio.common_options.target.fpu.829683864" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" value="com.atollic.truestudio.common_options.target.fpu.soft" valueType="enumerated" />
-                                                                <option id="com.atollic.truestudio.common_options.target.fpucore.1297069055" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated" />
-                                                        </tool>
-                                                       <tool id="com.atollic.truestudio.exe.debug.toolchain.secoutput.839033486" name="Other" superClass="com.atollic.truestudio.exe.debug.toolchain.secoutput" />
-                                               </toolChain>
-                                       </folderInfo>
-                                       <fileInfo id="com.atollic.truestudio.exe.debug.311825581.983937533" name="" rcbsApplicability="disable" resourcePath="nofile" toolsToInvoke="com.atollic.truestudio.exe.debug.toolchain.gcc.1123980438.1469152088">
-                                               <tool id="com.atollic.truestudio.exe.debug.toolchain.gcc.1836874447.1976695455" name="C Compiler" superClass="com.atollic.truestudio.exe.debug.toolchain.gcc.1836874447">
-                                                       <!--option id="com.atollic.truestudio.gcc.symbols.defined.571688647" superClass="com.atollic.truestudio.gcc.symbols.defined" valueType="definedSymbols">
-                                                               <listOptionValue builtIn="false" value=""/>
-                                                       </option-->
-                                                       <!--option id="com.atollic.truestudio.gcc.directories.select.1885522499" superClass="com.atollic.truestudio.gcc.directories.select" valueType="includePath">
-                                                               <listOptionValue builtIn="false" value=""/>
-                                                       </option-->
-                                                       <!--option id="com.atollic.truestudio.exe.debug.toolchain.gcc.optimization.level.2088348838" superClass="com.atollic.truestudio.exe.debug.toolchain.gcc.optimization.level" value="" valueType="enumerated"/-->
-                                                       <inputType id="com.atollic.truestudio.gcc.input.1274347818" superClass="com.atollic.truestudio.gcc.input" />
-                                               </tool>
-                                       </fileInfo>
-                                       <!--fileInfo id="com.atollic.truestudio.exe.debug.1518366166.2095950970" name="main.c" rcbsApplicability="disable" resourcePath="User/main.c" toolsToInvoke="com.atollic.truestudio.exe.debug.toolchain.gcc.1836874447.1976695455">
-                                               <tool id="com.atollic.truestudio.exe.debug.toolchain.gcc.1836874447.1976695455" name="C Compiler" superClass="com.atollic.truestudio.exe.debug.toolchain.gcc.1836874447">
-                                                       <option id="com.atollic.truestudio.common_options.target.mcpu.1225149534" superClass="com.atollic.truestudio.common_options.target.mcpu" value="ARM7TDMI" valueType="enumerated"/>
-                                                       <option id="com.atollic.truestudio.common_options.target.endianess.611625540" superClass="com.atollic.truestudio.common_options.target.endianess" value="com.atollic.truestudio.common_options.target.endianess.big" valueType="enumerated"/>
-                                                       <option id="com.atollic.truestudio.gcc.symbols.defined.661170442" superClass="com.atollic.truestudio.gcc.symbols.defined" valueType="definedSymbols">
-                                                               <listOptionValue builtIn="false" value="USE_STDPERIPH_DRIVER"/>
-                                                               <listOptionValue builtIn="false" value=""/>
-                                                               <listOptionValue builtIn="false" value="STM32F40XX"/>
-                                                               <listOptionValue builtIn="false" value="test_file_settings"/>
-                                                       </option>
-                                                       <inputType id="com.atollic.truestudio.gcc.input.570481643" superClass="com.atollic.truestudio.gcc.input"/>
-                                               </tool>
-                                       </fileInfo-->
-                                       <sourceEntries>
-                                               <entry excluding="" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="" />
-                                       </sourceEntries>
-                               </configuration>
-                       </storageModule>
-                       <storageModule moduleId="org.eclipse.cdt.core.externalSettings" />
-                       <storageModule moduleId="org.eclipse.cdt.core.language.mapping" />
-                       <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings" />
-               </cconfiguration>
-       </storageModule>
-       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-               <project id="STM32100B-EVAL.com.atollic.truestudio.exe.1549124020" name="Executable" projectType="com.atollic.truestudio.exe" />
-       </storageModule>
-       <storageModule moduleId="refreshScope" />
-       <storageModule moduleId="scannerConfiguration">
-               <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="" />
-               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-                       <buildOutputProvider>
-                               <openAction enabled="true" filePath="" />
-                               <parser enabled="true" />
-                       </buildOutputProvider>
-                       <scannerInfoProvider id="makefileGenerator">
-                               <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true" />
-                               <parser enabled="true" />
-                       </scannerInfoProvider>
-               </profile>
-               <scannerConfigBuildInfo instanceId="com.atollic.truestudio.exe.debug.1518366166;com.atollic.truestudio.exe.debug.1518366166.303277065;com.atollic.truestudio.exe.debug.toolchain.gcc.393815702;com.atollic.truestudio.gcc.input.1088835115">
-                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC" />
-                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-                               <buildOutputProvider>
-                                       <openAction enabled="true" filePath="" />
-                                       <parser enabled="true" />
-                               </buildOutputProvider>
-                               <scannerInfoProvider id="makefileGenerator">
-                                       <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true" />
-                                       <parser enabled="true" />
-                               </scannerInfoProvider>
-                       </profile>
-               </scannerConfigBuildInfo>
-               <scannerConfigBuildInfo instanceId="com.atollic.truestudio.exe.debug.1518366166;com.atollic.truestudio.exe.debug.1518366166.;com.atollic.truestudio.exe.debug.toolchain.gcc.1836874447;com.atollic.truestudio.gcc.input.850396938">
-                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC" />
-                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-                               <buildOutputProvider>
-                                       <openAction enabled="true" filePath="" />
-                                       <parser enabled="true" />
-                               </buildOutputProvider>
-                               <scannerInfoProvider id="makefileGenerator">
-                                       <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true" />
-                                       <parser enabled="true" />
-                               </scannerInfoProvider>
-                       </profile>
-               </scannerConfigBuildInfo>
-       </storageModule>
-</cproject>
diff --git a/STM32CubeMX/revF/TrueSTUDIO/SCSI2SD-V6 Configuration/.project b/STM32CubeMX/revF/TrueSTUDIO/SCSI2SD-V6 Configuration/.project
deleted file mode 100644 (file)
index 55eb0ff..0000000
+++ /dev/null
@@ -1,636 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>SCSI2SD-V6 Configuration</name>
-       <comment />
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-                       <triggers>clean,full,incremental,</triggers>
-                       <arguments>
-                               <dictionary>
-                                       <key>?children?</key>
-                                       <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|\||</value>
-                               </dictionary>
-                               <dictionary>
-                                       <key>?name?</key>
-                                       <value />
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.append_environment</key>
-                                       <value>true</value>
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.buildArguments</key>
-                                       <value />
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.buildCommand</key>
-                                       <value>make</value>
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.buildLocation</key>
-                                       <value>${workspace_loc:/STM32100B-EVAL/Debug}</value>
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.contents</key>
-                                       <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-                                       <value>false</value>
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-                                       <value>true</value>
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.enableFullBuild</key>
-                                       <value>true</value>
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.stopOnError</key>
-                                       <value>true</value>
-                               </dictionary>
-                               <dictionary>
-                                       <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-                                       <value>true</value>
-                               </dictionary>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.cdt.core.cnature</nature>
-               <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-               <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-       </natures>
-       <linkedResources>
-               <link>
-                       <name />
-                       <type />
-                       <locationURI />
-               </link>
-       <link>
-                       <name>Drivers/CMSIS</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       
-                       <type>2</type>
-                       
-               </link><link>
-                       
-                       <type>2</type>
-                       
-               </link><link>
-                       <name>Middlewares/FatFs</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Device_Library</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       
-                       <type>2</type>
-                       
-               </link><link>
-                       <name>Application/User</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Application/TrueSTUDIO</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_sram.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_sram.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_ll_sdmmc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_sdmmc.c</locationURI>
-               </link><link>
-                       <name>Application/User/stm32f2xx_hal_msp.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/stm32f2xx_hal_msp.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_rcc_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_rcc_ex.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_pwr_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pwr_ex.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/ff.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/ff.c</locationURI>
-               </link><link>
-                       <name>Application/User/usb_host.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usb_host.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_core.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_core.c</locationURI>
-               </link><link>
-                       <name>Application/User/dma.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/dma.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_pipes.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_pipes.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/syscall.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/option/syscall.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Device_Library/usbd_ctlreq.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c</locationURI>
-               </link><link>
-                       <name>Drivers/CMSIS/system_stm32f2xx.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_ioreq.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ioreq.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_ll_usb.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_usb.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_dma_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_dma_ex.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/ff_gen_drv.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/ff_gen_drv.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_gpio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_gpio.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_ctlreq.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/sd_diskio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/drivers/sd_diskio.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_ll_fsmc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_fsmc.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_rcc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_rcc.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_spi.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_spi.c</locationURI>
-               </link><link>
-                       <name>Application/User/fsmc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/fsmc.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_msc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_pcd.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_pwr.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pwr.c</locationURI>
-               </link><link>
-                       <name>Application/User/usbd_conf.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usbd_conf.c</locationURI>
-               </link><link>
-                       <name>Application/User/usart.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usart.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_pcd_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd_ex.c</locationURI>
-               </link><link>
-                       <name>Application/User/spi.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/spi.c</locationURI>
-               </link><link>
-                       <name>Application/TrueSTUDIO/startup_stm32f205xx.s</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f205xx.s</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_uart.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_uart.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_tim.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_tim.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_sd.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_sd.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_msc_scsi.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_scsi.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_hcd.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_hcd.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_dma.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_dma.c</locationURI>
-               </link><link>
-                       <name>Application/User/usbd_desc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usbd_desc.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Device_Library/usbd_ioreq.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_flash.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_flash.c</locationURI>
-               </link><link>
-                       <name>Application/User/usbh_conf.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usbh_conf.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Device_Library/usbd_core.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/ccsbcs.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/option/ccsbcs.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/usbh_diskio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/drivers/usbh_diskio.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/diskio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/diskio.c</locationURI>
-               </link><link>
-                       <name>Application/User/stm32f2xx_it.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/stm32f2xx_it.c</locationURI>
-               </link><link>
-                       <name>Application/User/main.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/main.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_tim_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_tim_ex.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_msc_bot.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c</locationURI>
-               </link><link>
-                       <name>Application/User/sdio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/sdio.c</locationURI>
-               </link><link>
-                       <name>Application/User/bsp_driver_sd.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/bsp_driver_sd.c</locationURI>
-               </link><link>
-                       <name>Application/User/gpio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/gpio.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_cortex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_cortex.c</locationURI>
-               </link><link>
-                       <name>Application/User/fatfs.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/fatfs.c</locationURI>
-               </link><link>
-                       <name>Application/User/tim.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/tim.c</locationURI>
-               </link><link>
-                       <name>Application/User/usb_device.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usb_device.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_flash_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_flash_ex.c</locationURI>
-               </link><link>
-                       <name>Drivers/CMSIS</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Drivers</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Middlewares</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Device_Library</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Application</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Application/User</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Application/TrueSTUDIO</name>
-                       <type>2</type>
-                       <locationURI>virtual:/virtual</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_sram.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_sram.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_ll_sdmmc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_sdmmc.c</locationURI>
-               </link><link>
-                       <name>Application/User/stm32f2xx_hal_msp.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/stm32f2xx_hal_msp.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_rcc_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_rcc_ex.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_pwr_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pwr_ex.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/ff.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/ff.c</locationURI>
-               </link><link>
-                       <name>Application/User/usb_host.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usb_host.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_core.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_core.c</locationURI>
-               </link><link>
-                       <name>Application/User/dma.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/dma.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_pipes.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_pipes.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/syscall.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/option/syscall.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Device_Library/usbd_ctlreq.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c</locationURI>
-               </link><link>
-                       <name>Drivers/CMSIS/system_stm32f2xx.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_ioreq.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ioreq.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_ll_usb.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_usb.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_dma_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_dma_ex.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/ff_gen_drv.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/ff_gen_drv.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_gpio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_gpio.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_ctlreq.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/sd_diskio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/drivers/sd_diskio.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_ll_fsmc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_ll_fsmc.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_rcc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_rcc.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_spi.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_spi.c</locationURI>
-               </link><link>
-                       <name>Application/User/fsmc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/fsmc.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_msc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_pcd.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_pwr.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pwr.c</locationURI>
-               </link><link>
-                       <name>Application/User/usbd_conf.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usbd_conf.c</locationURI>
-               </link><link>
-                       <name>Application/User/usart.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usart.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_pcd_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_pcd_ex.c</locationURI>
-               </link><link>
-                       <name>Application/User/spi.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/spi.c</locationURI>
-               </link><link>
-                       <name>Application/TrueSTUDIO/startup_stm32f205xx.s</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f205xx.s</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_uart.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_uart.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Device_Library/usbd_hid.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_tim.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_tim.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_sd.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_sd.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_msc_scsi.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_scsi.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_hcd.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_hcd.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_dma.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_dma.c</locationURI>
-               </link><link>
-                       <name>Application/User/usbd_desc.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usbd_desc.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Device_Library/usbd_ioreq.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_flash.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_flash.c</locationURI>
-               </link><link>
-                       <name>Application/User/usbh_conf.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usbh_conf.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Device_Library/usbd_core.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/ccsbcs.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/option/ccsbcs.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/usbh_diskio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/drivers/usbh_diskio.c</locationURI>
-               </link><link>
-                       <name>Middlewares/FatFs/diskio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/Third_Party/FatFs/src/diskio.c</locationURI>
-               </link><link>
-                       <name>Application/User/stm32f2xx_it.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/stm32f2xx_it.c</locationURI>
-               </link><link>
-                       <name>Application/User/main.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/main.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_tim_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_tim_ex.c</locationURI>
-               </link><link>
-                       <name>Middlewares/USB_Host_Library/usbh_msc_bot.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c</locationURI>
-               </link><link>
-                       <name>Application/User/sdio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/sdio.c</locationURI>
-               </link><link>
-                       <name>Application/User/bsp_driver_sd.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/bsp_driver_sd.c</locationURI>
-               </link><link>
-                       <name>Application/User/gpio.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/gpio.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_cortex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_cortex.c</locationURI>
-               </link><link>
-                       <name>Application/User/fatfs.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/fatfs.c</locationURI>
-               </link><link>
-                       <name>Application/User/tim.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/tim.c</locationURI>
-               </link><link>
-                       <name>Application/User/usb_device.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Src/usb_device.c</locationURI>
-               </link><link>
-                       <name>Drivers/STM32F2xx_HAL_Driver/stm32f2xx_hal_flash_ex.c</name>
-                       <type>1</type>
-                       <locationURI>PARENT-2-PROJECT_LOC/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_flash_ex.c</locationURI>
-               </link></linkedResources>
-</projectDescription>
index ebfb968e93fc47e046a0e8c664d669822bc0605c..b4e9c948b037513b67020e50c294d871056c5fe8 100644 (file)
@@ -15,9 +15,9 @@
 <intAttribute key="com.atollic.hardwaredebug.launch.portNumber" value="61234" />
 <stringAttribute key="com.atollic.hardwaredebug.launch.remoteCommand" value="target extended-remote" />
 <stringAttribute key="com.atollic.hardwaredebug.launch.runCommands" value="# Set flash parallelism mode to 32, 16, or 8 bit when using STM32 F2/F4 microcontrollers&#xD;&#xA;# 2=32 bit, 1=16 bit and 0=8 bit parallelism mode&#xD;&#xA;monitor flash set_parallelism_mode 2&#xD;&#xA;&#xD;&#xA;# Load the program executable&#xD;&#xA;load&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;# Enable Debug connection in low power modes (DBGMCU-&gt;CR)&#xD;&#xA;set *0xE0042004 = (*0xE0042004) | 0x7&#xD;&#xA;# Set a breakpoint at main().&#xD;&#xA;tbreak main&#xD;&#xA;&#xD;&#xA;# Run to the breakpoint.&#xD;&#xA;continue" />
-<stringAttribute key="com.atollic.hardwaredebug.launch.serverParam" value="-p 61234 -l 1" />
+<stringAttribute key="com.atollic.hardwaredebug.launch.serverParam" value="-p 61234 -l 1 -d" />
 <booleanAttribute key="com.atollic.hardwaredebug.launch.startServer" value="true" />
-<booleanAttribute key="com.atollic.hardwaredebug.launch.swd_mode" value="false" />
+<booleanAttribute key="com.atollic.hardwaredebug.launch.swd_mode" value="true" />
 <stringAttribute key="com.atollic.hardwaredebug.launch.swv_port" value="61235" />
 <stringAttribute key="com.atollic.hardwaredebug.launch.swv_trace_div" value="120" />
 <stringAttribute key="com.atollic.hardwaredebug.launch.swv_trace_hclk" value="120000000" />
index ac0e42009314073dbda7bc34ad32aca88af5865d..cc617ae20c5c67968212d4c66dfcd95d667ab7fc 100644 (file)
@@ -207,7 +207,7 @@ PA8.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
 PA8.Mode=Clock-out-1
 PA8.Signal=RCC_MCO_1
 PB0.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultOutputPP
-PB0.GPIO_Label=LED
+PB0.GPIO_Label=LED_IO
 PB0.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_PP
 PB0.GPIO_PuPd=GPIO_PULLDOWN
 PB0.Locked=true
@@ -304,13 +304,13 @@ PC3.GPIO_PuPd=GPIO_PULLDOWN
 PC3.Locked=true
 PC3.Signal=GPIO_Input
 PC4.GPIOParameters=GPIO_PuPd,GPIO_Label
-PC4.GPIO_Label=UNUSED_PC4
-PC4.GPIO_PuPd=GPIO_PULLDOWN
+PC4.GPIO_Label=VER_ID1
+PC4.GPIO_PuPd=GPIO_PULLUP
 PC4.Locked=true
 PC4.Signal=GPIO_Input
 PC5.GPIOParameters=GPIO_PuPd,GPIO_Label
-PC5.GPIO_Label=UNUSED_PC5
-PC5.GPIO_PuPd=GPIO_PULLDOWN
+PC5.GPIO_Label=VER_ID2
+PC5.GPIO_PuPd=GPIO_PULLUP
 PC5.Locked=true
 PC5.Signal=GPIO_Input
 PC6.GPIOParameters=GPIO_PuPd,GPIO_Label
index d88a0c9bb67ea3fb30f013d72998c4fb986f68c1..eba4be6be1ab483309855078056bc918b224aea2 100755 (executable)
@@ -47,7 +47,17 @@ const uint8_t *otp = (uint8_t*)(FLASH_OTP_BASE + OTP_BLOCK_NUM * OTP_BLOCK_SIZE)
 const uint32_t *otp32 = (uint32_t*)(FLASH_OTP_BASE + OTP_BLOCK_NUM * OTP_BLOCK_SIZE);
 const uint8_t *lock = (uint8_t*)(FLASH_OTP_BASE + OTP_SIZE + OTP_BLOCK_NUM);
 
+#ifdef STM32F2xx
+#ifdef REV_2019
+const uint32_t marker = 0x06002019; // REV F and older
+#endif
+#ifdef REV_2020
 const uint32_t marker = 0x06002020;
+#endif
+#endif
+#ifdef STM32F4xx
+const uint32_t marker = 0x06002021;
+#endif
 
 static void
 checkHwSensePins()
@@ -55,18 +65,28 @@ checkHwSensePins()
        // Check the board version is correct.
        // Sense pins are configued as pullup, and connected to GND for 2020 hw,
        // or N/C for v6 ref F or older
+#ifdef REV_2019
+       if ((HAL_GPIO_ReadPin(VER_ID1_GPIO_Port, VER_ID1_Pin) == 0) ||
+               (HAL_GPIO_ReadPin(VER_ID2_GPIO_Port, VER_ID2_Pin) == 0))
+       {
+               // Oh dear, wrong version. Do not pass go.
+               while (1) {}
+       }
+
+#endif
+#ifdef REV_2020
        if (HAL_GPIO_ReadPin(VER_ID1_GPIO_Port, VER_ID1_Pin) ||
                HAL_GPIO_ReadPin(VER_ID2_GPIO_Port, VER_ID2_Pin))
        {
                // Oh dear, wrong version. Do not pass go.
                while (1) {}
        }
+#endif
 }
 
 void
 s2s_checkHwVersion()
 {
-return; // TODO FIX FOR 2021
        checkHwSensePins();
 
        // Write a marker to flash that can be read by dfu-util now that we know
index 087e95312fcafa454c8ebc746cf73a3fdb1b6984..cb118edb0dd7bbf62363b573cf28b88975bea3d0 100755 (executable)
@@ -46,8 +46,10 @@ static int isUsbStarted;
 // Note that the chip clocking isn't fully configured at this stage.\r
 void mainEarlyInit()\r
 {\r
+#ifdef nULPI_RESET_GPIO_Port\r
        // Disable the ULPI chip\r
        HAL_GPIO_WritePin(nULPI_RESET_GPIO_Port, nULPI_RESET_Pin, GPIO_PIN_RESET);\r
+#endif\r
 \r
        // Sets up function pointers only\r
        s2s_initUsbDeviceStorage();\r