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

auto-sync

This commit is contained in:
rusEfi 2016-01-22 22:01:59 -05:00
parent bbdb5469d3
commit 9fbb25a987
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,7 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 14 23:21:45 EST 2016 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jan 22 21:25:54 EST 2016
// begin // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
/** /**
@ -1613,4 +1611,4 @@ typedef struct {
#endif #endif
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 14 23:21:45 EST 2016 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jan 22 21:25:54 EST 2016

11
firmware/integration/rusefi.xml
View File

@ -132,7 +132,16 @@
<scaling units="Volts" expression="x" to_byte="x" format="0.00" <scaling units="Volts" expression="x" to_byte="x" format="0.00"
fineincrement=".01" coarseincrement="0.1"/> fineincrement=".01" coarseincrement="0.1"/>
<table type="X Axis" storageaddress="@@knockNoiseRpmBins_offset_hex@@" storagetype="float" endian="big"> <table type="X Axis" storageaddress="@@knockNoiseRpmBins_offset_hex@@" storagetype="float" endian="big">
<scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/> <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
<table type="2D" name="Injector Lag" storageaddress="@@injector_battLagCorr_offset_hex@@"
sizex="@@VBAT_INJECTOR_CURVE_SIZE@@" storagetype="float" endian="big">
<scaling units="ms" expression="x" to_byte="x" format="0.00"
fineincrement=".01" coarseincrement="0.1"/>
<table type="X Axis" storageaddress="@@injector_battLagCorrBins_offset_hex@@" storagetype="float" endian="big">
<scaling units="Volts" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table> </table>
</table> </table>

11
java_console/rusefi.xml
View File

@ -132,7 +132,16 @@
<scaling units="Volts" expression="x" to_byte="x" format="0.00" <scaling units="Volts" expression="x" to_byte="x" format="0.00"
fineincrement=".01" coarseincrement="0.1"/> fineincrement=".01" coarseincrement="0.1"/>
<table type="X Axis" storageaddress="7c0" storagetype="float" endian="big"> <table type="X Axis" storageaddress="7c0" storagetype="float" endian="big">
<scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/> <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
<table type="2D" name="Injector Lag" storageaddress="30"
sizex="8" storagetype="float" endian="big">
<scaling units="ms" expression="x" to_byte="x" format="0.00"
fineincrement=".01" coarseincrement="0.1"/>
<table type="X Axis" storageaddress="10" storagetype="float" endian="big">
<scaling units="Volts" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table> </table>
</table> </table>

5
win32_functional_tests/simulator/boards.cpp
View File

@ -48,6 +48,10 @@ static void setMapVoltage(float voltage) {
setVoltage(engineConfiguration->map.sensor.hwChannel, voltage); setVoltage(engineConfiguration->map.sensor.hwChannel, voltage);
} }
static void setVBattVoltage(float voltage) {
setVoltage(engineConfiguration->vbattAdcChannel, voltage);
}
void initFakeBoard(void) { void initFakeBoard(void) {
addConsoleActionF("set_mock_clt_voltage", setCltVoltage); addConsoleActionF("set_mock_clt_voltage", setCltVoltage);
@ -56,6 +60,7 @@ void initFakeBoard(void) {
addConsoleActionF("set_mock_afr_voltage", setAfrVoltage); addConsoleActionF("set_mock_afr_voltage", setAfrVoltage);
addConsoleActionF("set_mock_tps_voltage", setTpsVoltage); addConsoleActionF("set_mock_tps_voltage", setTpsVoltage);
addConsoleActionF("set_mock_map_voltage", setMapVoltage); addConsoleActionF("set_mock_map_voltage", setMapVoltage);
addConsoleActionF("set_mock_vbatt_voltage", setVBattVoltage);
} }