mirror of https://github.com/FOME-Tech/fome-fw.git
Merge remote-tracking branch 'origin/master' into openblt-h7
This commit is contained in:
commit
5aab74dd03
|
@ -43,15 +43,6 @@ ifeq ($(DEBUG_LEVEL_OPT),)
|
||||||
# DEBUG_LEVEL_OPT = -O0 -ggdb -g
|
# DEBUG_LEVEL_OPT = -O0 -ggdb -g
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(CCACHE_DIR),)
|
|
||||||
$(info No CCACHE_DIR)
|
|
||||||
else
|
|
||||||
$(info CCACHE_DIR is ${CCACHE_DIR})
|
|
||||||
CCPREFIX=ccache
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
# Compiler options here.
|
# Compiler options here.
|
||||||
# yes we have two kinds of EXTRA_*PARAMS so that we can define those in two different places independently
|
# yes we have two kinds of EXTRA_*PARAMS so that we can define those in two different places independently
|
||||||
#
|
#
|
||||||
|
@ -299,8 +290,8 @@ ifeq ($(CROSS_COMPILE),)
|
||||||
else
|
else
|
||||||
TRGT = $(CROSS_COMPILE)
|
TRGT = $(CROSS_COMPILE)
|
||||||
endif
|
endif
|
||||||
CC = $(CCPREFIX) $(TRGT)gcc
|
CC = $(TRGT)gcc
|
||||||
CPPC = $(CCPREFIX) $(TRGT)g++
|
CPPC = $(TRGT)g++
|
||||||
# Enable loading with g++ only if you need C++ runtime support.
|
# Enable loading with g++ only if you need C++ runtime support.
|
||||||
# NOTE: You can use C++ even without C++ support if you are careful. C++
|
# NOTE: You can use C++ even without C++ support if you are careful. C++
|
||||||
# runtime support makes code size explode.
|
# runtime support makes code size explode.
|
||||||
|
|
|
@ -25,6 +25,9 @@ DDEFS += -DEFI_USB_SERIAL=TRUE -DHAL_USE_USB_MSD=FALSE
|
||||||
# disable CAN
|
# disable CAN
|
||||||
DDEFS += -DEFI_CAN_SUPPORT=FALSE
|
DDEFS += -DEFI_CAN_SUPPORT=FALSE
|
||||||
|
|
||||||
|
# Cache is disabled on F7, H7
|
||||||
|
DDEFS += -DSTM32_SRAM2_NOCACHE=FALSE -DSTM32_NOCACHE_SRAM1_SRAM2=FALSE -DSTM32_NOCACHE_SRAM3=FALSE
|
||||||
|
|
||||||
DDEFS += -DEFI_UNIT_TEST=0 -DEFI_PROD_CODE=1 -DEFI_SIMULATOR=0
|
DDEFS += -DEFI_UNIT_TEST=0 -DEFI_PROD_CODE=1 -DEFI_SIMULATOR=0
|
||||||
|
|
||||||
# Compiler options here.
|
# Compiler options here.
|
||||||
|
@ -281,8 +284,8 @@ ifeq ($(CROSS_COMPILE),)
|
||||||
else
|
else
|
||||||
TRGT = $(CROSS_COMPILE)
|
TRGT = $(CROSS_COMPILE)
|
||||||
endif
|
endif
|
||||||
CC = $(CCPREFIX) $(TRGT)gcc
|
CC = $(TRGT)gcc
|
||||||
CPPC = $(CCPREFIX) $(TRGT)g++
|
CPPC = $(TRGT)g++
|
||||||
# Enable loading with g++ only if you need C++ runtime support.
|
# Enable loading with g++ only if you need C++ runtime support.
|
||||||
# NOTE: You can use C++ even without C++ support if you are careful. C++
|
# NOTE: You can use C++ even without C++ support if you are careful. C++
|
||||||
# runtime support makes code size explode.
|
# runtime support makes code size explode.
|
||||||
|
|
|
@ -14,9 +14,9 @@ void FlashInit() {
|
||||||
|
|
||||||
blt_addr FlashGetUserProgBaseAddress() {
|
blt_addr FlashGetUserProgBaseAddress() {
|
||||||
#ifdef STM32H7XX
|
#ifdef STM32H7XX
|
||||||
return 0x08020000;
|
return FLASH_BASE + 128 * 1024;
|
||||||
#else // not STM32H7
|
#else // not STM32H7
|
||||||
return 0x08008000;
|
return FLASH_BASE + 32 * 1024;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -123,7 +123,10 @@
|
||||||
#define STM32_CECSEL STM32_CECSEL_LSE
|
#define STM32_CECSEL STM32_CECSEL_LSE
|
||||||
#define STM32_CK48MSEL STM32_CK48MSEL_PLL
|
#define STM32_CK48MSEL STM32_CK48MSEL_PLL
|
||||||
#define STM32_SDMMCSEL STM32_SDMMCSEL_PLL48CLK
|
#define STM32_SDMMCSEL STM32_SDMMCSEL_PLL48CLK
|
||||||
|
|
||||||
|
#ifndef STM32_SRAM2_NOCACHE
|
||||||
#define STM32_SRAM2_NOCACHE TRUE
|
#define STM32_SRAM2_NOCACHE TRUE
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* GPT driver system settings.
|
* GPT driver system settings.
|
||||||
|
|
|
@ -54,8 +54,12 @@
|
||||||
* Memory attributes settings.
|
* Memory attributes settings.
|
||||||
*/
|
*/
|
||||||
#define STM32_NOCACHE_MPU_REGION MPU_REGION_6
|
#define STM32_NOCACHE_MPU_REGION MPU_REGION_6
|
||||||
|
#ifndef STM32_NOCACHE_SRAM1_SRAM2
|
||||||
#define STM32_NOCACHE_SRAM1_SRAM2 FALSE
|
#define STM32_NOCACHE_SRAM1_SRAM2 FALSE
|
||||||
|
#endif // STM32_NOCACHE_SRAM1_SRAM2
|
||||||
|
#ifndef STM32_NOCACHE_SRAM3
|
||||||
#define STM32_NOCACHE_SRAM3 TRUE
|
#define STM32_NOCACHE_SRAM3 TRUE
|
||||||
|
#endif // STM32_NOCACHE_SRAM3
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* PWR system settings.
|
* PWR system settings.
|
||||||
|
|
|
@ -3,4 +3,9 @@ RUSEFI_OPT = -Werror
|
||||||
RUSEFI_CPPOPT = -Werror=shadow
|
RUSEFI_CPPOPT = -Werror=shadow
|
||||||
|
|
||||||
# ...except these few
|
# ...except these few
|
||||||
RUSEFI_OPT += -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=undef -Wno-error=stringop-overflow
|
RUSEFI_OPT += -Wno-error=unused-function
|
||||||
|
RUSEFI_OPT += -Wno-error=unused-variable
|
||||||
|
RUSEFI_OPT += -Wno-error=sign-compare
|
||||||
|
RUSEFI_OPT += -Wno-error=unused-parameter
|
||||||
|
RUSEFI_OPT += -Wno-error=undef
|
||||||
|
RUSEFI_OPT += -Wno-error=stringop-overflow
|
||||||
|
|
|
@ -193,7 +193,7 @@ public class ProgramSelector {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
OpenbltBootCommanderRunner.flashSerial(port, "../../fome_update.srec", callbacks);
|
OpenbltBootCommanderRunner.flashSerial(port, "../fome_update.srec", callbacks);
|
||||||
|
|
||||||
// it's a lengthy operation let's signal end
|
// it's a lengthy operation let's signal end
|
||||||
Toolkit.getDefaultToolkit().beep();
|
Toolkit.getDefaultToolkit().beep();
|
||||||
|
|
|
@ -1,67 +0,0 @@
|
||||||
#!/usr/bin/python2
|
|
||||||
|
|
||||||
# this script parses a rusEfi console log, extract analog_chart line and
|
|
||||||
# calculates average trigger angles
|
|
||||||
# author spags
|
|
||||||
|
|
||||||
import numpy
|
|
||||||
|
|
||||||
|
|
||||||
# todo: change the sccript so that we do not need to hard-code trigger sequence length?
|
|
||||||
trigger_size = 10
|
|
||||||
|
|
||||||
rpm_max_change = 15
|
|
||||||
|
|
||||||
|
|
||||||
AC_HEADER = 'analog_chart,'
|
|
||||||
|
|
||||||
fp = open("target.csv")
|
|
||||||
data = {}
|
|
||||||
|
|
||||||
last_time = 0
|
|
||||||
rpm = 10000
|
|
||||||
last_rpm = 0
|
|
||||||
|
|
||||||
for line in fp:
|
|
||||||
# Chuck the date
|
|
||||||
# todo: use '<EOT>:' tag
|
|
||||||
line = line[35:]
|
|
||||||
|
|
||||||
if line.startswith(AC_HEADER):
|
|
||||||
line = line.strip(AC_HEADER)
|
|
||||||
numbers = [float(n) for n in line.split('|')[:2 * trigger_size]]
|
|
||||||
|
|
||||||
if abs(rpm-last_rpm) < rpm_max_change:
|
|
||||||
data[last_time] = numbers
|
|
||||||
else:
|
|
||||||
print "RPM Variance too great", last_rpm, rpm
|
|
||||||
last_rpm = rpm
|
|
||||||
|
|
||||||
elif line.startswith('time'):
|
|
||||||
last_time = float(line.split(',')[1])
|
|
||||||
last_rpm = rpm
|
|
||||||
rpm = float(line.split(',')[3])
|
|
||||||
|
|
||||||
else:
|
|
||||||
pass
|
|
||||||
|
|
||||||
print "Got %d data points"%len(data)
|
|
||||||
|
|
||||||
a = {}
|
|
||||||
for i in range(0, len(numbers)+1,2):
|
|
||||||
a[i] = numpy.zeros(len(data))
|
|
||||||
|
|
||||||
count = 0
|
|
||||||
|
|
||||||
|
|
||||||
for time,numbers in data.iteritems():
|
|
||||||
for i in range(0, len(numbers),2):
|
|
||||||
a[i][count] = numbers[i]
|
|
||||||
|
|
||||||
count+=1
|
|
||||||
print "Trigger\t\tStdDeviation"
|
|
||||||
print "-"*40
|
|
||||||
for i in a.values():
|
|
||||||
|
|
||||||
|
|
||||||
print "%f\t\t%f"%(numpy.average(i), i.std())
|
|
|
@ -60,13 +60,6 @@ ifeq ($(SANITIZE),yes)
|
||||||
USE_OPT += -fsanitize=address
|
USE_OPT += -fsanitize=address
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CCACHE_DIR),)
|
|
||||||
$(info No CCACHE_DIR)
|
|
||||||
else
|
|
||||||
$(info CCACHE_DIR is ${CCACHE_DIR})
|
|
||||||
CCPREFIX=ccache
|
|
||||||
endif
|
|
||||||
|
|
||||||
# C specific options here (added to USE_OPT).
|
# C specific options here (added to USE_OPT).
|
||||||
ifeq ($(USE_COPT),)
|
ifeq ($(USE_COPT),)
|
||||||
USE_COPT = -std=gnu99
|
USE_COPT = -std=gnu99
|
||||||
|
@ -224,8 +217,8 @@ else
|
||||||
TRGT =
|
TRGT =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CC = $(CCPREFIX) $(TRGT)gcc
|
CC = $(TRGT)gcc
|
||||||
CPPC = $(CCPREFIX) $(TRGT)g++
|
CPPC = $(TRGT)g++
|
||||||
# Enable loading with g++ only if you need C++ runtime support.
|
# Enable loading with g++ only if you need C++ runtime support.
|
||||||
# NOTE: You can use C++ even without C++ support if you are careful. C++
|
# NOTE: You can use C++ even without C++ support if you are careful. C++
|
||||||
# runtime support makes code size explode.
|
# runtime support makes code size explode.
|
||||||
|
|
|
@ -56,13 +56,6 @@ USE_OPT += -DEFI_UNIT_TEST=1 -DEFI_PROD_CODE=0 -DEFI_SIMULATOR=0
|
||||||
# Pretend we are all different hardware so that all canned engine configs are included
|
# Pretend we are all different hardware so that all canned engine configs are included
|
||||||
USE_OPT += -DHW_MICRO_RUSEFI=1 -DHW_PROTEUS=1 -DHW_FRANKENSO=1 -DHW_HELLEN=1
|
USE_OPT += -DHW_MICRO_RUSEFI=1 -DHW_PROTEUS=1 -DHW_FRANKENSO=1 -DHW_HELLEN=1
|
||||||
|
|
||||||
ifeq ($(CCACHE_DIR),)
|
|
||||||
$(info No CCACHE_DIR)
|
|
||||||
else
|
|
||||||
$(info CCACHE_DIR is ${CCACHE_DIR})
|
|
||||||
CCPREFIX=ccache
|
|
||||||
endif
|
|
||||||
|
|
||||||
# C specific options here (added to USE_OPT).
|
# C specific options here (added to USE_OPT).
|
||||||
ifeq ($(USE_COPT),)
|
ifeq ($(USE_COPT),)
|
||||||
USE_COPT = -std=gnu99 -fgnu89-inline
|
USE_COPT = -std=gnu99 -fgnu89-inline
|
||||||
|
@ -126,8 +119,8 @@ else
|
||||||
TRGT =
|
TRGT =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CC = $(CCPREFIX) $(TRGT)gcc
|
CC = $(TRGT)gcc
|
||||||
CPPC = $(CCPREFIX) $(TRGT)g++
|
CPPC = $(TRGT)g++
|
||||||
# Enable loading with g++ only if you need C++ runtime support.
|
# Enable loading with g++ only if you need C++ runtime support.
|
||||||
# NOTE: You can use C++ even without C++ support if you are careful. C++
|
# NOTE: You can use C++ even without C++ support if you are careful. C++
|
||||||
# runtime support makes code size explode.
|
# runtime support makes code size explode.
|
||||||
|
|
Loading…
Reference in New Issue