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

auto-sync

This commit is contained in:
rusEfi 2015-08-18 15:03:44 -04:00
parent 35124ec338
commit 01b8268e24
10 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,6 +195,8 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) {
boardConfiguration->etbDirectionPin2 = GPIO_UNASSIGNED;
boardConfiguration->o2heaterPin = GPIO_UNASSIGNED;
boardConfiguration->tachOutputPin = GPIO_UNASSIGNED;
boardConfiguration->malfunctionIndicatorPin = GPIO_UNASSIGNED;
boardConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT;

16
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Tue Aug 18 12:48:49 EDT 2015
// this section was generated by config_definition.jar on Tue Aug 18 13:54:22 EDT 2015
// begin
#include "rusefi_types.h"
typedef struct {
@ -453,7 +453,11 @@ typedef struct {
/**
* offset 288
*/
float unusedADC[2];
brain_pin_e tachOutputPin;
/**
* offset 292
*/
pin_output_mode_e tachOutputPinMode;
/**
* offset 296
*/
@ -1246,7 +1250,11 @@ typedef struct {
/**
* offset 1824
*/
int unused3[83];
float tachPulseDuractionMs;
/**
* offset 1828
*/
int unused3[82];
/**
* offset 2156
*/
@ -1457,4 +1465,4 @@ typedef struct {
} persistent_config_s;
// end
// this section was generated by config_definition.jar on Tue Aug 18 12:48:49 EDT 2015
// this section was generated by config_definition.jar on Tue Aug 18 13:54:22 EDT 2015

12
firmware/controllers/algo/rusefi_generated.h
View File

@ -319,8 +319,10 @@
#define etbDT_offset 904
#define etbDT_offset_hex 388
#define hip9011CsPinMode_offset 908
#define unusedADC_offset 912
#define unusedADC_offset_hex 390
#define tachOutputPin_offset 912
#define tachOutputPin_offset_hex 390
#define tachOutputPinMode_offset 916
#define tachOutputPinMode_offset_hex 394
#define triggerInputPins1_offset 920
#define triggerInputPins1_offset_hex 398
#define triggerInputPins2_offset 924
@ -649,8 +651,10 @@
#define crankingTpsCoef_offset 1760
#define crankingTpsBins_offset 1792
#define crankingTpsBins_offset_hex 700
#define unused3_offset 1824
#define unused3_offset_hex 720
#define tachPulseDuractionMs_offset 1824
#define tachPulseDuractionMs_offset_hex 720
#define unused3_offset 1828
#define unused3_offset_hex 724
#define targetVBatt_offset 2156
#define alternatorOffAboveTps_offset 2160
#define alternatorOffAboveTps_offset_hex 870

1
firmware/controllers/controllers.mk
View File

@ -13,4 +13,5 @@ CONTROLLERS_SRC_CPP = $(PROJECT_DIR)/controllers/settings.cpp \
$(PROJECT_DIR)/controllers/malfunction_indicator.cpp \
$(PROJECT_DIR)/controllers/alternatorController.cpp \
$(PROJECT_DIR)/controllers/lcd_controller.cpp \
$(PROJECT_DIR)/controllers/tachometer.cpp \
$(PROJECT_DIR)/controllers/engine_controller.cpp

2
firmware/controllers/flash_main.h
View File

@ -11,7 +11,7 @@
#include "engine.h"
#define FLASH_DATA_VERSION 8400
#define FLASH_DATA_VERSION 8500
void readFromFlash(void);
void initFlash(Logging *sharedLogger);

16
firmware/controllers/tachometer.cpp Normal file
View File

@ -0,0 +1,16 @@
/*
* @file tachometer.cpp
*
* @date Aug 18, 2015
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#include "tachometer.h"
EXTERN_ENGINE;
void initTachometer(void) {
if (boardConfiguration->tachOutputPin == GPIO_UNASSIGNED)
return;
}

15
firmware/controllers/tachometer.h Normal file
View File

@ -0,0 +1,15 @@
/*
* @file tachometer.h
*
* @date Aug 18, 2015
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef CONTROLLERS_TACHOMETER_H_
#define CONTROLLERS_TACHOMETER_H_
#include "engine.h"
void initTachometer(void);
#endif /* CONTROLLERS_TACHOMETER_H_ */

6
firmware/integration/rusefi_config.txt
View File

@ -371,7 +371,8 @@ float etbIFactor;
ego_sensor_e afr_type;AFR, WBO, EGO - whatever you like to call it;
int etbDT;
pin_output_mode_e hip9011CsPinMode;
float[2] unusedADC;
brain_pin_e tachOutputPin;
pin_output_mode_e tachOutputPinMode;
brain_input_pin_e[3 iterate] triggerInputPins;
brain_pin_e mainRelayPin;
@ -569,7 +570,8 @@ baro_corr_table_t baroCorrTable;
float[CRANKING_CURVE_SIZE] crankingTpsCoef;;"%", 1, 0, 0.0, 700.0, 2
float[CRANKING_CURVE_SIZE] crankingTpsBins;;"%", 1, 0, 0.0, 100.0, 2
int[83] unused3;
float tachPulseDuractionMs;
int[82] unused3;
float targetVBatt;;"Volts", 1, 0, 0,30, 1
float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2

8
firmware/tunerstudio/rusefi.ini
View File

@ -40,7 +40,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Tue Aug 18 12:48:50 EDT 2015
; this section was generated by ConfigDefinition.jar on Tue Aug 18 13:54:23 EDT 2015
pageSize = 15288
page = 1
@ -221,7 +221,8 @@ page = 1
afr_type = bits, S32, 900, [0:2], "BPSX", "Innovate", "14Point7", "Narrow", "PLX"
;skipping etbDT offset 904
hip9011CsPinMode = bits, U32, 908, [0:1], "default", "default inverted", "open", "open inverted"
;skipping unusedADC offset 912
tachOutputPin = bits, U32, 912, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
tachOutputPinMode = bits, U32, 916, [0:1], "default", "default inverted", "open", "open inverted"
triggerInputPins1 = bits, U32, 920, [0:6], "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
triggerInputPins2 = bits, U32, 924, [0:6], "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
triggerInputPins3 = bits, U32, 928, [0:6], "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@ -464,7 +465,8 @@ page = 1
;skipping spi2MisoMode offset 1756
crankingTpsCoef = array, F32, 1760, [8], "%", 1, 0, 0.0, 700.0, 2
crankingTpsBins = array, F32, 1792, [8], "%", 1, 0, 0.0, 100.0, 2
;skipping unused3 offset 1824
;skipping tachPulseDuractionMs offset 1824
;skipping unused3 offset 1828
targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1
alternatorOffAboveTps = scalar, F32, 2160, "%", 1, 0, 0, 200, 2
alternatorDT = scalar, S32, 2164, "ms", 1, 0, 0, 3000, 0

6
win32_functional_tests/Makefile
View File

@ -8,10 +8,10 @@ PROJECT_DIR = ../firmware
# Compiler options here.
ifeq ($(USE_OPT),)
# this config if debugging is needed, but the binary is about 30M
USE_OPT = -c -Wall -O0 -ggdb -g3 -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers -Wno-error=write-strings
# this config if debugging is needed, but the binary is about 50M
# USE_OPT = -c -Wall -O0 -ggdb -g3 -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers -Wno-error=write-strings
# this config producec a smaller binary file
# USE_OPT = -c -Wall -O2 -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers -Wno-error=write-strings -Wno-error=strict-aliasing
USE_OPT = -c -Wall -O2 -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers -Wno-error=write-strings -Wno-error=strict-aliasing
endif
# C specific options here (added to USE_OPT).