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

auto-sync

This commit is contained in:
rusEfi 2016-10-18 17:00:37 -04:00
parent 2fc684aa10
commit bc65a8db05
5 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,29 +259,14 @@
* PE5
*/
//#define ETB_CONTROL_LINE_1_PORT GPIOE
//#define ETB_CONTROL_LINE_1_PIN 0
//
//#define ETB_CONTROL_LINE_2_PORT GPIOB
//#define ETB_CONTROL_LINE_2_PIN 8
//#define CONSOLE_PORT GPIOB
//#define CONSOLE_TX_PIN 10
//#define CONSOLE_RX_PIN 11
/**
* Here we define the pinout for the human-readable protocol via UART, TunerStudio pinout is defined separately
*/
//#define EFI_CONSOLE_TX_PORT GPIOD
//#define EFI_CONSOLE_TX_PIN 8
//#define EFI_CONSOLE_RX_PORT GPIOD
//#define EFI_CONSOLE_RX_PIN 9
//#define EFI_CONSOLE_AF 7
// todo: start using consoleUartDevice
#define EFI_CONSOLE_UART_DEVICE (&SD3)
// todo: start using console_tx_pin
#define EFI_CONSOLE_TX_PORT GPIOC
#define EFI_CONSOLE_TX_PIN 10
// todo: start using console_rx_pin
#define EFI_CONSOLE_RX_PORT GPIOC
#define EFI_CONSOLE_RX_PIN 11
// todo: this should be detected automatically based on pin selection

14
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 Thu Oct 13 14:12:25 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Oct 18 15:59:38 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -664,7 +664,15 @@ typedef struct {
/**
* offset 576
*/
int unusedJoy[4];
brain_pin_e console_rx_pin;
/**
* offset 580
*/
brain_pin_e console_tx_pin;
/**
* offset 584
*/
int unusedJoy[2];
/**
* This pin is used for debugging - snap a logic analyzer on it and see if it's ever high
* offset 592
@ -1972,4 +1980,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Oct 13 14:12:25 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Oct 18 15:59:38 EDT 2016

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

@ -505,7 +505,9 @@
#define gpioPinModes15_offset 1188
#define gpioPinModes16_offset 1192
#define consoleUartDevice_offset 1196
#define unusedJoy_offset 1200
#define console_rx_pin_offset 1200
#define console_tx_pin_offset 1204
#define unusedJoy_offset 1208
#define triggerErrorPin_offset 1216
#define triggerErrorPinMode_offset 1220
#define acRelayPin_offset 1224

8
firmware/integration/rusefi_config.txt
View File

@ -259,7 +259,13 @@ float displacement;Engine displacement, in liters\nsee also cylindersCount;"L",
custom cylinders_count_t 4 bits, U32, @OFFSET@, [0:3], "INVALID", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, "INVALID", "INVALID", "INVALID"
cylinders_count_t cylindersCount;
custom firing_order_e 4 bits, U32, @OFFSET@, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-5-3-6-2-4", "1-4-2-5-3-6", "1-2", "1_2_3_4_5_6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "fo13", "fo14", "INVALID"
! see firing_order.h
! FO_1 = 0
! FO_1_3_2_4 = 3
! FO_1_8_4_3_6_5_7_2 = 5
! FO_1_2_4_5_3 = 6
custom firing_order_e 4 bits, U32, @OFFSET@, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1_2_3_4_5_6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "fo13", "fo14", "INVALID"
firing_order_e firingOrder;
end_struct

8
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 Thu Oct 13 14:12:25 EDT 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Oct 18 15:59:38 EDT 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -509,7 +509,9 @@ 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 unusedJoy_offset = 1200;
public static final int console_rx_pin_offset = 1200;
public static final int console_tx_pin_offset = 1204;
public static final int unusedJoy_offset = 1208;
public static final int triggerErrorPin_offset = 1216;
public static final int triggerErrorPinMode_offset = 1220;
public static final int acRelayPin_offset = 1224;
@ -1261,6 +1263,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 TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 1216, FieldType.INT, brain_pin_e);
public static final Field TRIGGERERRORPINMODE = Field.create("TRIGGERERRORPINMODE", 1220, FieldType.INT, pin_output_mode_e);
public static final Field ACRELAYPIN = Field.create("ACRELAYPIN", 1224, FieldType.INT, brain_pin_e);