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

auto-sync

This commit is contained in:
rusEfi 2014-09-17 11:03:04 -05:00
parent 842d45477f
commit dbd3d5ae28
9 changed files with 63 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/tunerstudio/tunerstudio.cpp
View File

@ -53,7 +53,7 @@ static SerialConfig tsSerialConfig = { TS_SERIAL_SPEED, 0, USART_CR2_STOP1_BITS
#endif /* EFI_PROD_CODE */
#define MAX_PAGE_ID 0
#define PAGE_0_SIZE 5928
#define PAGE_0_SIZE 6328
#define TS_OUTPUT_SIZE 116
// in MS, that's 10 seconds

3
firmware/console/tunerstudio/tunerstudio_configuration.h
View File

@ -14,8 +14,7 @@
/**
* this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
*/
#define TS_FILE_VERSION 20140910
#define TS_FILE_VERSION 20140917
/**
* please be aware that 'float' (F32) type requires TunerStudio version 2.6 and later

4
firmware/controllers/algo/engine_configuration.h
View File

@ -31,6 +31,8 @@ typedef struct {
#define INJECTION_PIN_COUNT 12
#define IGNITION_PIN_COUNT 12
#define MAX31855_CS_COUNT 8
#define FUEL_RPM_COUNT 16
#define FUEL_LOAD_COUNT 16
#define VE_RPM_COUNT 16
@ -199,6 +201,8 @@ typedef struct {
pin_output_mode_e mainRelayPinMode;
int unusedbs[100];
} board_configuration_s;

4
firmware/hw_layer/hardware.cpp
View File

@ -22,6 +22,7 @@
#include "mcp3208.h"
#include "HIP9011.h"
#include "max31855.h"
#include "can_hw.h"
#include "histogram.h"
#include "mmc_card.h"
@ -206,6 +207,9 @@ void initHardware(Logging *logger, Engine *engine) {
initHip9011();
#endif /* EFI_HIP_9011 */
initMax31855(boardConfiguration);
#if EFI_CAN_SUPPORT
initCan();
#endif /* EFI_CAN_SUPPORT */

1
firmware/hw_layer/hw_layer.mk
View File

@ -2,6 +2,7 @@
HW_LAYERSRC = $(PROJECT_DIR)/hw_layer/pin_repository.c \
$(PROJECT_DIR)/hw_layer/io_pins.c \
$(PROJECT_DIR)/hw_layer/mcp3208.c \
$(PROJECT_DIR)/hw_layer/max31855.c \
$(PROJECT_DIR)/hw_layer/lcd/lcd_HD44780.c \
$(PROJECT_DIR)/hw_layer/HIP9011.c \
$(PROJECT_DIR)/hw_layer/microsecond_timer.c \

16
firmware/hw_layer/max31855.c Normal file
View File

@ -0,0 +1,16 @@
/**
* @file max31855.c
* @brief MAX31855 Thermocouple-to-Digital Converter driver
*
*
* http://datasheets.maximintegrated.com/en/ds/MAX31855.pdf
*
* @date Sep 17, 2014
* @author Andrey Belomutskiy, (c) 2012-2014
*/
#include "max31855.h"
void initMax31855(board_configuration_s *boardConfiguration) {
}

25
firmware/hw_layer/max31855.h Normal file
View File

@ -0,0 +1,25 @@
/**
* @file max31855.h
*
* @date Sep 17, 2014
* @author Andrey Belomutskiy, (c) 2012-2014
*/
#ifndef MAX31855_H_
#define MAX31855_H_
#include "main.h"
#include "engine_configuration.h"
#ifdef __cplusplus
extern "C"
{
#endif /* __cplusplus */
void initMax31855(board_configuration_s *boardConfiguration);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* MAX31855_H_ */

2
firmware/rusefi.cpp
View File

@ -235,5 +235,5 @@ void firmwareError(const char *fmt, ...) {
}
int getRusEfiVersion(void) {
return 20140916;
return 20140917;
}

19
firmware/tunerstudio/rusefi.ini
View File

@ -285,18 +285,19 @@ enable2ndByteCanID = false
logicAnalyzerPin2 = bits, U32, 5860, [0:6], "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOA_5", "INVALID", "INVALID", "GPIOA_8", "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", "GPIOC_6", "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", "GPIOE_5", "INVALID", "GPIOE_7", "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"
logicAnalyzerPin3 = bits, U32, 5864, [0:6], "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "GPIOA_5", "INVALID", "INVALID", "GPIOA_8", "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", "GPIOC_6", "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", "GPIOE_5", "INVALID", "GPIOE_7", "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"
; idle mode 5888
isInjectionEnabled = bits, U32, 5892, [0:0], "false", "true"
isIgnitionEnabled = bits, U32, 5892, [1:1], "false", "true"
isCylinderCleanupEnabled= bits, U32, 5892, [2:2], "false", "true"
secondTriggerChannelEnabled= bits, U32, 5892, [3:3], "false", "true"
needSecondTriggerInput = bits, U32, 5892, [4:4], "false", "true"
digitalChartSize = scalar, U32, 5896, "count", 1, 0, 0, 300, 0 ; size 4
injectorFlow = scalar, F32, 5900, "cm3/min", 1, 0, 0, 1000, 2; size 4
; idle mode 6288
isInjectionEnabled = bits, U32, 6292, [0:0], "false", "true"
isIgnitionEnabled = bits, U32, 6292, [1:1], "false", "true"
isCylinderCleanupEnabled= bits, U32, 6292, [2:2], "false", "true"
secondTriggerChannelEnabled= bits, U32, 6292, [3:3], "false", "true"
needSecondTriggerInput = bits, U32, 6292, [4:4], "false", "true"
digitalChartSize = scalar, U32, 6296, "count", 1, 0, 0, 300, 0 ; size 4
injectorFlow = scalar, F32, 6300, "cm3/min", 1, 0, 0, 1000, 2; size 4
[OutputChannels]
fileVersion = { 20140910 }
fileVersion = { 20140917 }
ochGetCommand = "O"