FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rusefi/rusefi into second_can

This commit is contained in:
kon 2020-08-02 19:48:36 -07:00
parent cbccb27c4a e4a4377780
commit b093813594
49 changed files with 167 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/Makefile
View File

@ -296,8 +296,8 @@ INCDIR = $(CHIBIOS)/os/license \
ext_algo \
console_util \
$(CONSOLE_INC) \
$(PROJECT_DIR)/hw_layer \
$(PROJECT_DIR)/mass_storage \
$(HW_LAYER_INC) \
$(PROJECT_DIR)/hw_layer/mass_storage \
$(PROJECT_DIR)/hw_layer/serial_over_usb \
$(PROJECT_DIR)/hw_layer/algo \
$(PROJECT_DIR)/hw_layer/lcd \

3
firmware/bootloader/src/Makefile
View File

@ -247,7 +247,8 @@ INCDIR = .. $(CHIBIOS)/os/license \
$(PROJECT_DIR)/console/binary_log \
$(PROJECT_DIR)/console/fl_binary \
$(PROJECT_DIR)/hw_layer \
$(PROJECT_DIR)/mass_storage \
$(PROJECT_DIR)/hw_layer/adc \
$(PROJECT_DIR)/hw_layer/mass_storage \
$(PROJECT_DIR)/hw_layer/serial_over_usb \
$(PROJECT_DIR)/hw_layer/algo \
$(PROJECT_DIR)/hw_layer/lcd \

14
firmware/config/engines/custom_engine.cpp
View File

@ -630,7 +630,17 @@ void setTest33816EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
CONFIG(isSdCardEnabled) = false;
CONFIG(mc33_hvolt) = 63;
CONFIG(mc33816spiDevice) = SPI_DEVICE_3;
// This is the configuration for bosch HDEV 5 injectors
CONFIG(mc33_hvolt) = 65;
CONFIG(mc33_i_boost) = 13000;
CONFIG(mc33_i_peak) = 9400;
CONFIG(mc33_i_hold) = 3700;
CONFIG(mc33_t_max_boost) = 470;
CONFIG(mc33_t_peak_off) = 10;
CONFIG(mc33_t_peak_tot) = 700;
CONFIG(mc33_t_bypass) = 15;
CONFIG(mc33_t_hold_off) = 60;
CONFIG(mc33_t_hold_tot) = 10000;
}

10
firmware/console/binary/tunerstudio.cpp
View File

@ -482,6 +482,8 @@ static bool isKnownCommand(char command) {
|| command == TS_GET_FIRMWARE_VERSION
|| command == TS_PERF_TRACE_BEGIN
|| command == TS_PERF_TRACE_GET_BUFFER
|| command == TS_SD_R_COMMAND
|| command == TS_SD_W_COMMAND
|| command == TS_GET_CONFIG_ERROR;
}
@ -775,6 +777,14 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin
case TS_GET_FIRMWARE_VERSION:
handleGetVersion(tsChannel, TS_CRC);
break;
#if EFI_FILE_LOGGING
case TS_SD_R_COMMAND:
handleTsR(data);
break;
case TS_SD_W_COMMAND:
handleTsW(data);
break;
#endif //EFI_FILE_LOGGING
case TS_GET_TEXT:
handleGetText(tsChannel);
break;

2
firmware/controllers/date_stamp.h
View File

@ -1,2 +1,2 @@
#pragma once
#define VCS_DATE 20200802
#define VCS_DATE 20200803

2
firmware/controllers/generated/fsio_enums_generated.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000,

2
firmware/controllers/generated/fsio_getters.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

2
firmware/controllers/generated/fsio_names.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");

2
firmware/controllers/generated/fsio_strings.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

6
firmware/controllers/generated/signature_all.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 785059244
#define TS_SIGNATURE "rusEFI 2020.08.02.all.785059244"
#define SIGNATURE_DATE 2020.08.03
#define SIGNATURE_HASH 3223547782
#define TS_SIGNATURE "rusEFI 2020.08.03.all.3223547782"

6
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 4031537487
#define TS_SIGNATURE "rusEFI 2020.08.02.frankenso_na6.4031537487"
#define SIGNATURE_DATE 2020.08.03
#define SIGNATURE_HASH 514065253
#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.514065253"

