rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix various tests and add clean option to chbuild

This commit is contained in:
Fabien Poussin 2020-11-25 12:02:59 +01:00
parent b3ced78c6f
commit 3c061c2fe5
No known key found for this signature in database
GPG Key ID: 6166CABA99FC385C
8 changed files with 1571 additions and 1568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/STM32/RT-STM32F303-DISCOVERY-PID/chconf.h
View File

@ -40,7 +40,7 @@
/**
* @brief System time counter resolution.
* @note Allowed values are 16 or 32 bits.
* @note Allowed values are 16, 32 or 64 bits.
*/
#if !defined(CH_CFG_ST_RESOLUTION)
#define CH_CFG_ST_RESOLUTION 32
@ -745,7 +745,6 @@
/* Trace code here.*/ \
}
/** @} */
/*===========================================================================*/

4
demos/STM32/RT-STM32F303-DISCOVERY-PID/halconf.h
View File

@ -100,7 +100,7 @@
* @brief Enables the ICU subsystem.
*/
#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
#define HAL_USE_ICU TRUE
#define HAL_USE_ICU FALSE
#endif
/**
@ -121,7 +121,7 @@
* @brief Enables the PWM subsystem.
*/
#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
#define HAL_USE_PWM TRUE
#define HAL_USE_PWM FALSE
#endif
/**

14
demos/STM32/RT-STM32F303-DISCOVERY-PID/mcuconf.h
View File

@ -96,9 +96,9 @@
#define STM32_ADC_DUAL_MODE FALSE
#define STM32_ADC_COMPACT_SAMPLES FALSE
#define STM32_ADC_USE_ADC1 TRUE
#define STM32_ADC_USE_ADC2 FALSE
#define STM32_ADC_USE_ADC3 FALSE
#define STM32_ADC_USE_ADC4 FALSE
#define STM32_ADC_USE_ADC2 TRUE
#define STM32_ADC_USE_ADC3 TRUE
#define STM32_ADC_USE_ADC4 TRUE
#define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
#define STM32_ADC_ADC2_DMA_STREAM STM32_DMA_STREAM_ID(2, 1)
#define STM32_ADC_ADC3_DMA_STREAM STM32_DMA_STREAM_ID(2, 5)
@ -171,11 +171,11 @@
/*
* ICU driver system settings.
*/
#define STM32_ICU_USE_TIM1 TRUE
#define STM32_ICU_USE_TIM1 FALSE
#define STM32_ICU_USE_TIM2 FALSE
#define STM32_ICU_USE_TIM3 TRUE
#define STM32_ICU_USE_TIM3 FALSE
#define STM32_ICU_USE_TIM4 FALSE
#define STM32_ICU_USE_TIM8 TRUE
#define STM32_ICU_USE_TIM8 FALSE
#define STM32_ICU_USE_TIM15 FALSE
#define STM32_ICU_TIM1_IRQ_PRIORITY 7
#define STM32_ICU_TIM2_IRQ_PRIORITY 7
@ -190,7 +190,7 @@
#define STM32_PWM_USE_TIM1 FALSE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE
#define STM32_PWM_USE_TIM4 TRUE
#define STM32_PWM_USE_TIM4 FALSE
#define STM32_PWM_USE_TIM8 FALSE
#define STM32_PWM_USE_TIM15 FALSE
#define STM32_PWM_USE_TIM16 FALSE

0
demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/.skip Normal file
View File

2
demos/STM32/RT-STM32F407-DISCOVERY-RTT+SystemView/Makefile
View File

@ -89,7 +89,7 @@ PROJECT = ch
MCU = cortex-m4
# Imported source files and paths.
CHIBIOS := ../../../../Chibios
CHIBIOS := ../../../../ChibiOS
CHIBIOS_CONTRIB := ../../../
CONFDIR := ./cfg

0
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.skip Normal file
View File

2
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
View File

@ -87,7 +87,7 @@ PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../../../ChibiOS
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
CHIBIOS_CONTRIB = ../../..
# Licensing files.
include $(CHIBIOS)/os/license/license.mk
# Startup files.

6
tools/chbuild.sh
View File

@ -26,8 +26,12 @@ function chbuild {
continue
fi
pushd $t > /dev/null
if [[ ! -z ${CH_CLEAN+x} ]]; then
printf "CLEANING: ${t}\n"
make clean
fi
printf "BUILDING: ${t}\n"
if [[ -z "$CH_PATH" && -z "$CHC_PATH" ]]; then
if [[ -z "${CH_PATH+x}" || -z "${CHC_PATH+x}" ]]; then
make --quiet -j $JOBS > /dev/null
else
make CHIBIOS=$CH_PATH CHIBIOS_CONTRIB=$CHC_PATH --quiet -j $JOBS > /dev/null