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

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

This commit is contained in:
rusefi 2019-11-16 11:23:49 -05:00
parent bbab7a3c28 10d119efe5
commit f56c4fe588
24 changed files with 43 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp
View File

@ -569,8 +569,8 @@ case FRANKENSO_QA_ENGINE:
return "FRANKENSO_QA_ENGINE";
case Force_4_bytes_size_engine_type:
return "Force_4_bytes_size_engine_type";
case GEO_STORM:
return "GEO_STORM";
case BMW_M73:
return "BMW_M73";
case MRE_BOARD_TEST:
return "MRE_BOARD_TEST";
case GY6_139QMB:

4
firmware/config/engines/bmw_e34.h
View File

@ -5,11 +5,9 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef BMW_E34_H_
#define BMW_E34_H_
#pragma once
#include "engine_configuration.h"
void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* BMW_E34_H_ */

16
firmware/config/engines/bmw_m73.cpp
View File

@ -32,11 +32,11 @@
* ECU pin 22: IN RED/BRN GRN CLT sensor
* ECU pin 27: OUT injector #6
* ECU pin 28: OUT injector #5
* ECU pin 32: IN ORG VR crankshaft sensor
* ECU pin 32: IN ORG VR positive crankshaft sensor - only 2x 5k per channel, R111 not installed, W1002 not installed
* ECU pin 40: OUT BRN/BLK injector #3
* ECU pin 41: OUT BRN/WHT injector #1
* ECU pin 45: GND crankshaft shield
* ECU pin 46: IN BLK BLU VR crankshaft sensor
* ECU pin 46: IN BLK BLU VR negative crankshaft sensor
*
*
* Plug #4 40 pin
@ -46,6 +46,9 @@
* ECU pin 40: OUT YEL/BRN BRN starter enable
*
*
* set engine_type 40
*
*
* @date Nov 1, 2019
* @author Andrey Belomutskiy, (c) 2012-2019
*/
@ -62,6 +65,15 @@ void setEngineBMW_M73(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->specs.displacement = 5.4;
engineConfiguration->specs.firingOrder = FO_1_7_5_11_3_9_6_12_2_8_4_10;
boardConfiguration->triggerInputPins[0] = GPIOA_5;
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;
engineConfiguration->camInputs[0] = GPIOC_6;
engineConfiguration->vvtMode = VVT_FIRST_HALF;
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->trigger.type = TT_60_2_VW;
// 13641435991 injector
engineConfiguration->injector.flow = 180; // cc/min, who knows if this number is real - no good source of info
}

1
firmware/config/engines/engines.mk
View File

@ -23,7 +23,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
$(PROJECT_DIR)/config/engines/rover_v8.cpp \
$(PROJECT_DIR)/config/engines/mazda_323.cpp \
$(PROJECT_DIR)/config/engines/mazda_626.cpp \
$(PROJECT_DIR)/config/engines/prometheus.cpp \
$(PROJECT_DIR)/config/engines/sachs.cpp \
$(PROJECT_DIR)/config/engines/test_engine.cpp \
$(PROJECT_DIR)/config/engines/mitsubishi.cpp \

5
firmware/config/engines/ford_aspire.h
View File

@ -9,11 +9,8 @@
*
*/
#ifndef FORD_ASPIRE_H_
#define FORD_ASPIRE_H_
#pragma once
#include "engine_configuration.h"
void setFordAspireEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* FORD_ASPIRE_H_ */

5
firmware/config/engines/mazda_miata.h
View File