6
firmware/controllers/generated/signature_kin.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 3824537910
#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3824537910"
#define SIGNATURE_DATE 2020.08.03
#define SIGNATURE_HASH 220050204
#define TS_SIGNATURE "rusEFI 2020.08.03.kin.220050204"

6
firmware/controllers/generated/signature_mre_f4.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 1731582754
#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f4.1731582754"
#define SIGNATURE_DATE 2020.08.03
#define SIGNATURE_HASH 2313009416
#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.2313009416"

6
firmware/controllers/generated/signature_mre_f7.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 1731582754
#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f7.1731582754"
#define SIGNATURE_DATE 2020.08.03
#define SIGNATURE_HASH 2313009416
#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.2313009416"

6
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 3688355112
#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_405.3688355112"
#define SIGNATURE_DATE 2020.08.03
#define SIGNATURE_HASH 893368066
#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.893368066"

6
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 3688355112
#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_469.3688355112"
#define SIGNATURE_DATE 2020.08.03
#define SIGNATURE_HASH 893368066
#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.893368066"

6
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 2740616291
#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f4.2740616291"
#define SIGNATURE_DATE 2020.08.03
#define SIGNATURE_HASH 1303518793
#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.1303518793"

6
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.08.02
#define SIGNATURE_HASH 2740616291
#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f7.2740616291"
#define SIGNATURE_DATE 2020.08.03
#define SIGNATURE_HASH 1303518793
#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.1303518793"

0
firmware/hw_layer/AdcConfiguration.h → firmware/hw_layer/adc/AdcConfiguration.h
View File

0
firmware/hw_layer/adc_external.h → firmware/hw_layer/adc/adc_external.h
View File

0
firmware/hw_layer/adc_inputs.cpp → firmware/hw_layer/adc/adc_inputs.cpp
View File

0
firmware/hw_layer/adc_inputs.h → firmware/hw_layer/adc/adc_inputs.h
View File

0
firmware/hw_layer/adc_subscription.cpp → firmware/hw_layer/adc/adc_subscription.cpp
View File

0
firmware/hw_layer/adc_subscription.h → firmware/hw_layer/adc/adc_subscription.h
View File

0
firmware/hw_layer/mcp3208.c → firmware/hw_layer/adc/mcp3208.c
View File

0
firmware/hw_layer/mcp3208.h → firmware/hw_layer/adc/mcp3208.h
View File

0
firmware/hw_layer/digital_input.cpp → firmware/hw_layer/digital_input/digital_input.cpp
View File

0
firmware/hw_layer/digital_input.h → firmware/hw_layer/digital_input/digital_input.h
View File

0
firmware/hw_layer/digital_input_exti.cpp → firmware/hw_layer/digital_input/digital_input_exti.cpp
View File

0
firmware/hw_layer/digital_input_exti.h → firmware/hw_layer/digital_input/digital_input_exti.h
View File

0
firmware/hw_layer/digital_input_icu.cpp → firmware/hw_layer/digital_input/digital_input_icu.cpp
View File

0
firmware/hw_layer/digital_input_icu.h → firmware/hw_layer/digital_input/digital_input_icu.h
View File

0
firmware/hw_layer/trigger_input.cpp → firmware/hw_layer/digital_input/trigger/trigger_input.cpp
View File

0
firmware/hw_layer/trigger_input.h → firmware/hw_layer/digital_input/trigger/trigger_input.h
View File

0
firmware/hw_layer/trigger_input_comp.cpp → firmware/hw_layer/digital_input/trigger/trigger_input_comp.cpp
View File

0
firmware/hw_layer/trigger_input_exti.cpp → firmware/hw_layer/digital_input/trigger/trigger_input_exti.cpp
View File

0
firmware/hw_layer/trigger_input_icu.cpp → firmware/hw_layer/digital_input/trigger/trigger_input_icu.cpp
View File

31
firmware/hw_layer/hw_layer.mk
View File

