From f5ec67a32974bb7f570f53597dc483147ea02c48 Mon Sep 17 00:00:00 2001 From: andreika-git Date: Sun, 27 Sep 2020 12:49:25 +0300 Subject: [PATCH] Hellen says Cypress build fix (usbdevice.h) (#1821) * Hellen says merge #1772 hardware.cpp * Hellen says merge #1772 adc.h * UsbDevice.h -> usbdevice.h * build_cypress -> build Co-authored-by: rusefi Co-authored-by: Andrei --- firmware/config/boards/hellen/cypress/!compile-cypress.bat | 3 --- firmware/config/boards/hellen/cypress/!compile_cypress.bat | 3 +++ .../cypress/OS/os/hal/ports/Cypress/PDL/driver/usb/usbdevice.h | 2 +- .../hal/ports/Cypress/PDL/midware/usb/device/UsbDeviceCdcCom.h | 2 +- .../Cypress/PDL/midware/usb/device/UsbDeviceMassStorage.h | 2 +- firmware/config/boards/hellen/cypress/compile_cypress.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 firmware/config/boards/hellen/cypress/!compile-cypress.bat create mode 100644 firmware/config/boards/hellen/cypress/!compile_cypress.bat diff --git a/firmware/config/boards/hellen/cypress/!compile-cypress.bat b/firmware/config/boards/hellen/cypress/!compile-cypress.bat deleted file mode 100644 index 7366830824..0000000000 --- a/firmware/config/boards/hellen/cypress/!compile-cypress.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -bash compile-cypress.sh diff --git a/firmware/config/boards/hellen/cypress/!compile_cypress.bat b/firmware/config/boards/hellen/cypress/!compile_cypress.bat new file mode 100644 index 0000000000..4d58da5df9 --- /dev/null +++ b/firmware/config/boards/hellen/cypress/!compile_cypress.bat @@ -0,0 +1,3 @@ +@echo off + +bash compile_cypress.sh diff --git a/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/driver/usb/usbdevice.h b/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/driver/usb/usbdevice.h index cb85ea1d1a..227d310d03 100644 --- a/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/driver/usb/usbdevice.h +++ b/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/driver/usb/usbdevice.h @@ -33,7 +33,7 @@ * so agrees to indemnify Cypress against all liability. * *******************************************************************************/ /******************************************************************************/ -/** \file UsbDevice.h +/** \file usbdevice.h ** ** A detailed description is available at ** @link UsbDeviceGroup USB Device Module description @endlink diff --git a/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/midware/usb/device/UsbDeviceCdcCom.h b/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/midware/usb/device/UsbDeviceCdcCom.h index 0f4490ed94..0a3451bf07 100644 --- a/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/midware/usb/device/UsbDeviceCdcCom.h +++ b/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/midware/usb/device/UsbDeviceCdcCom.h @@ -72,7 +72,7 @@ #if ((FM_PERIPHERAL_USB_DEVICE_ENABLED == ON) && (USBDEVICECDCCOM_ENABLED == ON)) -#include "UsbDevice.h" +#include "usbdevice.h" /* C binding of definitions if building with C++ compiler */ #ifdef __cplusplus diff --git a/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/midware/usb/device/UsbDeviceMassStorage.h b/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/midware/usb/device/UsbDeviceMassStorage.h index a766997682..1458016047 100644 --- a/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/midware/usb/device/UsbDeviceMassStorage.h +++ b/firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/PDL/midware/usb/device/UsbDeviceMassStorage.h @@ -65,7 +65,7 @@ #if ((FM_PERIPHERAL_USB_DEVICE_ENABLED == ON) && (USBDEVICEMASSSTORAGE_ENABLED == ON)) -#include "UsbDevice.h" +#include "usbdevice.h" #include "base_types.h" /* C binding of definitions if building with C++ compiler */ diff --git a/firmware/config/boards/hellen/cypress/compile_cypress.sh b/firmware/config/boards/hellen/cypress/compile_cypress.sh index 2c57d83b9d..509c72ee10 100644 --- a/firmware/config/boards/hellen/cypress/compile_cypress.sh +++ b/firmware/config/boards/hellen/cypress/compile_cypress.sh @@ -7,7 +7,7 @@ export EXTRA_PARAMS="-DDUMMY -D__USE_CMSIS\ -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE\ -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS" -export BUILDDIR="build_cypress" +export BUILDDIR="build" export PROJECT_BOARD="hellen/cypress" export PROJECT_CPU="cypress" export USE_FATFS="no"