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 2017-02-15 11:03:28 -05:00
parent 47b5abd6a6
commit f6ad4b1ace
8 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/stm32f4ems/efifeatures.h
View File

@ -267,10 +267,10 @@
// todo: start using consoleUartDevice
#define EFI_CONSOLE_UART_DEVICE (&SD3)
// todo: start using console_tx_pin
// todo: start using consoleSerialTxPin
#define EFI_CONSOLE_TX_PORT GPIOC
#define EFI_CONSOLE_TX_PIN 10
// todo: start using console_rx_pin
// todo: start using consoleSerialRxPin
#define EFI_CONSOLE_RX_PORT GPIOC
#define EFI_CONSOLE_RX_PIN 11
// todo: this should be detected automatically based on pin selection

10
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 Mon Feb 13 21:22:31 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 15 10:33:44 EST 2017
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -644,11 +644,11 @@ typedef struct {
/**
* offset 576
*/
brain_pin_e console_rx_pin;
int unused77;
/**
* offset 580
*/
brain_pin_e console_tx_pin;
int unused78;
/**
* offset 584
*/
@ -1500,10 +1500,12 @@ typedef struct {
*/
brain_pin_e binarySerialRxPin;
/**
* todo: finish pin migration from hard-coded to configurable?
* offset 1940
*/
brain_pin_e consoleSerialTxPin;
/**
* todo: finish pin migration from hard-coded to configurable?
* offset 1944
*/
brain_pin_e consoleSerialRxPin;
@ -2049,4 +2051,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 21:22:31 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 15 10:33:44 EST 2017

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

@ -506,8 +506,8 @@
#define gpioPinModes15_offset 1188
#define gpioPinModes16_offset 1192
#define consoleUartDevice_offset 1196
#define console_rx_pin_offset 1200
#define console_tx_pin_offset 1204
#define unused77_offset 1200
#define unused78_offset 1204
#define nb2ratioFrom_offset 1208
#define nb2ratioTo_offset 1212
#define triggerErrorPin_offset 1216

3
firmware/controllers/sensors/voltage.cpp
View File

@ -15,7 +15,8 @@
EXTERN_ENGINE;
float getVRef(DECLARE_ENGINE_PARAMETER_F) {
return getVoltageDivided("vref", engineConfiguration->vRefAdcChannel);
// not currently used return getVoltageDivided("vref", engineConfiguration->vRefAdcChannel);
return NAN;
}
bool hasVBatt(DECLARE_ENGINE_PARAMETER_F) {

2
firmware/hw_layer/adc_inputs.cpp
View File

@ -533,7 +533,7 @@ static void configureInputs(void) {
addChannel("fuel", engineConfiguration->fuelLevelSensor, ADC_SLOW);
addChannel("pPS", engineConfiguration->pedalPositionChannel, ADC_SLOW);
addChannel("VBatt", engineConfiguration->vbattAdcChannel, ADC_SLOW);
addChannel("Vref", engineConfiguration->vRefAdcChannel, ADC_SLOW);
// not currently used addChannel("Vref", engineConfiguration->vRefAdcChannel, ADC_SLOW);
addChannel("CLT", engineConfiguration->clt.adcChannel, ADC_SLOW);
addChannel("IAT", engineConfiguration->iat.adcChannel, ADC_SLOW);
addChannel("AFR", engineConfiguration->afr.hwChannel, ADC_SLOW);

8
firmware/integration/rusefi_config.txt
View File

@ -517,8 +517,8 @@ bit is_enabled_spi_2
custom uart_device_e 4 bits,U32, @OFFSET@, [0:1], "Off", "UART1", "UART2", "UART3"
uart_device_e consoleUartDevice;
brain_pin_e console_rx_pin;
brain_pin_e console_tx_pin;
int unused77;
int unused78;
float nb2ratioFrom;;"value", 1, 0, 0, 1000, 5
float nb2ratioTo;;"value", 1, 0, 0, 1000, 5
@ -691,8 +691,8 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@
brain_pin_e runningPin;green LED on discovery by default
brain_pin_e binarySerialTxPin;
brain_pin_e binarySerialRxPin;
brain_pin_e consoleSerialTxPin;
brain_pin_e consoleSerialRxPin;
brain_pin_e consoleSerialTxPin; todo: finish pin migration from hard-coded to configurable?
brain_pin_e consoleSerialRxPin;todo: finish pin migration from hard-coded to configurable?
float[ENGINE_NOISE_CURVE_SIZE] knockNoise;Knock sensor output knock detection threshold depending on current RPM;"v", 1, 0, 0.0, 10, 2
float[ENGINE_NOISE_CURVE_SIZE] knockNoiseRpmBins;;"RPM", 1, 0, 0.0, 18000, 2
pid_s etb;

6
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 Mon Feb 13 23:36:28 EST 2017
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 15 10:33:44 EST 2017
pageSize = 16376
page = 1
@ -341,8 +341,8 @@ page = 1
gpioPinModes15 = bits, U32, 1188, [0:1], "default", "default inverted", "open collector", "open collector inverted"
gpioPinModes16 = bits, U32, 1192, [0:1], "default", "default inverted", "open collector", "open collector inverted"
consoleUartDevice = bits,U32, 1196, [0:1], "Off", "UART1", "UART2", "UART3"
console_rx_pin = bits, U32, 1200, [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"
console_tx_pin = bits, U32, 1204, [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"
;skipping unused77 offset 1200
;skipping unused78 offset 1204
nb2ratioFrom = scalar, F32, 1208, "value", 1, 0, 0, 1000, 5
nb2ratioTo = scalar, F32, 1212, "value", 1, 0, 0, 1000, 5
triggerErrorPin = bits, U32, 1216, [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"

10
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 Mon Feb 13 23:36:28 EST 2017
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 15 10:33:44 EST 2017
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -510,8 +510,8 @@ public class Fields {
public static final int gpioPinModes15_offset = 1188;
public static final int gpioPinModes16_offset = 1192;
public static final int consoleUartDevice_offset = 1196;
public static final int console_rx_pin_offset = 1200;
public static final int console_tx_pin_offset = 1204;
public static final int unused77_offset = 1200;
public static final int unused78_offset = 1204;
public static final int nb2ratioFrom_offset = 1208;
public static final int nb2ratioTo_offset = 1212;
public static final int triggerErrorPin_offset = 1216;
@ -1306,8 +1306,8 @@ public class Fields {
public static final Field GPIOPINMODES15 = Field.create("GPIOPINMODES15", 1188, FieldType.INT, pin_output_mode_e);
public static final Field GPIOPINMODES16 = Field.create("GPIOPINMODES16", 1192, FieldType.INT, pin_output_mode_e);
public static final Field CONSOLEUARTDEVICE = Field.create("CONSOLEUARTDEVICE", 1196, FieldType.INT);
public static final Field CONSOLE_RX_PIN = Field.create("CONSOLE_RX_PIN", 1200, FieldType.INT, brain_pin_e);
public static final Field CONSOLE_TX_PIN = Field.create("CONSOLE_TX_PIN", 1204, FieldType.INT, brain_pin_e);
public static final Field UNUSED77 = Field.create("UNUSED77", 1200, FieldType.INT);
public static final Field UNUSED78 = Field.create("UNUSED78", 1204, FieldType.INT);
public static final Field NB2RATIOFROM = Field.create("NB2RATIOFROM", 1208, FieldType.FLOAT);
public static final Field NB2RATIOTO = Field.create("NB2RATIOTO", 1212, FieldType.FLOAT);
public static final Field TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 1216, FieldType.INT, brain_pin_e);