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 2016-12-19 17:01:43 -05:00
parent a4d6033c72
commit 0afcdd871f
9 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/engines/rover_v8.cpp
View File

@ -79,6 +79,5 @@ void setRoverv8(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->canRxPin = GPIOB_12;
engineConfiguration->canWriteEnabled = true;
engineConfiguration->canReadEnabled = false;
engineConfiguration->isCanEnabled = true;
engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8;
}

2
firmware/config/engines/toyota_jzs147.cpp
View File

@ -26,8 +26,6 @@ EXTERN_ENGINE;
static void common2jz(DECLARE_ENGINE_PARAMETER_F) {
setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); // default pinout
engineConfiguration->isCanEnabled = true;
engineConfiguration->specs.displacement = 3.0;
engineConfiguration->specs.cylindersCount = 6;
engineConfiguration->specs.firingOrder = FO_1_5_3_6_2_4;

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

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Dec 17 10:16:55 EST 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 19 15:39:22 EST 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1218,7 +1218,7 @@ typedef struct {
bool isEngineChartEnabled : 1;
/**
offset 1488 bit 6 */
bool isCanEnabled : 1;
bool unusedBit_7 : 1;
/**
offset 1488 bit 7 */
bool unusedBit__2 : 1;
@ -2018,4 +2018,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Dec 17 10:16:55 EST 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 19 15:39:22 EST 2016

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

@ -621,7 +621,7 @@
#define unusedBit__6_offset 1488
#define useConstantDwellDuringCranking_offset 1488
#define isEngineChartEnabled_offset 1488
#define isCanEnabled_offset 1488
#define unusedBit_7_offset 1488
#define unusedBit__2_offset 1488
#define canReadEnabled_offset 1488
#define canWriteEnabled_offset 1488

2
firmware/controllers/settings.cpp
View File

@ -874,8 +874,6 @@ static void enableOrDisable(const char *param, bool isEnabled) {
engineConfiguration->isAlternatorControlEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "sd")) {
boardConfiguration->isSdCardEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "can")) {
engineConfiguration->isCanEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "test_mode")) {
engine->isTestMode = isEnabled;
} else if (strEqualCaseInsensitive(param, "can_read")) {

9
firmware/hw_layer/can_hw.cpp
View File

@ -30,6 +30,7 @@ EXTERN_ENGINE
static int canReadCounter = 0;
static int canWriteOk = 0;
static int canWriteNotOk = 0;
static bool isCanEnabled = false;
static LoggingWithStorage logger("CAN driver");
static THD_WORKING_AREA(canTreadStack, UTILITY_THREAD_STACK_SIZE);
@ -242,7 +243,7 @@ static msg_t canThread(void *arg) {
}
static void canInfo(void) {
if (!engineConfiguration->isCanEnabled) {
if (!isCanEnabled) {
scheduleMsg(&logger, "CAN is not enabled, please enable & restart");
return;
}
@ -259,16 +260,18 @@ static void canInfo(void) {
#endif /* EFI_PROD_CODE */
void enableFrankensoCan(DECLARE_ENGINE_PARAMETER_F) {
// engineConfiguration->isCanEnabled = true;
boardConfiguration->canTxPin = GPIOB_6;
boardConfiguration->canRxPin = GPIOB_12;
engineConfiguration->canReadEnabled = false;
}
void initCan(void) {
isCanEnabled = (boardConfiguration->canTxPin != GPIO_UNASSIGNED) && (boardConfiguration->canRxPin != GPIO_UNASSIGNED);
#if EFI_PROD_CODE || defined(__DOXYGEN__)
addConsoleAction("caninfo", canInfo);
if (!engineConfiguration->isCanEnabled)
if (!isCanEnabled)
return;
#endif /* EFI_PROD_CODE */

2
firmware/integration/rusefi_config.txt
View File

@ -585,7 +585,7 @@ bit unusedBit__4
bit unusedBit__6
bit useConstantDwellDuringCranking
bit isEngineChartEnabled;This options enables data for 'engine sniffer' tab in console, which comes at some CPU price
bit isCanEnabled
bit unusedBit_7
bit unusedBit__2
bit canReadEnabled
bit canWriteEnabled

4
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Dec 17 10:16:55 EST 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 19 15:39:22 EST 2016
pageSize = 16376
page = 1
@ -427,7 +427,7 @@ page = 1
unusedBit__6 = bits, U32, 1488, [3:3], "false", "true"
useConstantDwellDuringCranking= bits, U32, 1488, [4:4], "false", "true"
isEngineChartEnabled = bits, U32, 1488, [5:5], "false", "true"
isCanEnabled = bits, U32, 1488, [6:6], "false", "true"
unusedBit_7 = bits, U32, 1488, [6:6], "false", "true"
unusedBit__2 = bits, U32, 1488, [7:7], "false", "true"
canReadEnabled = bits, U32, 1488, [8:8], "false", "true"
canWriteEnabled = bits, U32, 1488, [9:9], "false", "true"

6
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Dec 17 10:16:55 EST 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 19 15:39:22 EST 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -625,7 +625,7 @@ public class Fields {
public static final int unusedBit__6_offset = 1488;
public static final int useConstantDwellDuringCranking_offset = 1488;
public static final int isEngineChartEnabled_offset = 1488;
public static final int isCanEnabled_offset = 1488;
public static final int unusedBit_7_offset = 1488;
public static final int unusedBit__2_offset = 1488;
public static final int canReadEnabled_offset = 1488;
public static final int canWriteEnabled_offset = 1488;
@ -1358,7 +1358,7 @@ public class Fields {
public static final Field UNUSEDBIT__6 = Field.create("UNUSEDBIT__6", 1488, FieldType.BIT, 3);
public static final Field USECONSTANTDWELLDURINGCRANKING = Field.create("USECONSTANTDWELLDURINGCRANKING", 1488, FieldType.BIT, 4);
public static final Field ISENGINECHARTENABLED = Field.create("ISENGINECHARTENABLED", 1488, FieldType.BIT, 5);
public static final Field ISCANENABLED = Field.create("ISCANENABLED", 1488, FieldType.BIT, 6);
public static final Field UNUSEDBIT_7 = Field.create("UNUSEDBIT_7", 1488, FieldType.BIT, 6);
public static final Field UNUSEDBIT__2 = Field.create("UNUSEDBIT__2", 1488, FieldType.BIT, 7);
public static final Field CANREADENABLED = Field.create("CANREADENABLED", 1488, FieldType.BIT, 8);
public static final Field CANWRITEENABLED = Field.create("CANWRITEENABLED", 1488, FieldType.BIT, 9);