@ -9,8 +9,7 @@
* Injectors: Denso 195500-2180, 230-265cc (?), tan, 13.9 ohms
*/
#ifndef MAZDA_MIATA_H_
#define MAZDA_MIATA_H_
#pragma once
#include "engine_configuration.h"
@ -18,5 +17,3 @@ void common079721_2351(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setMiata1990(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setMiata1994_d(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setMiata1996(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* MAZDA_MIATA_H_ */

5
firmware/config/engines/mazda_miata_na8.h
View File

@ -5,11 +5,8 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef CONFIG_ENGINES_MAZDA_MIATA_NA8_H_
#define CONFIG_ENGINES_MAZDA_MIATA_NA8_H_
#pragma once
#include "engine_configuration.h"
void setMazdaMiataNA8Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* CONFIG_ENGINES_MAZDA_MIATA_NA8_H_ */

4
firmware/config/engines/mazda_miata_nb.h
View File

@ -5,11 +5,9 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef MAZDA_MIATA_NB1_H_
#define MAZDA_MIATA_NB1_H_
#pragma once
#include "engine_configuration.h"
void setMazdaMiataNb1EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* MAZDA_MIATA_NB1_H_ */

5
firmware/config/engines/mazda_miata_vvt.h
View File

@ -7,8 +7,7 @@
* http://rusefi.com/forum/viewtopic.php?f=3&t=1095
*/
#ifndef CONFIG_ENGINES_MAZDA_MIATA_VVT_H_
#define CONFIG_ENGINES_MAZDA_MIATA_VVT_H_
#pragma once
#include "engine_configuration.h"
@ -20,5 +19,3 @@ void setMazdaMiata2003EngineConfigurationNaFuelRail(DECLARE_CONFIG_PARAMETER_SIG
void setMazdaMiata2003EngineConfigurationBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setMiataNB2_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* CONFIG_ENGINES_MAZDA_MIATA_VVT_H_ */

17
firmware/config/engines/prometheus.cpp
View File

@ -1,17 +0,0 @@
/*
* prometheus.cpp
*
* set engine_type 100
*
* @date May 6, 2017
* @author Andrey Belomutskiy, (c) 2012-2018
*/
#include "prometheus.h"
void setPrometheusDefaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
}

14
firmware/config/engines/prometheus.h
View File

@ -1,14 +0,0 @@
/*
* prometheus.h
*
* @date May 6, 2017
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef CONFIG_ENGINES_PROMETHEUS_H_
#define CONFIG_ENGINES_PROMETHEUS_H_
#include "engine_configuration.h"
void setPrometheusDefaults(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* CONFIG_ENGINES_PROMETHEUS_H_ */

6
firmware/controllers/algo/accel_enrichment.h
View File

@ -7,8 +7,7 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef ACC_ENRICHMENT_H_
#define ACC_ENRICHMENT_H_
#pragma once
#include "global.h"
#include "cyclic_buffer.h"
@ -93,6 +92,3 @@ void setDecelThr(float value);
void setDecelMult(float value);
void updateAccelParameters();
#endif /* ACC_ENRICHMENT_H_ */

5
firmware/controllers/algo/advance_map.h
View File

@ -5,8 +5,7 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef ADVANCE_H_
#define ADVANCE_H_
#pragma once
#include "engine.h"
@ -17,5 +16,3 @@ float getTopAdvanceForBore(chamber_style_e style, int octane, double compression
float getInitialAdvance(int rpm, float map, float advanceMax);
void buildTimingMap(float advanceMax DECLARE_CONFIG_PARAMETER_SUFFIX);
angle_t getAdvanceCorrections(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX);
#endif /* ADVANCE_H_ */

5
firmware/controllers/algo/algo.h
View File

@ -5,12 +5,9 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef ALGO_H_
#define ALGO_H_
#pragma once
#include "global.h"
#include "engine_configuration.h"
void initDataStructures(DECLARE_ENGINE_PARAMETER_SIGNATURE);
void initAlgo(Logging *sharedLogger);
#endif /* ALGO_H_ */

4
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -707,8 +707,8 @@ case FRANKENSO_QA_ENGINE:
return "FRANKENSO_QA_ENGINE";
case Force_4_bytes_size_engine_type:
return "Force_4_bytes_size_engine_type";
case GEO_STORM:
return "GEO_STORM";
case BMW_M73:
return "BMW_M73";
case MRE_BOARD_TEST:
return "MRE_BOARD_TEST";
case GY6_139QMB:

10
firmware/controllers/algo/engine_configuration.cpp
View File

@ -38,6 +38,7 @@
#include "custom_engine.h"
#include "engine_template.h"
#include "bmw_e34.h"
#include "bmw_m73.h"
#include "dodge_neon.h"
#include "dodge_ram.h"
@ -62,7 +63,6 @@
#include "citroenBerlingoTU3JP.h"
#include "rover_v8.h"
#include "mitsubishi.h"
#include "prometheus.h"
#include "subaru.h"
#include "test_engine.h"
#include "sachs.h"
@ -1053,10 +1053,12 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
*/
switch (engineType) {
case DEFAULT_FRANKENSO:
case GEO_STORM:
case FRANKENSO_QA_ENGINE:
setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case BMW_M73:
setEngineBMW_M73(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MRE_MIATA_NA6:
setMiataNA6_VAF_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
@ -1066,6 +1068,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case MRE_MIATA_NB2:
setMiataNB2_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case PROMETHEUS_DEFAULTS:
case MINIMAL_PINS:
// all basic settings are already set in prepareVoidConfiguration(), no need to set anything here
break;
@ -1223,9 +1226,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case MAZDA_MIATA_2003_BOARD_TEST:
setMazdaMiata2003EngineConfigurationBoardTest(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case PROMETHEUS_DEFAULTS:
setPrometheusDefaults(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case SUBARUEJ20G_DEFAULTS:
setSubaruEJ20GDefaults(PASS_CONFIG_PARAMETER_SIGNATURE);
break;

8
firmware/controllers/algo/lcd_menu_tree.h
View File

@ -4,8 +4,8 @@
* @date Jan 6, 2015
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef CONTROLLERS_ALGO_LCD_MENU_TREE_H_
#define CONTROLLERS_ALGO_LCD_MENU_TREE_H_
#pragma once
typedef enum {
LL_STRING,
@ -73,7 +73,3 @@ public:
MenuItem *current = nullptr;
MenuItem *topVisible = nullptr;
};
#endif /* CONTROLLERS_ALGO_LCD_MENU_TREE_H_ */

7
firmware/controllers/algo/rusefi_enums.h
View File

@ -8,8 +8,7 @@
* @author Andrey Belomutskiy, (c) 2012-2019
*/
#ifndef RUSEFI_ENUMS_H_
#define RUSEFI_ENUMS_H_
#pragma once
#include "efifeatures.h"
#include "obd_error_codes.h"
@ -131,7 +130,7 @@ typedef enum {
LADA_KALINA = 39,
GEO_STORM = 40,
BMW_M73 = 40,
// Frankenso board
MIATA_NA6_MAP = 41,
@ -839,5 +838,3 @@ typedef enum {
*/
Force_4bytes_size_idle_state_e = ENUM_32_BITS,
} idle_state_e;
#endif /* RUSEFI_ENUMS_H_ */

5
firmware/controllers/flash_main.h
View File

@ -6,8 +6,7 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef FLASH_MAIN_H_
#define FLASH_MAIN_H_
#pragma once
#include "engine.h"
@ -38,5 +37,3 @@ void setNeedToWriteConfiguration(void);
*/
bool getNeedToWriteConfiguration(void);
void writeToFlashIfPending(void);
#endif /* FLASH_MAIN_H_ */

5
firmware/controllers/injector_central.h
View File

@ -8,8 +8,7 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef INJECTOR_CENTRAL_H_
#define INJECTOR_CENTRAL_H_
#pragma once
#include "engine.h"
@ -21,5 +20,3 @@ void initInjectorCentral(Logging *sharedLogger);
bool isRunningBenchTest(void);
void executeTSCommand(uint16_t subsystem, uint16_t index);
#endif /* INJECTOR_CENTRAL_H_ */

5
firmware/controllers/map_averaging.h
View File

@ -5,8 +5,7 @@
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef ADC_AVERAGING_H_
#define ADC_AVERAGING_H_
#pragma once
#include "engine.h"
@ -24,5 +23,3 @@ void postMapState(TunerStudioOutputChannels *tsOutputChannels);
#endif
#endif /* EFI_MAP_AVERAGING */
#endif /* ADC_AVERAGING_H_ */

3
hardware/DDPAK_breakout/known_issues.txt
View File

@ -1,4 +1,5 @@
1) RESOLVED IN R0.2 DPAK2 is apparently different than D2PAK, now it uses TO-263AB
2) RESOLVED IN R0.2 Make vias under large GND pad larger to allow more heat form iron during soldering
3) RESOLVED IN R0.2 move Via's to PCB edge to allow install on proto area of Frankenso
4) RESOLVED IN R0.2 add 4-40 mounting screw hole(s)
4) RESOLVED IN R0.2 add 4-40 mounting screw hole(s)
5) signal wire hole to be a bit bigger - bottom-left on https://raw.githubusercontent.com/rusefi/rusefi/master/hardware/DDPAK_breakout/BTS2140.jpg

5
unit_tests/boards.h
View File

@ -5,8 +5,7 @@
* @author Andrey Belomutskiy, (c) 2012-2019
*/
#ifndef BOARDS_H_
#define BOARDS_H_
#pragma once
#include "engine_configuration.h"
#include "adc_math.h"
@ -14,5 +13,3 @@
#define ADC_CHANNEL_VREF 0
int getAdcValue(const char *msg, adc_channel_e channel);
#endif /* BOARDS_H_ */

5
unit_tests/globalaccess.h
View File

@ -5,8 +5,7 @@
* @author Andrey Belomutskiy, (c) 2012-2019
*/
#ifndef GLOBALACCESS_H_
#define GLOBALACCESS_H_
#pragma once
#define DECLARE_CONFIG_PARAMETER_SIGNATURE engine_configuration_s *engineConfiguration, persistent_config_s *config, board_configuration_s *boardConfiguration
#define DECLARE_CONFIG_PARAMETER_SUFFIX , DECLARE_CONFIG_PARAMETER_SIGNATURE
@ -26,5 +25,3 @@
//#define CONFIGB(x) engine->engineConfigurationPtr->bc.x
#define CONFIGB(x) CONFIG(bc.x)
#define ENGINE(x) engine->x
#endif /* GLOBALACCESS_H_ */