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

evil manual merge of https://github.com/DonaldBecker/rusefi

This commit is contained in:
rusefi 2019-11-06 20:33:40 -05:00
parent e474ab461a
commit d2e24cf2e5
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio.cpp
View File

@ -308,6 +308,8 @@ static void handleGetStructContent(ts_channel_s *tsChannel, int structId, int si
static void handleReadFileContent(ts_channel_s *tsChannel, short fileId, short offset, short length) { static void handleReadFileContent(ts_channel_s *tsChannel, short fileId, short offset, short length) {
#if EFI_FILE_LOGGING #if EFI_FILE_LOGGING
readLogFileContent(tsChannel->crcReadBuffer, fileId, offset, length); readLogFileContent(tsChannel->crcReadBuffer, fileId, offset, length);
#else
UNUSED(tsChannel); UNUSED(fileId); UNUSED(offset); UNUSED(length);
#endif /* EFI_FILE_LOGGING */ #endif /* EFI_FILE_LOGGING */
} }

2
firmware/console/eficonsole.cpp
View File

@ -166,6 +166,8 @@ void print(const char *format, ...) {
va_start(ap, format); va_start(ap, format);
chvprintf((BaseSequentialStream*) getConsoleChannel(), format, ap); chvprintf((BaseSequentialStream*) getConsoleChannel(), format, ap);
va_end(ap); va_end(ap);
#else
UNUSED(format);
#endif /* EFI_UART_ECHO_TEST_MODE */ #endif /* EFI_UART_ECHO_TEST_MODE */
} }

7
firmware/controllers/trigger/decoders/trigger_honda.cpp
View File

@ -180,13 +180,6 @@ void configureHondaCbr600(TriggerShape *s) {
addSkippedToothTriggerEvents(T_SECONDARY, s, totalTeethCount, skippedCount, 0.5, 0, 720, addSkippedToothTriggerEvents(T_SECONDARY, s, totalTeethCount, skippedCount, 0.5, 0, 720,
0, 349); 0, 349);
// w = 15
// float w = 720 / 2 / 24;
//s->addEvent720(360 -w, T_SECONDARY, TV_RISE);
//s->addEvent720(350 - 0.1, T_SECONDARY, TV_RISE);
s->addEvent720(350.0f, T_PRIMARY, TV_FALL); s->addEvent720(350.0f, T_PRIMARY, TV_FALL);
s->addEvent720(360.0f, T_PRIMARY, TV_RISE); s->addEvent720(360.0f, T_PRIMARY, TV_RISE);

4
firmware/init/sensor/init_oil_pressure.cpp
View File

@ -4,7 +4,9 @@
#include "global.h" #include "global.h"
#include "functional_sensor.h" #include "functional_sensor.h"
#include "linear_func.h" #include "linear_func.h"
#if defined(EFI_TUNER_STUDIO)
#include "tunerstudio_configuration.h" #include "tunerstudio_configuration.h"
#endif
EXTERN_ENGINE; EXTERN_ENGINE;
@ -31,8 +33,10 @@ void initOilPressure() {
oilpSensorFunc.configure(sensorCfg->v1, val1, sensorCfg->v2, val2, /*minOutput*/ -5, greaterOutput); oilpSensorFunc.configure(sensorCfg->v1, val1, sensorCfg->v2, val2, /*minOutput*/ -5, greaterOutput);
oilpSensor.setFunction(oilpSensorFunc); oilpSensor.setFunction(oilpSensorFunc);
#if defined(EFI_TUNER_STUDIO)
// Tell it to report to its output channel // Tell it to report to its output channel
oilpSensor.setReportingLocation(&tsOutputChannels.oilPressure); oilpSensor.setReportingLocation(&tsOutputChannels.oilPressure);
#endif
// Subscribe the sensor to the ADC // Subscribe the sensor to the ADC
AdcSubscription::SubscribeSensor(oilpSensor, channel); AdcSubscription::SubscribeSensor(oilpSensor, channel);