@ -1,6 +1,10 @@
HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/serial_over_usb/usbcfg.c \
$(PROJECT_DIR)/hw_layer/serial_over_usb/usbconsole.c
HW_LAYER_INC= $(PROJECT_DIR)/hw_layer $(PROJECT_DIR)/hw_layer/adc \
$(PROJECT_DIR)/hw_layer/digital_input \
$(PROJECT_DIR)/hw_layer/digital_input/trigger
HW_INC = hw_layer/$(CPU_HWLAYER) \
$(PROJECT_DIR)/hw_layer/ports
@ -8,28 +12,29 @@ HW_LAYER_EGT_CPP = \
$(PROJECT_DIR)/hw_layer/max31855.cpp
HW_LAYER_EMS = $(HW_LAYER_EGT) \
$(PROJECT_DIR)/hw_layer/mcp3208.c \
$(PROJECT_DIR)/hw_layer/mc33816_data.c \
$(PROJECT_DIR)/hw_layer/adc/mcp3208.c \
$(PROJECT_DIR)/hw_layer/mc33816_data.c
HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
$(PROJECT_DIR)/hw_layer/pin_repository.cpp \
$(PROJECT_DIR)/hw_layer/microsecond_timer.cpp \
$(PROJECT_DIR)/hw_layer/digital_input.cpp \
$(PROJECT_DIR)/hw_layer/digital_input_icu.cpp \
$(PROJECT_DIR)/hw_layer/digital_input_exti.cpp \
$(PROJECT_DIR)/hw_layer/digital_input/digital_input.cpp \
$(PROJECT_DIR)/hw_layer/digital_input/digital_input_icu.cpp \
$(PROJECT_DIR)/hw_layer/digital_input/digital_input_exti.cpp \
$(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input.cpp \
$(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input_icu.cpp \
$(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input_exti.cpp \
$(PROJECT_DIR)/hw_layer/hardware.cpp \
$(PROJECT_DIR)/hw_layer/smart_gpio.cpp \
$(PROJECT_DIR)/hw_layer/neo6m.cpp \
$(PROJECT_DIR)/hw_layer/mmc_card.cpp \
$(PROJECT_DIR)/hw_layer/mmc_card_access.cpp \
$(PROJECT_DIR)/hw_layer/lcd/lcd_HD44780.cpp \
$(PROJECT_DIR)/hw_layer/adc_inputs.cpp \
$(PROJECT_DIR)/hw_layer/adc_subscription.cpp \
$(PROJECT_DIR)/hw_layer/trigger_input.cpp \
$(PROJECT_DIR)/hw_layer/trigger_input_icu.cpp \
$(PROJECT_DIR)/hw_layer/trigger_input_exti.cpp \
$(PROJECT_DIR)/hw_layer/hip9011.cpp \
$(PROJECT_DIR)/hw_layer/adc/adc_inputs.cpp \
$(PROJECT_DIR)/hw_layer/adc/adc_subscription.cpp \
$(PROJECT_DIR)/hw_layer/sensors/hip9011.cpp \
$(PROJECT_DIR)/hw_layer/sensors/hip9011_logic.cpp \
$(PROJECT_DIR)/hw_layer/mc33816.cpp \
$(PROJECT_DIR)/hw_layer/hip9011_logic.cpp \
$(PROJECT_DIR)/hw_layer/vehicle_speed.cpp \
$(PROJECT_DIR)/hw_layer/stepper.cpp \
$(PROJECT_DIR)/hw_layer/stepper_dual_hbridge.cpp \
@ -37,7 +42,7 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
$(PROJECT_DIR)/hw_layer/io_pins.cpp \
$(PROJECT_DIR)/hw_layer/rtc_helper.cpp \
$(PROJECT_DIR)/hw_layer/cdm_ion_sense.cpp \
$(PROJECT_DIR)/hw_layer/backup_ram.cpp \
$(PROJECT_DIR)/hw_layer/backup_ram.cpp
#
# '-include' is a magic kind of 'include' which would survive if file to be included is not found

11
firmware/hw_layer/mmc_card.h
View File

@ -9,18 +9,11 @@
#pragma once
#ifdef __cplusplus
extern "C"
{
#endif /* __cplusplus */
void initMmcCard(void);
bool isSdCardAlive(void);
void appendToLog(const char *line, size_t length);
void readLogFileContent(char *buffer, short fileId, short offset, short length);
#ifdef __cplusplus
}
#endif /* __cplusplus */
void handleTsR(char *input);
void handleTsW(char *input);

29
firmware/hw_layer/mmc_card_access.cpp Normal file
View File

@ -0,0 +1,29 @@
/**
* @file mmc_card_access.cpp
*
*/
#include "global.h"
#if EFI_FILE_LOGGING
#include "mmc_card.h"
extern LoggingWithStorage sharedLogger;
static char *buffer[2048];
void handleTsR(char *input) {
if (input[1] == 0 && input[2] == 7) {
scheduleMsg(&sharedLogger, "TS_SD: RTC read command");
memset(buffer, 0, 9);
}
}
void handleTsW(char *input) {
}
#endif // EFI_FILE_LOGGING

0
firmware/hw_layer/hip9011.cpp → firmware/hw_layer/sensors/hip9011.cpp
View File

0
firmware/hw_layer/hip9011.h → firmware/hw_layer/sensors/hip9011.h
View File

0
firmware/hw_layer/hip9011_logic.cpp → firmware/hw_layer/sensors/hip9011_logic.cpp
View File

0
firmware/hw_layer/hip9011_logic.h → firmware/hw_layer/sensors/hip9011_logic.h
View File

24
firmware/integration/rusefi_config.txt
View File

@ -741,7 +741,7 @@ pin_output_mode_e hip9011IntHoldPinMode;
! 536870911 = 2^29-1, the maximum valid extended ID
uint32_t verboseCanBaseAddress;;"", 1, 0, 0, 536870911, 0
uint8_t mc33_hvolt;;"v", 1, 0, 0, 100, 0
uint8_t mc33_hvolt;;"v", 1, 0, 40, 70, 0
uint8_t fsio_visible acIdleExtraMin;+Additional idle PID minValue while A/C is active;"Percent", 1, 0, 0, 255, 0
uint8_t[2] unusedHere;;"units", 1, 0, -20, 100, 0
@ -1321,15 +1321,15 @@ uint8_t[4] unusedsw;;"units", 1, 0, -20, 100, 0
gppwm_channel[GPPWM_CHANNELS iterate] gppwm;
uint16_t mc33_i_boost;;"X", 1, 0.0, 0, 64000, 0
uint16_t mc33_i_peak;;"X", 1, 0.0, 0, 64000, 0
uint16_t mc33_i_hold;;"X", 1, 0.0, 0, 64000, 0
uint16_t mc33_t_max_boost;;"X", 1, 0.0, 0, 64000, 0
uint16_t mc33_t_peak_off;;"X", 1, 0.0, 0, 64000, 0
uint16_t mc33_t_peak_tot;;"X", 1, 0.0, 0, 64000, 0
uint16_t mc33_t_bypass;;"X", 1, 0.0, 0, 64000, 0
uint16_t mc33_t_hold_off;;"X", 1, 0.0, 0, 64000, 0
uint16_t mc33_t_hold_tot;;"X", 1, 0.0, 0, 64000, 0
uint16_t mc33_i_boost;;"mA", 1, 0.0, 1000, 25000, 0
uint16_t mc33_i_peak;;"mA", 1, 0.0, 1000, 20000, 0
uint16_t mc33_i_hold;;"mA", 1, 0.0, 1000, 20000, 0
uint16_t mc33_t_max_boost;;"us", 1, 0.0, 0, 10000, 0
uint16_t mc33_t_peak_off;;"us", 1, 0.0, 0, 10000, 0
uint16_t mc33_t_peak_tot;;"us", 1, 0.0, 0, 10000, 0
uint16_t mc33_t_bypass;;"us", 1, 0.0, 0, 10000, 0
uint16_t mc33_t_hold_off;;"us", 1, 0.0, 0, 10000, 0
uint16_t mc33_t_hold_tot;;"us", 1, 0.0, 0, 10000, 0
! just a reminder that 'int' and 'float' are 4 bytes each
int[371] mainUnusedEnd;;"units", 1, 0, -20, 100, 0
@ -1633,7 +1633,7 @@ end_struct
#define TS_COMPOSITE_DISABLE 2
// Performance tracing
#define TS_PERF_TRACE_BEGIN 'r'
#define TS_PERF_TRACE_BEGIN '_'
#define TS_PERF_TRACE_GET_BUFFER 'b'
// 0x50
@ -1653,7 +1653,7 @@ end_struct
// 0x42 burnCommand
#define TS_BURN_COMMAND 'B'
// 0x77
#define TS_IO_TEST_COMMAND 'w'
#define TS_IO_TEST_COMMAND 'Z'
#define TS_RESPONSE_OK 0
#define TS_RESPONSE_BURN_OK 4

32
firmware/tunerstudio/rusefi.input
View File

@ -1795,20 +1795,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
panel = pedalGauges, East
dialog = mc33Dialog, "GDI Dreams"
field = mc33816_cs, mc33816_cs
field = mc33816_rstb, mc33816_rstb
field = mc33816_flag0, mc33816_flag0
field = "mc33972 SPI", mc33972spiDevice
field = mc33_hvolt, mc33_hvolt
field = mc33_i_boost, mc33_i_boost
field = mc33_i_peak, mc33_i_peak
field = mc33_i_hold, mc33_i_hold
field = mc33_t_max_boost, mc33_t_max_boost
field = mc33_t_peak_off, mc33_t_peak_off
field = mc33_t_peak_tot, mc33_t_peak_tot
field = mc33_t_bypass, mc33_t_bypass
field = mc33_t_hold_off, mc33_t_hold_off
field = mc33_t_hold_tot, mc33_t_hold_tot
field = "MC33816 cs", mc33816_cs
field = "MC33816 rstb", mc33816_rstb
field = "MC33816 flag0", mc33816_flag0
field = "MC33816 SPI Device", mc33972spiDevice
field = "Boost voltage", mc33_hvolt
field = "Boost current target", mc33_i_boost
field = "Max boost time (timeout)", mc33_t_max_boost
field = "Boost -> Peak Bypass Time", mc33_t_peak_off
field = "Peak current target", mc33_i_peak
field = "Peak time", mc33_t_peak_tot
field = "Peak -> Hold Bypass Time", mc33_t_bypass
field = "Hold current target", mc33_i_hold
field = "mc33_t_hold_off ?????", mc33_t_hold_off
field = "Maximum injection duration", mc33_t_hold_tot
; Sensor Inputs

26
java_tools/ts_plugin_launcher/.idea/misc.xml
View File

@ -1,5 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MavenBuildProjectComponent">
<option name="mavenExecutable" value="" />
<option name="Settings File" value="" />
<option name="mavenCommandLineParams" value="" />
<option name="vmOptions" value="" />
<option name="useMavenEmbedder" value="false" />
<option name="useFilter" value="false" />
<option name="Batch Mode" value="false" />
<option name="Check Plugin Updates" value="false" />
<option name="Debug" value="false" />
<option name="Errors" value="false" />
<option name="Fail At End" value="false" />
<option name="Fail Fast" value="false" />
<option name="Fail Never" value="false" />
<option name="Lax Checksums" value="false" />
<option name="No Plugin Registry" value="false" />
<option name="No Plugin Updates" value="false" />
<option name="Non Recursive" value="false" />
<option name="Offline" value="false" />
<option name="Reactor" value="false" />
<option name="Strict Checksums" value="false" />
<option name="Update Plugins" value="false" />
<option name="Update Snapshots" value="false" />
<option name="Skip Tests" value="false" />
<pom-list />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>

2
simulator/Makefile
View File

@ -196,7 +196,7 @@ INCDIR = . \
$(PROJECT_DIR)/config/engines \
$(PROJECT_DIR)/ext_algo \
$(HW_LAYER_DRIVERS_INC) \
$(PROJECT_DIR)/hw_layer \
$(HW_LAYER_INC) $(HW_SENSORS_INC) \
$(PROJECT_DIR)/hw_layer/algo \
$(PROJECT_DIR)/hw_layer/drivers/can \
$(HW_SENSORS_INC) \

6
unit_tests/Makefile
View File

@ -179,10 +179,10 @@ INCDIR = . \
$(CONSOLE_INC) \
$(DEVELOPMENT_DIR) \
$(PROJECT_DIR)/ext_algo \
$(PROJECT_DIR)/hw_layer \
$(PROJECT_DIR)/hw_layer/algo \
$(PROJECT_DIR)/hw_layer/sensors/ \
$(PROJECT_DIR)/init/ \
$(PROJECT_DIR)/hw_layer/algo \
$(HW_LAYER_INC) \
$(HW_SENSORS_INC) \
$(HW_LAYER_DRIVERS_INC) \
test_data_structures \
googletest/googlemock/include \