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-09-15 21:01:38 -04:00
parent d9620e07cf
commit a42049f4fe
9 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/status_loop.cpp
View File

@ -536,9 +536,11 @@ static void lcdThread(void *arg) {
(void)arg;
chRegSetThreadName("lcd");
while (true) {
if (engineConfiguration->bc.useLcdScreen) {
#if EFI_HD44780_LCD
updateHD44780lcd(engine);
updateHD44780lcd(engine);
#endif
}
chThdSleepMilliseconds(engineConfiguration->bc.lcdThreadPeriod);
}
}

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

@ -563,6 +563,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->consoleLoopPeriod = 200;
boardConfiguration->lcdThreadPeriod = 300;
boardConfiguration->generalPeriodicThreadPeriod = 50;
boardConfiguration->useLcdScreen = true;
boardConfiguration->boardTestModeJumperPin = GPIOB_0;

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

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Mon Aug 31 13:06:32 EDT 2015
// this section was generated by config_definition.jar on Tue Sep 15 20:29:10 EDT 2015
// begin
#include "rusefi_types.h"
typedef struct {
@ -562,6 +562,9 @@ typedef struct {
/**
offset 384 bit 11 */
bool_t useTpicAdvancedMode : 1;
/**
offset 384 bit 12 */
bool_t useLcdScreen : 1;
/**
* offset 388
*/
@ -1500,4 +1503,4 @@ typedef struct {
} persistent_config_s;
// end
// this section was generated by config_definition.jar on Mon Aug 31 13:06:32 EDT 2015
// this section was generated by config_definition.jar on Tue Sep 15 20:29:10 EDT 2015

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

@ -359,6 +359,7 @@
#define useStepperIdle_offset 1008
#define enabledStep1Limiter_offset 1008
#define useTpicAdvancedMode_offset 1008
#define useLcdScreen_offset 1008
#define logicAnalyzerPins1_offset 1012
#define logicAnalyzerPins2_offset 1016
#define logicAnalyzerPins3_offset 1020

1
firmware/integration/rusefi_config.txt
View File

@ -411,6 +411,7 @@ bit is_enabled_spi_2
bit enabledStep1Limiter;
bit useTpicAdvancedMode;
bit useLcdScreen;
brain_input_pin_e[LOGIC_ANALYZER_CHANNEL_COUNT iterate] logicAnalyzerPins;
uint8_t[LOGIC_ANALYZER_CHANNEL_COUNT] logicAnalyzerMode;default or inverted input

3
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 Sun Sep 13 16:57:36 EDT 2015
; this section was generated by ConfigDefinition.jar on Tue Sep 15 20:29:15 EDT 2015
pageSize = 15288
page = 1
@ -258,6 +258,7 @@ page = 1
useStepperIdle = bits, U32, 1008, [9:9], "false", "true"
enabledStep1Limiter = bits, U32, 1008, [10:10], "false", "true"
useTpicAdvancedMode = bits, U32, 1008, [11:11], "false", "true"
useLcdScreen = bits, U32, 1008, [12:12], "false", "true"
logicAnalyzerPins1 = bits, U32, 1012, [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"
logicAnalyzerPins2 = bits, U32, 1016, [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"
logicAnalyzerPins3 = bits, U32, 1020, [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"

3
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 Sun Sep 13 16:57:36 EDT 2015
// this file was generated automatically by ConfigDefinition.jar Tue Sep 15 20:29:15 EDT 2015
public class Fields {
public static final Field ENGINETYPE = new Field("ENGINETYPE", 0, FieldType.INT);
public static final Field HEADERMAGICVALUE = new Field("HEADERMAGICVALUE", 4, FieldType.INT);
@ -214,6 +214,7 @@ public class Fields {
public static final Field USESTEPPERIDLE = new Field("USESTEPPERIDLE", 1008, FieldType.BIT, 9);
public static final Field ENABLEDSTEP1LIMITER = new Field("ENABLEDSTEP1LIMITER", 1008, FieldType.BIT, 10);
public static final Field USETPICADVANCEDMODE = new Field("USETPICADVANCEDMODE", 1008, FieldType.BIT, 11);
public static final Field USELCDSCREEN = new Field("USELCDSCREEN", 1008, FieldType.BIT, 12);
public static final Field LOGICANALYZERPINS1 = new Field("LOGICANALYZERPINS1", 1012, FieldType.INT, brain_input_pin_e);
public static final Field LOGICANALYZERPINS2 = new Field("LOGICANALYZERPINS2", 1016, FieldType.INT, brain_input_pin_e);
public static final Field LOGICANALYZERPINS3 = new Field("LOGICANALYZERPINS3", 1020, FieldType.INT, brain_input_pin_e);

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see com.rusefi.StartupFrame
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20150912;
public static final int CONSOLE_VERSION = 20150915;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";

1
java_console/ui/src/com/rusefi/ui/SettingsTab.java
View File

@ -36,6 +36,7 @@ public class SettingsTab {
panel.add(UiUtils.wrap(new EnumConfigField(Fields.INJECTIONPINS1, "injector #1").getContent()));
panel.add(UiUtils.wrap(new BitConfigField(Fields.ISSDCARDENABLED, "SD card enabled").getContent()));
panel.add(UiUtils.wrap(new BitConfigField(Fields.USELCDSCREEN, "Use LCD").getContent()));
panel.add(UiUtils.wrap(new EnumConfigField(Fields.HIP9011INTHOLDPIN, "int/hold pin").getContent()));
panel.add(UiUtils.wrap(new EnumConfigField(Fields.HIP9011INTHOLDPINMODE, "int/hold pin mode").getContent()));