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

Merge remote-tracking branch 'upstream/master' into reset-overlap

This commit is contained in:
Matthew Kennedy 2020-07-19 13:52:45 -07:00
parent 77294ae542 94635f9f33
commit 428f2fe247
160 changed files with 2132 additions and 626 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build-firmware.yaml vendored
View File

@ -124,7 +124,14 @@ jobs:
- name: Package Bundle
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{matrix.build-target}}
run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{matrix.build-target}} ${{matrix.ini-file}}
- name: Attach console junit results
if: always()
uses: actions/upload-artifact@v2
with:
name: console ${{matrix.build-target}} junit
path: ./java_console/build/*.txt
- name: Upload bundle
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
@ -186,6 +193,13 @@ jobs:
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh default
- name: Attach console junit results
if: always()
uses: actions/upload-artifact@v2
with:
name: console primary junit
path: ./java_console/build/*.txt
- name: Upload primary bundle
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
uses: actions/upload-artifact@v2

11
.github/workflows/build-rusEFI-console.yaml vendored
View File

@ -17,13 +17,20 @@ jobs:
- name: Test Compiler
run: javac -version
- name: Install Tools
run: sudo apt-get install ncftp
- name: Build console
working-directory: ./java_console
run: ant
run: ant server_jar
- name: Upload console junit results
- name: Attach console junit results
if: always()
uses: actions/upload-artifact@v2
with:
name: console junit
path: ./java_console/build/*.txt
- name: Upload rusEFI server
working-directory: ./java_console
run: ./upload_server.sh ${{ secrets.RUSEFI_BUILD_FTP_USER }} ${{ secrets.RUSEFI_BUILD_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}

2
.github/workflows/build-tsplugin-body.yaml vendored
View File

@ -26,4 +26,4 @@ jobs:
- name: Upload plugin body
working-directory: ./java_tools/ts_plugin
run: ./upload.sh ${{ secrets.RUSEFI_BUILD_FTP_USER }} ${{ secrets.RUSEFI_BUILD_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
run: ./upload_plugin.sh ${{ secrets.RUSEFI_BUILD_FTP_USER }} ${{ secrets.RUSEFI_BUILD_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}

9
android/app/src/main/java/com/rusefi/app/AndroidSerial.java
View File

@ -34,7 +34,12 @@ public class AndroidSerial implements IoStream {
public AndroidSerial(UsbSerialPort usbSerialPort, Logger logger) {
this.usbSerialPort = usbSerialPort;
dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger);
dataBuffer = IncomingDataBuffer.createDataBuffer("", this, logger);
}
@Override
public String getLoggingPrefix() {
return "";
}
@Override
@ -45,7 +50,7 @@ public class AndroidSerial implements IoStream {
@Override
public void setInputListener(DataListener listener) {
ByteReader reader = buffer -> usbSerialPort.read(buffer, 5000);
ByteReader.runReaderLoop(listener, reader, Logger.CONSOLE);
ByteReader.runReaderLoop("", listener, reader, Logger.CONSOLE);
}
@Override

3
android/dependencies.gradle
View File

@ -1,4 +1,5 @@
ext.libs = [
junit : "junit:junit:4.13",
annotations: "org.jetbrains:annotations:16.0.1"
annotations: "org.jetbrains:annotations:16.0.1",
javaxJson : "javax.json:javax.json-api:1.1.4"
]

4
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 15 01:37:11 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 19 16:19:41 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -3530,4 +3530,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s;
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 15 01:37:11 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 19 16:19:41 UTC 2020

6
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -1075,8 +1075,8 @@
#define showHumanReadableWarning_offset 976
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 716980676
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 1773501990
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332
@ -1344,7 +1344,7 @@
#define ts_show_spi true
#define ts_show_trigger_comparator true
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.07.15.kin.716980676"
#define TS_SIGNATURE "rusEFI 2020.07.19.kin.1773501990"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define tunerStudioSerialSpeed_offset 728
#define twoWireBatchIgnition_offset 1476

2
firmware/controllers/date_stamp.h
View File

@ -1,2 +1,2 @@
#pragma once
#define VCS_DATE 20200715
#define VCS_DATE 20200719

43
firmware/controllers/engine_cycle/main_trigger_callback.cpp
View File

@ -24,6 +24,10 @@
#include "global.h"
#include "os_access.h"
#if EFI_PRINTF_FUEL_DETAILS
bool printFuelDebug = false;
#endif // EFI_PRINTF_FUEL_DETAILS
#if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
#include "main_trigger_callback.h"
@ -105,12 +109,6 @@ void InjectorOutputPin::open() {
printf("overlapping, no need to touch pin %s %d\r\n", name, (int)getTimeNowUs());
#endif /* FUEL_MATH_EXTREME_LOGGING */
} else {
#if FUEL_MATH_EXTREME_LOGGING
const char * w = currentLogicValue == true ? "err" : "";
// scheduleMsg(&sharedLogger, "^ %spin=%s eventIndex %d %d", w, output->name,
// getRevolutionCounter(), getTimeNowUs());
#endif /* FUEL_MATH_EXTREME_LOGGING */
setHigh();
}
}
@ -139,7 +137,7 @@ void InjectorOutputPin::close() {
overlappingCounter--;
if (overlappingCounter > 0) {
#if FUEL_MATH_EXTREME_LOGGING
printf("was overlapping, no need to touch pin %s %d\r\n", name, (int)getTimeNowUs());
printf("was overlapping, no need to touch pin %s %d\r\n", name, (int)getTimeNowUs());
#endif /* FUEL_MATH_EXTREME_LOGGING */
} else {
setLow();
@ -161,7 +159,7 @@ void turnInjectionPinLow(InjectionEvent *event) {
event->isScheduled = false;
for (int i = 0;i<MAX_WIRES_COUNT;i++) {
InjectorOutputPin *output = event->outputs[i];
if (output != NULL) {
if (output) {
output->close();
}
}
@ -172,6 +170,7 @@ void turnInjectionPinLow(InjectionEvent *event) {
ENGINE(injectionEvents.addFuelEventsForCylinder(event->ownIndex PASS_ENGINE_PARAMETER_SUFFIX));
}
// todo: rename to 'scheduleInjectorOpenAndClose'?
void handleFuelInjectionEvent(int injEventIndex, InjectionEvent *event,
int rpm, efitick_t nowNt DECLARE_ENGINE_PARAMETER_SUFFIX) {
@ -184,7 +183,12 @@ void handleFuelInjectionEvent(int injEventIndex, InjectionEvent *event,
size_t injectorIndex = event->outputs[0]->injectorIndex;
const floatms_t injectionDuration = ENGINE(wallFuel[injectorIndex]).adjust(ENGINE(injectionDuration) PASS_ENGINE_PARAMETER_SUFFIX);
#if EFI_PRINTF_FUEL_DETAILS
printf("fuel injectionDuration=%.2f adjusted=%.2f\t\n", ENGINE(injectionDuration), injectionDuration);
if (printFuelDebug) {
printf("fuel index=%d injectionDuration=%.2fms adjusted=%.2fms\n",
injEventIndex,
ENGINE(injectionDuration),
injectionDuration);
}
#endif /*EFI_PRINTF_FUEL_DETAILS */
bool isCranking = ENGINE(rpmCalculator).isCranking(PASS_ENGINE_PARAMETER_SIGNATURE);
@ -229,21 +233,26 @@ void handleFuelInjectionEvent(int injEventIndex, InjectionEvent *event,
if (prevOutputName == outputName
&& engineConfiguration->injectionMode != IM_SIMULTANEOUS
&& engineConfiguration->injectionMode != IM_SINGLE_POINT) {
warning(CUSTOM_OBD_SKIPPED_FUEL, "looks like skipped fuel event %d %s", getRevolutionCounter(), outputName);
warning(CUSTOM_OBD_SKIPPED_FUEL, "looks like skipped fuel event revCounter=%d %s", getRevolutionCounter(), outputName);
}
prevOutputName = outputName;
}
#if EFI_UNIT_TEST || EFI_SIMULATOR || EFI_PRINTF_FUEL_DETAILS
InjectorOutputPin *output = event->outputs[0];
printf("fuelout %s duration %d total=%d\t\n", output->name, (int)durationUs,
(int)MS2US(getCrankshaftRevolutionTimeMs(GET_RPM_VALUE)));
#if EFI_PRINTF_FUEL_DETAILS
if (printFuelDebug) {
InjectorOutputPin *output = event->outputs[0];
printf("handleFuelInjectionEvent fuelout %s injection_duration %dus engineCycleDuration=%.1fms\t\n", output->name, (int)durationUs,
(int)MS2US(getCrankshaftRevolutionTimeMs(GET_RPM_VALUE)) / 1000.0);
}
#endif /*EFI_PRINTF_FUEL_DETAILS */
if (event->isScheduled) {
#if EFI_UNIT_TEST || EFI_SIMULATOR
printf("still used1 %s %d\r\n", output->name, (int)getTimeNowUs());
#endif /* EFI_UNIT_TEST || EFI_SIMULATOR */
#if EFI_PRINTF_FUEL_DETAILS
if (printFuelDebug) {
InjectorOutputPin *output = event->outputs[0];
printf("handleFuelInjectionEvent still used %s now=%.1fms\r\n", output->name, (int)getTimeNowUs() / 1000.0);
}
#endif /*EFI_PRINTF_FUEL_DETAILS */
return; // this InjectionEvent is still needed for an extremely long injection scheduled previously
}

4
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:00 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:31 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -3530,4 +3530,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s;
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:00 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:31 UTC 2020

2
firmware/controllers/generated/fsio_enums_generated.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:31 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000,

2
firmware/controllers/generated/fsio_getters.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:31 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

2
firmware/controllers/generated/fsio_names.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:31 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");

2
firmware/controllers/generated/fsio_strings.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:31 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

6
firmware/controllers/generated/rusefi_generated.h
View File

@ -1075,8 +1075,8 @@
#define showHumanReadableWarning_offset 976
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 3884096862
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 2760614588
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332
@ -1344,7 +1344,7 @@
#define ts_show_spi true
#define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.07.15.all.3884096862"
#define TS_SIGNATURE "rusEFI 2020.07.19.all.2760614588"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define tunerStudioSerialSpeed_offset 728
#define twoWireBatchIgnition_offset 1476

6
firmware/controllers/generated/signature_all.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 3884096862
#define TS_SIGNATURE "rusEFI 2020.07.15.all.3884096862"
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 2760614588
#define TS_SIGNATURE "rusEFI 2020.07.19.all.2760614588"

6
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 956690877
#define TS_SIGNATURE "rusEFI 2020.07.15.frankenso_na6.956690877"
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 2047659615
#define TS_SIGNATURE "rusEFI 2020.07.19.frankenso_na6.2047659615"

6
firmware/controllers/generated/signature_kin.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 716980676
#define TS_SIGNATURE "rusEFI 2020.07.15.kin.716980676"
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 1773501990
#define TS_SIGNATURE "rusEFI 2020.07.19.kin.1773501990"

6
firmware/controllers/generated/signature_mre_f4.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 2927381456
#define TS_SIGNATURE "rusEFI 2020.07.15.mre_f4.2927381456"
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 3983897650
#define TS_SIGNATURE "rusEFI 2020.07.19.mre_f4.3983897650"

6
firmware/controllers/generated/signature_mre_f7.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 2927381456
#define TS_SIGNATURE "rusEFI 2020.07.15.mre_f7.2927381456"
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 3983897650
#define TS_SIGNATURE "rusEFI 2020.07.19.mre_f7.3983897650"

6
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 312362458
#define TS_SIGNATURE "rusEFI 2020.07.15.prometheus_405.312362458"
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 1368881720
#define TS_SIGNATURE "rusEFI 2020.07.19.prometheus_405.1368881720"

6
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 312362458
#define TS_SIGNATURE "rusEFI 2020.07.15.prometheus_469.312362458"
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 1368881720
#define TS_SIGNATURE "rusEFI 2020.07.19.prometheus_469.1368881720"

6
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 1779690641
#define TS_SIGNATURE "rusEFI 2020.07.15.proteus_f4.1779690641"
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 689623923
#define TS_SIGNATURE "rusEFI 2020.07.19.proteus_f4.689623923"

6
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.07.15
#define SIGNATURE_HASH 1779690641
#define TS_SIGNATURE "rusEFI 2020.07.15.proteus_f7.1779690641"
#define SIGNATURE_DATE 2020.07.19
#define SIGNATURE_HASH 689623923
#define TS_SIGNATURE "rusEFI 2020.07.19.proteus_f7.689623923"

2
firmware/controllers/math/speed_density.cpp
View File

@ -155,7 +155,7 @@ AirmassResult getSpeedDensityAirmass(float map DECLARE_ENGINE_PARAMETER_SUFFIX)
return {};
}
#if EFI_PRINTF_FUEL_DETAILS
printf("map=%.2f adjustedMap=%.2f airMass=%.2f\t\n",
printf("getSpeedDensityAirmass map=%.2f adjustedMap=%.2f airMass=%.2f\t\n",
map, adjustedMap, engine->engineState.sd.adjustedManifoldAirPressure);
#endif /*EFI_PRINTF_FUEL_DETAILS */

15
firmware/controllers/system/timer/signal_executor_sleep.cpp
View File

@ -31,6 +31,10 @@
#include "efi_gpio.h"
#endif /* EFI_SIMULATOR */
#if EFI_PRINTF_FUEL_DETAILS
bool printSchedulerDebug = true;
#endif // EFI_PRINTF_FUEL_DETAILS
#if EFI_SIGNAL_EXECUTOR_SLEEP
void SleepExecutor::scheduleByTimestamp(scheduling_s *scheduling, efitimeus_t timeUs, action_s action) {
@ -43,14 +47,15 @@ void SleepExecutor::scheduleByTimestampNt(scheduling_s* scheduling, efitick_t ti
static void timerCallback(scheduling_s *scheduling) {
#if EFI_PRINTF_FUEL_DETAILS
if (scheduling->action.getCallback() == (schfunc_t)&turnInjectionPinLow) {
printf("executing cb=turnInjectionPinLow p=%d sch=%d now=%d\r\n", (int)scheduling->action.getArgument(), (int)scheduling,
if (printSchedulerDebug) {
if (scheduling->action.getCallback() == (schfunc_t)&turnInjectionPinLow) {
printf("executing cb=turnInjectionPinLow p=%d sch=%d now=%d\r\n", (int)scheduling->action.getArgument(), (int)scheduling,
(int)getTimeNowUs());
} else {
} else {
// printf("exec cb=%d p=%d\r\n", (int)scheduling->callback, (int)scheduling->param);
}
}
#endif /* EFI_SIMULATOR */
#endif // EFI_PRINTF_FUEL_DETAILS
scheduling->action.execute();
}

25
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -108,6 +108,7 @@ EXTERN_ENGINE;
#if ! EFI_PROD_CODE
bool printTriggerDebug = false;
bool printTriggerTrace = false;
float actualSynchGap;
#endif /* ! EFI_PROD_CODE */
@ -281,7 +282,7 @@ static trigger_value_e eventType[6] = { TV_FALL, TV_RISE, TV_FALL, TV_RISE, TV_F
(isFirstEvent ? 0 : (nowNt) - toothed_previous_time)
#if EFI_UNIT_TEST
#define PRINT_INC_INDEX if (printTriggerDebug) {\
#define PRINT_INC_INDEX if (printTriggerTrace) {\
printf("nextTriggerEvent index=%d\r\n", currentCycle.current_index); \
}
#else
@ -430,7 +431,7 @@ void TriggerState::decodeTriggerEvent(TriggerWaveform *triggerShape, const Trigg
if (needToSkipFall(type) || needToSkipRise(type) || (!considerEventForGap())) {
#if EFI_UNIT_TEST
if (printTriggerDebug) {
if (printTriggerTrace) {
printf("%s isLessImportant %s now=%d index=%d\r\n",
getTrigger_type_e(engineConfiguration->trigger.type),
getTrigger_event_e(signal),
@ -447,7 +448,7 @@ void TriggerState::decodeTriggerEvent(TriggerWaveform *triggerShape, const Trigg
} else {
#if EFI_UNIT_TEST
if (printTriggerDebug) {
if (printTriggerTrace) {
printf("%s event %s %d\r\n",
getTrigger_type_e(engineConfiguration->trigger.type),
getTrigger_event_e(signal),
@ -462,8 +463,8 @@ void TriggerState::decodeTriggerEvent(TriggerWaveform *triggerShape, const Trigg
// scheduleMsg(&logger, "from %.2f to %.2f %d %d", triggerConfig->syncRatioFrom, triggerConfig->syncRatioTo, toothDurations[0], shaftPositionState->toothDurations[1]);
// scheduleMsg(&logger, "ratio %.2f", 1.0 * toothDurations[0]/ shaftPositionState->toothDurations[1]);
#else
if (printTriggerDebug) {
printf("ratio %.2f: current=%d previous=%d\r\n", 1.0 * toothDurations[0] / toothDurations[1],
if (printTriggerTrace) {
printf("decodeTriggerEvent ratio %.2f: current=%d previous=%d\r\n", 1.0 * toothDurations[0] / toothDurations[1],
toothDurations[0], toothDurations[1]);
}
#endif
@ -559,7 +560,7 @@ void TriggerState::decodeTriggerEvent(TriggerWaveform *triggerShape, const Trigg
}
}
#else
if (printTriggerDebug) {
if (printTriggerTrace) {
float gap = 1.0 * toothDurations[0] / toothDurations[1];
for (int i = 0;i<GAP_TRACKING_LENGTH;i++) {
float gap = 1.0 * toothDurations[i] / toothDurations[i + 1];
@ -585,8 +586,8 @@ void TriggerState::decodeTriggerEvent(TriggerWaveform *triggerShape, const Trigg
*/
#if EFI_UNIT_TEST
if (printTriggerDebug) {
printf("sync=%d index=%d size=%d\r\n",
if (printTriggerTrace) {
printf("decodeTriggerEvent sync=%d index=%d size=%d\r\n",
shaft_is_synchronized,
currentCycle.current_index,
triggerShape->getSize());
@ -598,8 +599,8 @@ void TriggerState::decodeTriggerEvent(TriggerWaveform *triggerShape, const Trigg
isSynchronizationPoint = !shaft_is_synchronized || (currentCycle.current_index >= endOfCycleIndex);
#if EFI_UNIT_TEST
if (printTriggerDebug) {
printf("isSynchronizationPoint=%d index=%d size=%d\r\n",
if (printTriggerTrace) {
printf("decodeTriggerEvent decodeTriggerEvent isSynchronizationPoint=%d index=%d size=%d\r\n",
isSynchronizationPoint,
currentCycle.current_index,
triggerShape->getSize());
@ -609,8 +610,8 @@ void TriggerState::decodeTriggerEvent(TriggerWaveform *triggerShape, const Trigg
}
#if EFI_UNIT_TEST
if (printTriggerDebug) {
printf("%s isSynchronizationPoint=%d index=%d %s\r\n",
if (printTriggerTrace) {
printf("decodeTriggerEvent %s isSynchronizationPoint=%d index=%d %s\r\n",
getTrigger_type_e(engineConfiguration->trigger.type),
isSynchronizationPoint, currentCycle.current_index,
getTrigger_event_e(signal));

2
firmware/controllers/trigger/trigger_simulator.cpp
View File

@ -52,7 +52,7 @@ void TriggerStimulatorHelper::feedSimulatedEvent(const TriggerStateCallback trig
// pin_state_t new3rdWheelState = multiChannelStateSequence->getChannelState(2, stateIndex);
if (printTriggerDebug) {
printf("feedSimulatedEvent: %d>%d primary %d>%d secondary %d>%d\r\n", prevIndex, stateIndex, primaryWheelState, newPrimaryWheelState,
printf("TriggerStimulator: simulatedEvent: %d>%d primary %d>%d secondary %d>%d\r\n", prevIndex, stateIndex, primaryWheelState, newPrimaryWheelState,
secondaryWheelState, newSecondaryWheelState );
}
#endif /* EFI_UNIT_TEST */

2
firmware/integration/rusefi_config.txt
View File

@ -1121,7 +1121,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
output_pin_e dizzySparkOutputPin;+This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin
pin_output_mode_e dizzySparkOutputPinMode;
int crankingIACposition;+This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling.;"percent", 1, 0, -100.0, 100,
int crankingIACposition;+This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling.;"percent", 1, 0, -100.0, 100, 0
float tChargeMinRpmMinTps;;"mult", 1, 0, 0, 3, 4
float tChargeMinRpmMaxTps;;"mult", 1, 0, 0, 3, 4
float tChargeMaxRpmMinTps;;"mult", 1, 0, 0, 3, 4

6
firmware/svnversion.h
View File

@ -1,12 +1,12 @@
// This file was generated by Version2Header
// Sat Jul 11 22:38:12 EDT 2020
// Sun Jul 19 01:43:06 EDT 2020
#ifndef GIT_HASH
#define GIT_HASH "f38365808f8f1e5d579ed6f559acd0ae828d96ab"
#define GIT_HASH "5e39d1ff305f1d5e2fe176e82bf2e1860723af98"
#endif
#ifndef VCS_VERSION
#define VCS_VERSION "24224"
#define VCS_VERSION "24365"
#endif

BIN
firmware/tunerstudio/generated/cache.zip
View File

Binary file not shown.

8
firmware/tunerstudio/generated/rusefi.ini
View File

@ -45,12 +45,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.07.15.all.3884096862"
signature = "rusEFI 2020.07.19.all.2760614588"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.07.15.all.3884096862" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.07.19.all.2760614588" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -88,7 +88,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:00 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:31 UTC 2020
pageSize = 20000
page = 1
@ -854,7 +854,7 @@ page = 1
cj125CsPinMode = bits, U08, 2225, [0:1], "default", "default inverted", "open collector", "open collector inverted"
dizzySparkOutputPin = bits, U08, 2226, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
dizzySparkOutputPinMode = bits, U08, 2227, [0:1], "default", "default inverted", "open collector", "open collector inverted"
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100,
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100, 0
tChargeMinRpmMinTps = scalar, F32, 2232, "mult", 1, 0, 0, 3, 4
tChargeMinRpmMaxTps = scalar, F32, 2236, "mult", 1, 0, 0, 3, 4
tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1, 0, 0, 3, 4

8
firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
View File

@ -45,12 +45,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.07.15.frankenso_na6.956690877"
signature = "rusEFI 2020.07.19.frankenso_na6.2047659615"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.07.15.frankenso_na6.956690877" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.07.19.frankenso_na6.2047659615" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -88,7 +88,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:05 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:35 UTC 2020
pageSize = 20000
page = 1
@ -854,7 +854,7 @@ page = 1
cj125CsPinMode = bits, U08, 2225, [0:1], "default", "default inverted", "open collector", "open collector inverted"
dizzySparkOutputPin = bits, U08, 2226, [0:7], "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","Injector 3Z","Injector 3Y","Injector 3W","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Coil 1H","INVALID","Coil 1F","INVALID","INVALID","INVALID","Injector 2M","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3U","INVALID","Injector 3X","INVALID","Injector 2N","Coil 1O","Coil 1P","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3V","Injector 3S","Injector 3T","Injector 2O","Injector 2P","INVALID","Coil 1L","INVALID","Coil 1I","INVALID","Coil 1M","INVALID","Coil 1G","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","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","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", "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"
dizzySparkOutputPinMode = bits, U08, 2227, [0:1], "default", "default inverted", "open collector", "open collector inverted"
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100,
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100, 0
tChargeMinRpmMinTps = scalar, F32, 2232, "mult", 1, 0, 0, 3, 4
tChargeMinRpmMaxTps = scalar, F32, 2236, "mult", 1, 0, 0, 3, 4
tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1, 0, 0, 3, 4

8
firmware/tunerstudio/generated/rusefi_kinetis.ini
View File

@ -45,12 +45,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.07.15.kin.716980676"
signature = "rusEFI 2020.07.19.kin.1773501990"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.07.15.kin.716980676" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.07.19.kin.1773501990" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -88,7 +88,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 15 01:37:11 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 19 16:19:41 UTC 2020
pageSize = 20000
page = 1
@ -854,7 +854,7 @@ page = 1
cj125CsPinMode = bits, U08, 2225, [0:1], "default", "default inverted", "open collector", "open collector inverted"
dizzySparkOutputPin = bits, U08, 2226, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "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", "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", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
dizzySparkOutputPinMode = bits, U08, 2227, [0:1], "default", "default inverted", "open collector", "open collector inverted"
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100,
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100, 0
tChargeMinRpmMinTps = scalar, F32, 2232, "mult", 1, 0, 0, 3, 4
tChargeMinRpmMaxTps = scalar, F32, 2236, "mult", 1, 0, 0, 3, 4
tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1, 0, 0, 3, 4

8
firmware/tunerstudio/generated/rusefi_mre_f4.ini
View File

@ -45,12 +45,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.07.15.mre_f4.2927381456"
signature = "rusEFI 2020.07.19.mre_f4.3983897650"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.07.15.mre_f4.2927381456" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.07.19.mre_f4.3983897650" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -88,7 +88,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:04 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:34 UTC 2020
pageSize = 20000
page = 1
@ -854,7 +854,7 @@ page = 1
cj125CsPinMode = bits, U08, 2225, [0:1], "default", "default inverted", "open collector", "open collector inverted"
dizzySparkOutputPin = bits, U08, 2226, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV10 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","AUX AV8 reuse","AUX AV9 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV6 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
dizzySparkOutputPinMode = bits, U08, 2227, [0:1], "default", "default inverted", "open collector", "open collector inverted"
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100,
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100, 0
tChargeMinRpmMinTps = scalar, F32, 2232, "mult", 1, 0, 0, 3, 4
tChargeMinRpmMaxTps = scalar, F32, 2236, "mult", 1, 0, 0, 3, 4
tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1, 0, 0, 3, 4

8
firmware/tunerstudio/generated/rusefi_mre_f7.ini
View File

@ -45,12 +45,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.07.15.mre_f7.2927381456"
signature = "rusEFI 2020.07.19.mre_f7.3983897650"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.07.15.mre_f7.2927381456" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.07.19.mre_f7.3983897650" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -88,7 +88,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:03 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:33 UTC 2020
pageSize = 20000
page = 1
@ -854,7 +854,7 @@ page = 1
cj125CsPinMode = bits, U08, 2225, [0:1], "default", "default inverted", "open collector", "open collector inverted"
dizzySparkOutputPin = bits, U08, 2226, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV10 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","AUX AV8 reuse","AUX AV9 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV6 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
dizzySparkOutputPinMode = bits, U08, 2227, [0:1], "default", "default inverted", "open collector", "open collector inverted"
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100,
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100, 0
tChargeMinRpmMinTps = scalar, F32, 2232, "mult", 1, 0, 0, 3, 4
tChargeMinRpmMaxTps = scalar, F32, 2236, "mult", 1, 0, 0, 3, 4
tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1, 0, 0, 3, 4

8
firmware/tunerstudio/generated/rusefi_prometheus_405.ini
View File

@ -45,12 +45,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.07.15.prometheus_405.312362458"
signature = "rusEFI 2020.07.19.prometheus_405.1368881720"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.07.15.prometheus_405.312362458" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.07.19.prometheus_405.1368881720" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -88,7 +88,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:07 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:38 UTC 2020
pageSize = 20000
page = 1
@ -854,7 +854,7 @@ page = 1
cj125CsPinMode = bits, U08, 2225, [0:1], "default", "default inverted", "open collector", "open collector inverted"
dizzySparkOutputPin = bits, U08, 2226, [0:7], "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","Injector 3Z","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","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","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","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", "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"
dizzySparkOutputPinMode = bits, U08, 2227, [0:1], "default", "default inverted", "open collector", "open collector inverted"
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100,
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100, 0
tChargeMinRpmMinTps = scalar, F32, 2232, "mult", 1, 0, 0, 3, 4
tChargeMinRpmMaxTps = scalar, F32, 2236, "mult", 1, 0, 0, 3, 4
tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1, 0, 0, 3, 4

8
firmware/tunerstudio/generated/rusefi_prometheus_469.ini
View File

@ -45,12 +45,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.07.15.prometheus_469.312362458"
signature = "rusEFI 2020.07.19.prometheus_469.1368881720"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.07.15.prometheus_469.312362458" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.07.19.prometheus_469.1368881720" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -88,7 +88,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:06 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:36 UTC 2020
pageSize = 20000
page = 1
@ -854,7 +854,7 @@ page = 1
cj125CsPinMode = bits, U08, 2225, [0:1], "default", "default inverted", "open collector", "open collector inverted"
dizzySparkOutputPin = bits, U08, 2226, [0:7], "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","Injector 3Z","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","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","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","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", "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"
dizzySparkOutputPinMode = bits, U08, 2227, [0:1], "default", "default inverted", "open collector", "open collector inverted"
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100,
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100, 0
tChargeMinRpmMinTps = scalar, F32, 2232, "mult", 1, 0, 0, 3, 4
tChargeMinRpmMaxTps = scalar, F32, 2236, "mult", 1, 0, 0, 3, 4
tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1, 0, 0, 3, 4

8
firmware/tunerstudio/generated/rusefi_proteus_f4.ini
View File

@ -45,12 +45,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.07.15.proteus_f4.1779690641"
signature = "rusEFI 2020.07.19.proteus_f4.689623923"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.07.15.proteus_f4.1779690641" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.07.19.proteus_f4.689623923" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -88,7 +88,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:10 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:40 UTC 2020
pageSize = 20000
page = 1
@ -854,7 +854,7 @@ page = 1
cj125CsPinMode = bits, U08, 2225, [0:1], "default", "default inverted", "open collector", "open collector inverted"
dizzySparkOutputPin = bits, U08, 2226, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","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","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","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","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", "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", "INVALID", "INVALID"
dizzySparkOutputPinMode = bits, U08, 2227, [0:1], "default", "default inverted", "open collector", "open collector inverted"
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100,
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100, 0
tChargeMinRpmMinTps = scalar, F32, 2232, "mult", 1, 0, 0, 3, 4
tChargeMinRpmMaxTps = scalar, F32, 2236, "mult", 1, 0, 0, 3, 4
tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1, 0, 0, 3, 4

8
firmware/tunerstudio/generated/rusefi_proteus_f7.ini
View File

@ -45,12 +45,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.07.15.proteus_f7.1779690641"
signature = "rusEFI 2020.07.19.proteus_f7.689623923"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.07.15.proteus_f7.1779690641" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.07.19.proteus_f7.689623923" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -88,7 +88,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:09 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:39 UTC 2020
pageSize = 20000
page = 1
@ -854,7 +854,7 @@ page = 1
cj125CsPinMode = bits, U08, 2225, [0:1], "default", "default inverted", "open collector", "open collector inverted"
dizzySparkOutputPin = bits, U08, 2226, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","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","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","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","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", "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", "INVALID", "INVALID"
dizzySparkOutputPinMode = bits, U08, 2227, [0:1], "default", "default inverted", "open collector", "open collector inverted"
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100,
crankingIACposition = scalar, S32, 2228, "percent", 1, 0, -100.0, 100, 0
tChargeMinRpmMinTps = scalar, F32, 2232, "mult", 1, 0, 0, 3, 4
tChargeMinRpmMaxTps = scalar, F32, 2236, "mult", 1, 0, 0, 3, 4
tChargeMaxRpmMinTps = scalar, F32, 2240, "mult", 1, 0, 0, 3, 4

21
java_console/.idea/runConfigurations/TuneReadWriteTest_testCompareBinaryToTSTune.xml Normal file
View File

@ -0,0 +1,21 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="TuneReadWriteTest.testCompareBinaryToTSTune" type="JUnit" factoryName="JUnit" nameIsGenerated="true">
<module name="ui" />
<useClassPathOnly />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.rusefi.ui.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.rusefi.ui" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.ui.TuneReadWriteTest" />
<option name="METHOD_NAME" value="testCompareBinaryToTSTune" />
<option name="TEST_OBJECT" value="method" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

21
java_console/.idea/runConfigurations/TuneReadWriteTest_testWriteAndReadTSTune.xml Normal file
View File

@ -0,0 +1,21 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="TuneReadWriteTest.testWriteAndReadTSTune" type="JUnit" factoryName="JUnit" nameIsGenerated="true">
<module name="ui" />
<useClassPathOnly />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.rusefi.ui.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.rusefi.ui" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.ui.TuneReadWriteTest" />
<option name="METHOD_NAME" value="testWriteAndReadTSTune" />
<option name="TEST_OBJECT" value="method" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

3
java_console/autoupdate/src/com/rusefi/autoupdate/Autoupdate.java
View File

@ -12,6 +12,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URLClassLoader;
import java.util.Arrays;
import java.util.Date;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
@ -42,7 +43,7 @@ public class Autoupdate {
private static void startConsole(String[] args) {
try {
// we want to make sure that files are available to write so we use reflection to get lazy class initialization
System.out.println("Running rusEFI console");
System.out.println("Running rusEFI console with " + Arrays.toString(args));
// since we are overriding file we cannot just use static java classpath while launching
URLClassLoader jarClassLoader = AutoupdateUtil.getClassLoaderByJar(RUSEFI_CONSOLE_JAR);

1
java_console/bin/broadcast.sh Executable file
View File

@ -0,0 +1 @@
java -jar console/rusefi_console.jar network_connector

1
java_console/bin/help.sh Normal file
View File

@ -0,0 +1 @@
java -jar console/rusefi_console.jar help

1
java_console/bin/set_auth_token.sh Normal file
View File

@ -0,0 +1 @@
java -jar console/rusefi_console.jar set_auth_token $1

1
java_console/bin/switch_to_dfu.sh Executable file
View File

@ -0,0 +1 @@
java -jar console/rusefi_console.jar reboot_dfu

4
java_console/bin/update_bundle.sh Normal file
View File

@ -0,0 +1,4 @@
#!/bin/bash
cd console
java -jar rusefi_autoupdate.jar version

19
java_console/build.xml
View File

@ -1,6 +1,7 @@
<project default="jar">
<property name="jar_file_folder" value="../java_console_binary"/>
<property name="jar_file" value="${jar_file_folder}/rusefi_console.jar"/>
<property name="server_jar_file" value="${jar_file_folder}/rusefi_server.jar"/>
<property name="lib_list" value="../java_tools/configuration_definition/lib/snakeyaml.jar:lib/json-simple-1.1.1.jar:lib/server/javax.json.jar:lib/server/cactoos.jar:lib/server/takes.jar:lib/json-simple-1.1.1.jar:lib/jaxb-api.jar:lib/httpclient.jar:lib/httpmime.jar:lib/httpcore.jar:lib/jSerialComm.jar:lib/jcip-annotations-1.0.jar:lib/jlatexmath-1.0.6.jar:lib/swing-layout-1.0.jar:lib/jep.jar:lib/log4j.jar:lib/junit.jar:lib/SteelSeries-3.9.30.jar:lib/annotations.jar:lib/miglayout-4.0.jar:lib/surfaceplotter-2.0.1.jar"/>
<target name="clean">
@ -95,6 +96,24 @@
</target>
<target name="server_jar" depends="jar">
<delete file="${server_jar_file}"/>
<echo message="Building ${server_jar_file}"/>
<jar destfile="${server_jar_file}">
<manifest>
<attribute name="Main-Class" value="com.rusefi.Launcher"/>
<attribute name="Built-Date" value="${TODAY}"/>
<attribute name="Signature-Vendor" value="rusEFI LLC"/>
</manifest>
<zipfileset src="${jar_file}" includes="**/*.class"/>
<zipfileset src="lib/server/cactoos.jar" includes="**/*.class"/>
<zipfileset src="lib/server/javax.json.jar" includes="**/*.class"/>
<zipfileset src="lib/server/takes.jar" includes="**/*.class"/>
</jar>
</target>
<target name="jar" depends="compile, autoupdate_jar">
<mkdir dir="build/jar"/>
<delete file="${jar_file}"/>

9
java_console/certificate/readme.md Normal file
View File

@ -0,0 +1,9 @@
Test certificate generated with the following command
``keytool -genkey -keyalg RSA -alias selfsigned -keystore test.jks -storepass password -validity 360 -keysize 2048``
Converted using
keytool -importkeystore -srckeystore test.jks -destkeystore test_pkcs12.jks -deststoretype pkcs12

BIN
java_console/certificate/test.jks Normal file
View File

Binary file not shown.

BIN
java_console/certificate/test_pkcs12.jks Normal file
View File

Binary file not shown.

2
java_console/inifile/src/main/java/com/opensr5/ini/IniFileModel.java
View File

@ -16,7 +16,7 @@ public class IniFileModel {
public static final String INI_FILE_PATH = System.getProperty("ini_file_path", "..");
private static final String SECTION_PAGE = "page";
private static final String FIELD_TYPE_SCALAR = "scalar";
private static final String FIELD_TYPE_STRING = "string";
public static final String FIELD_TYPE_STRING = "string";
private static final String FIELD_TYPE_ARRAY = "array";
private static final String FIELD_TYPE_BITS = "bits";

12
java_console/inifile/src/main/java/com/opensr5/ini/field/ArrayIniField.java
View File

@ -13,13 +13,15 @@ public class ArrayIniField extends IniField {
private final int cols;
private final int rows;
private final double multiplier;
private final String digits;
public ArrayIniField(String name, int offset, FieldType type, int cols, int rows, String unit, double multiplier) {
public ArrayIniField(String name, int offset, FieldType type, int cols, int rows, String unit, double multiplier, String digits) {
super(name, offset);
this.type = type;
this.cols = cols;
this.rows = rows;
this.multiplier = multiplier;
this.digits = digits;
}
public FieldType getType() {
@ -34,6 +36,11 @@ public class ArrayIniField extends IniField {
return rows;
}
@Override
public String getDigits() {
return digits;
}
@Override
public int getSize() {
return type.getStorageSize() * cols * rows;
@ -90,6 +97,7 @@ public class ArrayIniField extends IniField {
int offset = Integer.parseInt(list.get(3));
String size = list.get(4);
String unit = list.get(5);
String digits = list.get(10);
double multiplier = Double.parseDouble(list.get(6));
size = size.replaceAll("[\\]\\[x]", " ").trim();
@ -106,6 +114,6 @@ public class ArrayIniField extends IniField {
throw new IllegalStateException("Unexpected " + size);
}
return new ArrayIniField(name, offset, type, cols, rows, unit, multiplier);
return new ArrayIniField(name, offset, type, cols, rows, unit, multiplier, digits);
}
}

4
java_console/inifile/src/main/java/com/opensr5/ini/field/IniField.java
View File

@ -20,6 +20,10 @@ public abstract class IniField {
return null;
}
public String getDigits() {
return null;
}
public int getOffset() {
return offset;
}

12
java_console/inifile/src/main/java/com/opensr5/ini/field/ScalarIniField.java
View File

@ -13,17 +13,24 @@ import static com.rusefi.config.FieldType.*;
public class ScalarIniField extends IniField {
private final String unit;
private final FieldType type;
private final String digits;
private final double multiplier;
public ScalarIniField(String name, int offset, String unit, FieldType type, double multiplier) {
public ScalarIniField(String name, int offset, String unit, FieldType type, double multiplier, String digits) {
super(name, offset);
this.unit = unit;
this.type = type;
this.digits = digits;
if (multiplier == 0)
throw new IllegalArgumentException("Multiplier should not be zero");
this.multiplier = multiplier;
}
@Override
public String getDigits() {
return digits;
}
@Override
public String getUnits() {
return unit;
@ -86,10 +93,11 @@ public class ScalarIniField extends IniField {
String name = list.get(0);
FieldType type = FieldType.parseTs(list.get(2));
int offset = Integer.parseInt(list.get(3));
String digits = list.get(9);
String unit = list.get(4);
double multiplier = Double.parseDouble(list.get(5));
return new ScalarIniField(name, offset, unit, type, multiplier);
return new ScalarIniField(name, offset, unit, type, multiplier, digits);
}
}

19
java_console/inifile/src/main/java/com/rusefi/config/Field.java
View File

@ -18,6 +18,7 @@ public class Field {
private final String name;
private final int offset;
private final int stringSize;
private final FieldType type;
private final int bitOffset;
private final String[] options;
@ -36,8 +37,13 @@ public class Field {
}
public Field(String name, int offset, FieldType type, int bitOffset, String[] options) {
this(name, offset, 0, type, bitOffset, options);
}
public Field(String name, int offset, int stringSize, FieldType type, int bitOffset, String... options) {
this.name = name;
this.offset = offset;
this.stringSize = stringSize;
this.type = type;
this.bitOffset = bitOffset;
this.options = options;
@ -192,8 +198,21 @@ public class Field {
return field;
}
public static Field create(String name, int offset, int stringSize, FieldType type) {
return new Field(name, offset, stringSize, type, 0);
}
public static Field create(String name, int offset, FieldType type) {
Field field = new Field(name, offset, type);
return field;
}
public String getStringValue(ConfigurationImage image) {
if (type != STRING)
throw new IllegalStateException("Not a string parameter " + name);
ByteBuffer bb = image.getByteBuffer(offset, stringSize);
byte[] bytes = new byte[stringSize];
bb.get(bytes);
return new String(bytes).trim();
}
}

6
java_console/inifile/src/main/java/com/rusefi/config/FieldType.java
View File

@ -11,7 +11,9 @@ public enum FieldType {
UINT16(2),
BIT(/*bits are stored in 4 byte packs */4),
FLOAT(4);
FLOAT(4),
STRING(0);
// todo: this is used for text protocol parsing - constant should be reused between firmware and console
public static final String INT_TYPE_STRING = "int";
@ -70,6 +72,8 @@ public enum FieldType {
}
public int getStorageSize() {
if (this == STRING)
throw new UnsupportedOperationException("storage size is unclear on " + this);
return storageSize;
}
}

8
java_console/inifile/src/main/java/com/rusefi/tune/xml/Bibliography.java
View File

@ -3,6 +3,8 @@ package com.rusefi.tune.xml;
import javax.xml.bind.annotation.XmlAttribute;
public class Bibliography {
private String tuneComment = null;
@XmlAttribute
public String getAuthor() {
return "rusEFI";
@ -10,7 +12,11 @@ public class Bibliography {
@XmlAttribute
public String getTuneComment() {
return "comments";
return tuneComment;
}
public void setTuneComment(String tuneComment) {
this.tuneComment = tuneComment;
}
@XmlAttribute

13
java_console/inifile/src/main/java/com/rusefi/tune/xml/Constant.java
View File

@ -7,14 +7,16 @@ public class Constant {
private String name;
private String units;
private String value;
private String digits;
public Constant() {
}
public Constant(String name, String units, String value) {
public Constant(String name, String units, String value, String digits) {
this.name = name;
this.units = units;
this.value = value;
this.digits = digits;
}
@XmlAttribute
@ -32,6 +34,15 @@ public class Constant {
return value;
}
@XmlAttribute
public String getDigits() {
return digits;
}
public void setDigits(String digits) {
this.digits = digits;
}
public void setName(String name) {
this.name = name;
}

24
java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java
View File

@ -18,7 +18,9 @@ public class Msq {
public List<Page> page = new ArrayList<>();
private final VersionInfo versionInfo;
public final VersionInfo versionInfo;
public Bibliography bibliography = new Bibliography();
public Msq() {
versionInfo = new VersionInfo("rusEFI+2020");
@ -36,7 +38,7 @@ public class Msq {
@NotNull
public static Msq create(int totalConfigSize, String tsSignature) {
Msq tune = new Msq();
tune.versionInfo.setTsSignature(tsSignature);
tune.versionInfo.setSignature(tsSignature);
tune.page.add(new Page(null, null));
tune.page.add(new Page(0, totalConfigSize));
return tune;
@ -65,6 +67,8 @@ public class Msq {
}
public void writeXmlFile(String outputXmlFileName) throws JAXBException, IOException {
Objects.requireNonNull(versionInfo, "versionInfo");
versionInfo.validate();
XmlUtil.writeXml(this, Msq.class, outputXmlFileName);
}
@ -76,17 +80,7 @@ public class Msq {
System.out.println("Msq: No page");
return;
}
page.constant.add(new Constant(field.getName(), field.getUnits(), value));
}
@XmlElement
public Bibliography getBibliography() {
return new Bibliography();
}
@XmlElement
public VersionInfo getVersionInfo() {
return versionInfo;
page.constant.add(new Constant(field.getName(), field.getUnits(), value, field.getDigits()));
}
public Page findPage() {
@ -108,4 +102,8 @@ public class Msq {
public UserComments getUserComments() {
return new UserComments();
}
public VersionInfo getVersionInfo() {
return versionInfo;
}
}

9
java_console/inifile/src/main/java/com/rusefi/tune/xml/Page.java
View File

@ -37,6 +37,15 @@ public class Page {
this.size = size;
}
public Constant findParameter(String name) {
for (Constant parameter : constant) {
if (parameter.getName().equals(name)) {
return parameter;
}
}
return null;
}
@Override
public String toString() {
return "Page{" +

13
java_console/inifile/src/main/java/com/rusefi/tune/xml/VersionInfo.java
View File

@ -1,10 +1,11 @@
package com.rusefi.tune.xml;
import javax.xml.bind.annotation.XmlAttribute;
import java.util.Objects;
public class VersionInfo {
private String firmwareInfo;
private String tsSignature;
private String signature;
public VersionInfo() {
}
@ -30,14 +31,18 @@ public class VersionInfo {
@XmlAttribute
public String getSignature() {
return tsSignature;
return signature;
}
public void setFirmwareInfo(String firmwareInfo) {
this.firmwareInfo = firmwareInfo;
}
public void setTsSignature(String tsSignature) {
this.tsSignature = tsSignature;
public void setSignature(String signature) {
this.signature = signature;
}
public void validate() {
Objects.requireNonNull(signature, "signature");
}
}

4
java_console/inifile/src/main/java/com/rusefi/xml/XmlUtil.java
View File

@ -25,8 +25,10 @@ public class XmlUtil {
System.out.println(xmlWriter.toString());
System.out.println("Writing " + fileName);
marshaller.marshal(instance, new FileWriter(fileName));
FileWriter writer = new FileWriter(fileName);
marshaller.marshal(instance, writer);
System.out.println("Marshalling finished " + fileName);
writer.close();
}
public static <T> T readModel(Class<?> modelClass, String fileName) throws Exception {

1
java_console/io/build.gradle
View File

@ -9,6 +9,7 @@ configurations {
}
dependencies {
implementation libs.javaxJson
implementation project(':inifile')
implementation project(':models')
implementation project(':logging-api')

6
java_console/io/io.iml
View File

@ -10,10 +10,10 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="jcip-annotations" level="project" />
<orderEntry type="library" name="jSerialComm" level="project" />
<orderEntry type="library" exported="" name="jSerialComm" level="project" />
<orderEntry type="module" module-name="logging-api" exported="" />
<orderEntry type="module" module-name="models" />
<orderEntry type="module" module-name="models" exported="" />
<orderEntry type="library" exported="" name="annotations" level="project" />
<orderEntry type="module" module-name="inifile" />
<orderEntry type="module" module-name="inifile" exported="" />
</component>
</module>

8
java_console/io/src/main/java/com/opensr5/io/WriteStream.java
View File

@ -16,6 +16,14 @@ public interface WriteStream {
write(new byte[]{value});
}
default void writeShort(int v) throws IOException {
byte[] array = new byte[2];
array[0] = (byte) ((v >>> 8) & 0xFF);
array[1] = (byte) ((v >>> 0) & 0xFF);
write(array);
}
default void writeInt(int v) throws IOException {
byte[] array = new byte[4];

39
java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -75,11 +75,33 @@ public class BinaryProtocol implements BinaryProtocolCommands {
/**
* Composite logging turns off after 10 seconds of RPM above 300
*/
private boolean needCompositeLogger = true;
private boolean needCompositeLogger;
private boolean isCompositeLoggerEnabled;
private long lastLowRpmTime = System.currentTimeMillis();
private List<StreamFile> compositeLogs = new ArrayList<>();
public static boolean DISABLE_LOCAL_CACHE;
public static String findCommand(byte command) {
switch (command) {
case Fields.TS_CRC_CHECK_COMMAND:
return "CRC_CHECK";
case Fields.TS_BURN_COMMAND:
return "BURN";
case Fields.TS_HELLO_COMMAND:
return "HELLO";
case Fields.TS_READ_COMMAND:
return "READ";
case Fields.TS_GET_FIRMWARE_VERSION:
return "GET_FW_VERSION";
case Fields.TS_CHUNK_WRITE_COMMAND:
return "WRITE_CHUNK";
case Fields.TS_OUTPUT_COMMAND:
return "TS_OUTPUT_COMMAND";
default:
return "command " + (char) + command + "/" + command;
}
}
private void createCompositesIfNeeded() {
if (!compositeLogs.isEmpty())
@ -91,6 +113,10 @@ public class BinaryProtocol implements BinaryProtocolCommands {
));
}
public IoStream getStream() {
return stream;
}
public boolean isClosed;
public CommunicationLoggingListener communicationLoggingListener = CommunicationLoggingListener.VOID;
@ -121,9 +147,10 @@ public class BinaryProtocol implements BinaryProtocolCommands {
incomingData = dataBuffer;
Runtime.getRuntime().addShutdownHook(hook);
needCompositeLogger = linkManager.getCompositeLogicEnabled();
rpmListener = value -> {
if (value <= COMPOSITE_OFF_RPM) {
needCompositeLogger = true;
needCompositeLogger = linkManager.getCompositeLogicEnabled();
lastLowRpmTime = System.currentTimeMillis();
} else if (System.currentTimeMillis() - lastLowRpmTime > HIGH_RPM_DELAY * Timeouts.SECOND) {
logger.info("Time to turn off composite logging");
@ -207,7 +234,7 @@ public class BinaryProtocol implements BinaryProtocolCommands {
public void run() {
while (!isClosed) {
// FileLog.rlog("queue: " + LinkManager.COMMUNICATION_QUEUE.toString());
if (linkManager.COMMUNICATION_QUEUE.isEmpty()) {
if (linkManager.COMMUNICATION_QUEUE.isEmpty() && linkManager.getNeedPullData()) {
linkManager.submit(new Runnable() {
@Override
public void run() {
@ -339,7 +366,7 @@ public class BinaryProtocol implements BinaryProtocolCommands {
if (!checkResponseCode(response, RESPONSE_OK) || response.length != requestSize + 1) {
String code = (response == null || response.length == 0) ? "empty" : "code " + response[0];
String info = response == null ? "NO RESPONSE" : (code + " size " + response.length);
logger.error("readImage: Something is wrong, retrying... " + info);
logger.info("readImage: ERROR UNEXPECTED Something is wrong, retrying... " + info);
continue;
}
@ -360,6 +387,8 @@ public class BinaryProtocol implements BinaryProtocolCommands {
}
private ConfigurationImage getAndValidateLocallyCached() {
if (DISABLE_LOCAL_CACHE)
return null;
ConfigurationImage localCached;
try {
localCached = ConfigurationImageFile.readFromFile(CONFIGURATION_RUSEFI_BINARY);
@ -370,7 +399,7 @@ public class BinaryProtocol implements BinaryProtocolCommands {
if (localCached != null) {
int crcOfLocallyCachedConfiguration = IoHelper.getCrc32(localCached.getContent());
System.out.printf("Local cache CRC %x\n", crcOfLocallyCachedConfiguration);
System.out.printf(CONFIGURATION_RUSEFI_BINARY + " Local cache CRC %x\n", crcOfLocallyCachedConfiguration);
byte packet[] = new byte[7];
packet[0] = COMMAND_CRC_CHECK_COMMAND;

16
java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
View File

@ -22,6 +22,7 @@ import static com.rusefi.binaryprotocol.IoHelper.*;
@ThreadSafe
public class IncomingDataBuffer {
private static final int BUFFER_SIZE = 32768;
private static String loggingPrefix;
/**
* buffer for response bytes from controller
*/
@ -33,7 +34,8 @@ public class IncomingDataBuffer {
this.logger = logger;
}
public static IncomingDataBuffer createDataBuffer(IoStream stream, Logger logger) {
public static IncomingDataBuffer createDataBuffer(String loggingPrefix, IoStream stream, Logger logger) {
IncomingDataBuffer.loggingPrefix = loggingPrefix;
IncomingDataBuffer incomingData = new IncomingDataBuffer(logger);
stream.setInputListener(incomingData::addData);
return incomingData;
@ -49,13 +51,13 @@ public class IncomingDataBuffer {
return null;
int packetSize = swap16(getShort());
logger.trace("Got packet size " + packetSize);
logger.trace( loggingPrefix + "Got packet size " + packetSize);
if (packetSize < 0)
return null;
if (!allowLongResponse && packetSize > Math.max(BinaryProtocolCommands.BLOCKING_FACTOR, Fields.TS_OUTPUT_SIZE) + 10)
return null;
isTimeout = waitForBytes(msg + " body", start, packetSize + 4);
isTimeout = waitForBytes(loggingPrefix + msg + " body", start, packetSize + 4);
if (isTimeout)
return null;
@ -148,28 +150,28 @@ public class IncomingDataBuffer {
}
public byte readByte() throws IOException {
boolean timeout = waitForBytes("readByte", System.currentTimeMillis(), 1);
boolean timeout = waitForBytes(loggingPrefix + "readByte", System.currentTimeMillis(), 1);
if (timeout)
throw new IOException("Timeout in readByte");
return (byte) getByte();
}
public int readInt() throws EOFException {
boolean timeout = waitForBytes("readInt", System.currentTimeMillis(), 4);
boolean timeout = waitForBytes(loggingPrefix + "readInt", System.currentTimeMillis(), 4);
if (timeout)
throw new IllegalStateException("Timeout in readByte");
return swap32(getInt());
}
public short readShort() throws EOFException {
boolean timeout = waitForBytes("readShort", System.currentTimeMillis(), 2);
boolean timeout = waitForBytes(loggingPrefix + "readShort", System.currentTimeMillis(), 2);
if (timeout)
throw new IllegalStateException("Timeout in readShort");
return (short) swap16(getShort());
}
public int read(byte[] packet) {
boolean timeout = waitForBytes("read", System.currentTimeMillis(), packet.length);
boolean timeout = waitForBytes(loggingPrefix + "read", System.currentTimeMillis(), packet.length);
if (timeout)
throw new IllegalStateException("Timeout while waiting " + packet.length);
getData(packet);

4
java_console/io/src/main/java/com/rusefi/io/ByteReader.java
View File

@ -9,7 +9,7 @@ import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
public interface ByteReader {
static void runReaderLoop(DataListener listener, ByteReader reader, Logger logger) {
static void runReaderLoop(String loggingPrefix, DataListener listener, ByteReader reader, Logger logger) {
/**
* Threading of the whole input/output does not look healthy at all!
*
@ -24,7 +24,7 @@ public interface ByteReader {
threadExecutor.execute(() -> {
Thread.currentThread().setName("TCP connector loop");
logger.info("Running TCP connection loop");
logger.info(loggingPrefix + "Running TCP connection loop");
byte inputBuffer[] = new byte[256];
while (true) {

19
java_console/io/src/main/java/com/rusefi/io/IoStream.java
View File

@ -6,6 +6,8 @@ import com.opensr5.io.WriteStream;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.binaryprotocol.IoHelper;
import com.rusefi.io.tcp.BinaryProtocolServer;
import org.jetbrains.annotations.NotNull;
import java.io.EOFException;
import java.io.IOException;
@ -31,6 +33,18 @@ public interface IoStream extends WriteStream {
return r.toString();
}
@NotNull
default BinaryProtocolServer.Packet readPacket() throws IOException {
short length = readShort();
return BinaryProtocolServer.readPromisedBytes(getDataBuffer(), length);
}
default void sendPacket(BinaryProtocolServer.Packet packet) throws IOException {
writeShort(packet.getPacket().length);
write(packet.getPacket());
writeInt(packet.getCrc());
}
default void sendPacket(byte[] plainPacket, Logger logger) throws IOException {
byte[] packet;
if (BinaryProtocol.PLAIN_PROTOCOL) {
@ -38,7 +52,8 @@ public interface IoStream extends WriteStream {
} else {
packet = IoHelper.makeCrc32Packet(plainPacket);
}
logger.info("Sending packet " + printHexBinary(plainPacket));
// todo: verbose mode printHexBinary(plainPacket))
logger.info(getLoggingPrefix() + "Sending packet " + BinaryProtocol.findCommand(plainPacket[0]) + " length=" + plainPacket.length);
write(packet);
}
@ -51,6 +66,8 @@ public interface IoStream extends WriteStream {
void close();
String getLoggingPrefix();
IncomingDataBuffer getDataBuffer();
default short readShort() throws EOFException {

37
java_console/io/src/main/java/com/rusefi/io/LinkManager.java
View File

@ -6,7 +6,6 @@ import com.rusefi.Callable;
import com.rusefi.NamedThreadFactory;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolState;
import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.core.EngineState;
import com.rusefi.io.serial.StreamConnector;
import com.rusefi.io.serial.SerialIoStreamJSerialComm;
@ -14,6 +13,7 @@ import com.rusefi.io.tcp.TcpConnector;
import com.rusefi.io.tcp.TcpIoStream;
import org.jetbrains.annotations.NotNull;
import java.io.Closeable;
import java.net.Socket;
import java.util.Arrays;
import java.util.Objects;
@ -25,7 +25,7 @@ import java.util.concurrent.*;
* @author Andrey Belomutskiy
* 3/3/14
*/
public class LinkManager {
public class LinkManager implements Closeable {
@NotNull
public static LogLevel LOG_LEVEL = LogLevel.INFO;
@ -42,6 +42,8 @@ public class LinkManager {
private LinkConnector connector;
private boolean isStarted;
private boolean compositeLogicEnabled = true;
private boolean needPullData = true;
public LinkManager(Logger logger) {
this.logger = logger;
@ -107,6 +109,24 @@ public class LinkManager {
return commandQueue;
}
public LinkManager setCompositeLogicEnabled(boolean compositeLogicEnabled) {
this.compositeLogicEnabled = compositeLogicEnabled;
return this;
}
public boolean getCompositeLogicEnabled() {
return compositeLogicEnabled;
}
public boolean getNeedPullData() {
return needPullData;
}
public LinkManager setNeedPullData(boolean needPullData) {
this.needPullData = needPullData;
return this;
}
public enum LogLevel {
INFO,
DEBUG,
@ -188,7 +208,7 @@ public class LinkManager {
int portPart = TcpConnector.getTcpPort(port);
String hostname = TcpConnector.getHostname(port);
socket = new Socket(hostname, portPart);
TcpIoStream tcpIoStream = new TcpIoStream(logger, socket);
TcpIoStream tcpIoStream = new TcpIoStream("[start] ", logger, socket);
return tcpIoStream;
} catch (Throwable e) {
@ -201,12 +221,10 @@ public class LinkManager {
setConnector(new StreamConnector(this, port, logger, streamFactory));
isSimulationMode = true;
} else {
Callable<IoStream> ioStreamCallable = () -> SerialIoStreamJSerialComm.openPort(port, logger);
Callable<IoStream> ioStreamCallable1 = new Callable<IoStream>() {
Callable<IoStream> ioStreamCallable = new Callable<IoStream>() {
@Override
public IoStream call() {
IoStream stream = ioStreamCallable.call();
IoStream stream = ((Callable<IoStream>) () -> SerialIoStreamJSerialComm.openPort(port, logger)).call();
if (stream == null) {
// error already reported
return null;
@ -214,7 +232,7 @@ public class LinkManager {
return stream;
}
};
setConnector(new StreamConnector(this, port, logger, ioStreamCallable1));
setConnector(new StreamConnector(this, port, logger, ioStreamCallable));
}
}
@ -246,7 +264,8 @@ public class LinkManager {
connector.restart();
}
public void stop() {
@Override
public void close() {
connector.stop();
}

3
java_console/io/src/main/java/com/rusefi/io/commands/Command.java
View File

@ -1,12 +1,11 @@
package com.rusefi.io.commands;
import com.rusefi.io.IoStream;
import com.rusefi.io.tcp.BinaryProtocolServer;
import java.io.IOException;
public interface Command {
byte getCommand();
void handle(BinaryProtocolServer.Packet packet, IoStream stream) throws IOException;
void handle(IoStream stream) throws IOException;
}

2
java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java
View File

@ -40,7 +40,7 @@ public class HelloCommand implements Command {
}
@Override
public void handle(BinaryProtocolServer.Packet packet, IoStream stream) throws IOException {
public void handle(IoStream stream) throws IOException {
stream.sendPacket((BinaryProtocolServer.TS_OK + tsSignature).getBytes(), logger);
}
}

7
java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStreamJSerialComm.java
View File

@ -28,7 +28,12 @@ public class SerialIoStreamJSerialComm implements IoStream {
this.sp = sp;
this.port = port;
this.logger = logger;
this.dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger);
this.dataBuffer = IncomingDataBuffer.createDataBuffer("[serial] ", this, logger);
}
@Override
public String getLoggingPrefix() {
return "";
}
@Override

60
java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java
View File

@ -1,26 +1,33 @@
package com.rusefi.io.tcp;
import com.opensr5.Logger;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.io.IoStream;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.net.Socket;
import java.util.function.Function;
import static com.rusefi.binaryprotocol.BinaryProtocolCommands.COMMAND_PROTOCOL;
import static com.rusefi.config.generated.Fields.TS_PROTOCOL;
public class BinaryProtocolProxy {
public static void createProxy(IoStream targetEcuSocket, int serverProxyPort) {
public static void createProxy(Logger logger, IoStream targetEcuSocket, int serverProxyPort) {
Function<Socket, Runnable> clientSocketRunnableFactory = new Function<Socket, Runnable>() {
@Override
public Runnable apply(Socket clientSocket) {
return new Runnable() {
@Override
public void run() {
runProxy(targetEcuSocket, clientSocket);
try {
TcpIoStream clientStream = new TcpIoStream("[[proxy]] ", logger, clientSocket);
runProxy(targetEcuSocket, clientStream);
} catch (IOException e) {
e.printStackTrace();
}
}
};
}
@ -28,41 +35,31 @@ public class BinaryProtocolProxy {
BinaryProtocolServer.tcpServerSocket(serverProxyPort, "proxy", clientSocketRunnableFactory, Logger.CONSOLE, null);
}
private static void runProxy(IoStream targetEcu, Socket clientSocket) {
public static void runProxy(IoStream targetEcu, IoStream clientStream) throws IOException {
/*
* Each client socket is running on it's own thread
*/
try {
DataInputStream clientInputStream = new DataInputStream(clientSocket.getInputStream());
DataOutputStream clientOutputStream = new DataOutputStream(clientSocket.getOutputStream());
while (true) {
byte firstByte = clientInputStream.readByte();
if (firstByte == COMMAND_PROTOCOL) {
BinaryProtocolServer.handleProtocolCommand(clientSocket);
continue;
}
proxyClientRequestToController(clientInputStream, firstByte, targetEcu);
proxyControllerResponseToClient(targetEcu, clientOutputStream);
while (true) {
byte firstByte = clientStream.getDataBuffer().readByte();
if (firstByte == COMMAND_PROTOCOL) {
clientStream.write(TS_PROTOCOL.getBytes());
continue;
}
} catch (IOException e) {
e.printStackTrace();
proxyClientRequestToController(clientStream.getDataBuffer(), firstByte, targetEcu);
proxyControllerResponseToClient(targetEcu, clientStream);
}
}
private static void proxyControllerResponseToClient(IoStream targetInputStream, DataOutputStream clientOutputStream) throws IOException {
short length = targetInputStream.readShort();
BinaryProtocolServer.Packet packet = BinaryProtocolServer.readPromisedBytes(targetInputStream.getDataBuffer(), length);
public static void proxyControllerResponseToClient(IoStream targetInputStream, IoStream clientOutputStream) throws IOException {
BinaryProtocolServer.Packet packet = targetInputStream.readPacket();
System.out.println("Relaying controller response length=" + length);
clientOutputStream.writeShort(length);
clientOutputStream.write(packet.getPacket());
clientOutputStream.writeInt(packet.getCrc());
clientOutputStream.flush();
System.out.println("Relaying controller response length=" + packet.getPacket().length);
clientOutputStream.sendPacket(packet);
}
private static void proxyClientRequestToController(DataInputStream in, byte firstByte, IoStream targetOutputStream) throws IOException {
private static void proxyClientRequestToController(IncomingDataBuffer in, byte firstByte, IoStream targetOutputStream) throws IOException {
byte secondByte = in.readByte();
int length = firstByte * 256 + secondByte;
@ -71,11 +68,8 @@ public class BinaryProtocolProxy {
DataInputStream dis = new DataInputStream(new ByteArrayInputStream(packet.getPacket()));
byte command = (byte) dis.read();
System.out.println("Relaying client command" + (char) command + "/" + command + " length=" + length);
// sending proxies packet to controller
targetOutputStream.write(firstByte);
targetOutputStream.write(secondByte);
targetOutputStream.write(packet.getPacket());
targetOutputStream.writeInt(packet.getCrc());
System.out.println("Relaying client command " + BinaryProtocol.findCommand(command));
// sending proxied packet to controller
targetOutputStream.sendPacket(packet);
}
}

75
java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java
View File

@ -3,13 +3,12 @@ package com.rusefi.io.tcp;
import com.opensr5.ConfigurationImage;
import com.opensr5.Logger;
import com.rusefi.Listener;
import com.rusefi.binaryprotocol.BinaryProtocolCommands;
import com.rusefi.binaryprotocol.BinaryProtocolState;
import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.binaryprotocol.IoHelper;
import com.rusefi.binaryprotocol.*;
import com.rusefi.config.generated.Fields;
import com.rusefi.io.IoStream;
import com.rusefi.io.LinkManager;
import com.rusefi.io.commands.HelloCommand;
import com.rusefi.server.rusEFISSLContext;
import java.io.*;
import java.net.ServerSocket;
@ -20,7 +19,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import static com.rusefi.binaryprotocol.IoHelper.swap16;
import static com.rusefi.config.generated.Fields.*;
import static com.rusefi.config.generated.Fields.TS_PROTOCOL;
import static com.rusefi.config.generated.Fields.TS_RESPONSE_BURN_OK;
/**
* This class makes rusEfi console a proxy for other tuning software, this way we can have two tools connected via same
@ -37,6 +37,17 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
public AtomicInteger unknownCommands = new AtomicInteger();
public static final Function<Integer, ServerSocket> SECURE_SOCKET_FACTORY = rusEFISSLContext::getSSLServerSocket;
public static final Function<Integer, ServerSocket> PLAIN_SOCKET_FACTORY = port -> {
try {
return new ServerSocket(port);
} catch (IOException e) {
throw new IllegalStateException("Error binding server socket " + port, e);
}
};
public BinaryProtocolServer(Logger logger) {
this.logger = logger;
}
@ -64,35 +75,28 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
*
* @param port server port to accept connections
* @param threadName
* @param clientSocketRunnableFactory method to invoke on a new thread for each new client connection
* @param socketRunnableFactory method to invoke on a new thread for each new client connection
* @param logger
* @param serverSocketCreationCallback this callback is invoked once we open the server socket
*/
public static void tcpServerSocket(int port, String threadName, Function<Socket, Runnable> clientSocketRunnableFactory, final Logger logger, Listener serverSocketCreationCallback) {
Runnable runnable = new Runnable() {
@SuppressWarnings("InfiniteLoopStatement")
@Override
public void run() {
ServerSocket serverSocket;
try {
serverSocket = new ServerSocket(port, 1);
} catch (IOException e) {
logger.error("Error binding server socket" + e);
return;
}
if (serverSocketCreationCallback != null)
serverSocketCreationCallback.onResult(null);
public static void tcpServerSocket(int port, String threadName, Function<Socket, Runnable> socketRunnableFactory, final Logger logger, Listener serverSocketCreationCallback) {
tcpServerSocket(logger, socketRunnableFactory, port, threadName, serverSocketCreationCallback, PLAIN_SOCKET_FACTORY);
}
try {
while (true) {
// Wait for a connection
final Socket clientSocket = serverSocket.accept();
logger.info("Binary protocol proxy port connection");
new Thread(clientSocketRunnableFactory.apply(clientSocket), "proxy connection").start();
}
} catch (IOException e) {
throw new IllegalStateException(e);
public static void tcpServerSocket(Logger logger, Function<Socket, Runnable> clientSocketRunnableFactory, int port, String threadName, Listener serverSocketCreationCallback, Function<Integer, ServerSocket> nonSecureSocketFunction) {
ServerSocket serverSocket = nonSecureSocketFunction.apply(port);
if (serverSocketCreationCallback != null)
serverSocketCreationCallback.onResult(null);
Runnable runnable = () -> {
try {
while (true) {
// Wait for a connection
final Socket clientSocket = serverSocket.accept();
logger.info("Binary protocol proxy port connection");
new Thread(clientSocketRunnableFactory.apply(clientSocket), "proxy connection").start();
}
} catch (IOException e) {
throw new IllegalStateException(e);
}
};
new Thread(runnable, threadName).start();
@ -100,7 +104,7 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
@SuppressWarnings("InfiniteLoopStatement")
private void runProxy(LinkManager linkManager, Socket clientSocket) throws IOException {
TcpIoStream stream = new TcpIoStream(logger, clientSocket);
TcpIoStream stream = new TcpIoStream("[proxy] ", logger, clientSocket);
IncomingDataBuffer in = stream.getDataBuffer();
@ -126,10 +130,10 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
byte command = payload[0];
System.out.println("Got [" + (char) command + "/" + command + "] command");
System.out.println("Got command " + BinaryProtocol.findCommand(command));
if (command == Fields.TS_HELLO_COMMAND) {
new HelloCommand(logger, Fields.TS_SIGNATURE).handle(packet, stream);
new HelloCommand(logger, Fields.TS_SIGNATURE).handle(stream);
} else if (command == COMMAND_PROTOCOL) {
// System.out.println("Ignoring crc F command");
stream.sendPacket((TS_OK + TS_PROTOCOL).getBytes(), logger);
@ -155,7 +159,7 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
DataInputStream dis = new DataInputStream(new ByteArrayInputStream(payload, 1, payload.length - 1));
int offset = swap16(dis.readShort());
int count = swap16(dis.readShort());
System.out.println("TS_OUTPUT_COMMAND offset=" + offset + "/count=" + count);
logger.info("TS_OUTPUT_COMMAND offset=" + offset + "/count=" + count);
byte[] response = new byte[1 + count];
response[0] = (byte) TS_OK.charAt(0);
@ -171,7 +175,7 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
} else {
unknownCommands.incrementAndGet();
new IllegalStateException().printStackTrace();
logger.info("Error: unknown command " + (char) command + "/" + command);
logger.info("Error: unexpected " + BinaryProtocol.findCommand(command));
}
}
}
@ -207,11 +211,10 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
int crc = in.readInt();
int fromPacket = IoHelper.getCrc32(packet);
if (crc != fromPacket)
throw new IllegalStateException("CRC mismatch " + crc + " vs " + fromPacket);
throw new IllegalStateException("CRC mismatch crc=" + Integer.toString(crc, 16) + " vs packet=" + Integer.toString(fromPacket, 16) + " len=" + packet.length + " data: " + IoStream.printHexBinary(packet));
return new Packet(packet, crc);
}
public interface Handler {
void handle() throws IOException;
}

15
java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java
View File

@ -20,10 +20,16 @@ public class TcpIoStream implements IoStream {
private final InputStream input;
private final OutputStream output;
private final Logger logger;
private final String loggingPrefix;
private boolean isClosed;
private final IncomingDataBuffer dataBuffer;
public TcpIoStream(Logger logger, Socket socket) throws IOException {
this("", logger, socket);
}
public TcpIoStream(String loggingPrefix, Logger logger, Socket socket) throws IOException {
this.loggingPrefix = loggingPrefix;
InputStream input = new BufferedInputStream(socket.getInputStream());
OutputStream output = socket.getOutputStream();
this.logger = logger;
@ -33,7 +39,12 @@ public class TcpIoStream implements IoStream {
throw new NullPointerException("output");
this.output = output;
this.input = input;
this.dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger);
this.dataBuffer = IncomingDataBuffer.createDataBuffer(loggingPrefix, this, logger);
}
@Override
public String getLoggingPrefix() {
return loggingPrefix;
}
@Override
@ -55,7 +66,7 @@ public class TcpIoStream implements IoStream {
@Override
public void setInputListener(final DataListener listener) {
ByteReader.runReaderLoop(listener, input::read, logger);
ByteReader.runReaderLoop(loggingPrefix, listener, input::read, logger);
}
@Override

39
java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerInfo.java → java_console/io/src/main/java/com/rusefi/server/ControllerInfo.java
View File

@ -1,9 +1,9 @@
package com.rusefi.server;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonReader;
import java.io.StringReader;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.util.Objects;
/**
@ -58,25 +58,28 @@ public class ControllerInfo {
}
public static ControllerInfo valueOf(String jsonString) {
JsonReader reader = Json.createReader(new StringReader(jsonString));
JsonObject jsonObject = reader.readObject();
String vehicleName = jsonObject.getString(VEHICLE_NAME);
String engineMake = jsonObject.getString(ENGINE_MAKE);
String engineCode = jsonObject.getString(ENGINE_CODE);
String signature = jsonObject.getString(SIGNATURE);
JSONParser parser = new JSONParser();
JSONObject jsonObject;
try {
jsonObject = (JSONObject) parser.parse(jsonString);
} catch (ParseException e) {
throw new IllegalStateException(e);
}
String vehicleName = (String) jsonObject.get(VEHICLE_NAME);
String engineMake = (String) jsonObject.get(ENGINE_MAKE);
String engineCode = (String) jsonObject.get(ENGINE_CODE);
String signature = (String) jsonObject.get(SIGNATURE);
return new ControllerInfo(vehicleName, engineCode, engineMake, signature);
}
public String toJson() {
JsonObject jsonObject = Json.createObjectBuilder()
.add(ENGINE_MAKE, engineMake)
.add(ENGINE_CODE, engineCode)
.add(VEHICLE_NAME, vehicleName)
.add(SIGNATURE, signature)
.build();
return jsonObject.toString();
JSONObject jsonObject = new JSONObject();
jsonObject.put(ENGINE_MAKE, engineMake);
jsonObject.put(ENGINE_CODE, engineCode);
jsonObject.put(VEHICLE_NAME, vehicleName);
jsonObject.put(SIGNATURE, signature);
return jsonObject.toJSONString();
}
@Override

46
java_tools/proxy_server/src/main/java/com/rusefi/server/SessionDetails.java → java_console/io/src/main/java/com/rusefi/server/SessionDetails.java
View File

@ -1,16 +1,17 @@
package com.rusefi.server;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonReader;
import java.io.StringReader;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.util.Objects;
import java.util.Random;
public class SessionDetails {
public static final String ONE_TIME_TOKEN = "oneTime";
public static final String AUTH_TOKEN = "authToken";
public static final String CONTROLLER = "controller";
private static final String ONE_TIME_TOKEN = "oneTime";
private static final String AUTH_TOKEN = "authToken";
private static final String CONTROLLER = "controller";
private static final String HARDCODED_ONE_TIME_CODE = System.getProperty("ONE_TIME_CODE");
private final ControllerInfo controllerInfo;
@ -26,7 +27,7 @@ public class SessionDetails {
}
public static int createOneTimeCode() {
return new Random().nextInt(60000);
return HARDCODED_ONE_TIME_CODE == null ? new Random().nextInt(100000) : Integer.parseInt(HARDCODED_ONE_TIME_CODE);
}
public int getOneTimeToken() {
@ -42,27 +43,30 @@ public class SessionDetails {
}
public String toJson() {
JsonObject jsonObject = Json.createObjectBuilder()
.add(CONTROLLER, controllerInfo.toJson())
.add(ONE_TIME_TOKEN, oneTimeToken)
.add(AUTH_TOKEN, authToken)
.build();
return jsonObject.toString();
JSONObject jsonObject = new JSONObject();
jsonObject.put(CONTROLLER, controllerInfo.toJson());
jsonObject.put(ONE_TIME_TOKEN, oneTimeToken);
jsonObject.put(AUTH_TOKEN, authToken);
return jsonObject.toJSONString();
}
public static SessionDetails valueOf(String jsonString) {
JsonReader reader = Json.createReader(new StringReader(jsonString));
JSONParser parser = new JSONParser();
JSONObject jsonObject;
try {
jsonObject = (JSONObject) parser.parse(jsonString);
} catch (ParseException e) {
throw new IllegalStateException(e);
}
JsonObject jsonObject = reader.readObject();
String authToken = jsonObject.getString(AUTH_TOKEN);
int oneTimeCode = jsonObject.getInt(ONE_TIME_TOKEN);
String authToken = (String) jsonObject.get(AUTH_TOKEN);
long oneTimeCode = (Long)jsonObject.get(ONE_TIME_TOKEN);
ControllerInfo controllerInfo = ControllerInfo.valueOf(jsonObject.getString(CONTROLLER));
ControllerInfo controllerInfo = ControllerInfo.valueOf((String) jsonObject.get(CONTROLLER));
return new SessionDetails(controllerInfo, authToken, oneTimeCode);
return new SessionDetails(controllerInfo, authToken, (int) oneTimeCode);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;

128
java_console/io/src/main/java/com/rusefi/server/rusEFISSLContext.java Normal file
View File

@ -0,0 +1,128 @@
package com.rusefi.server;
import javax.net.ssl.*;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.ServerSocket;
import java.net.Socket;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.Objects;
public class rusEFISSLContext {
private static final String TLS = "TLS";
// I assume that jenkins own setup is interfering with our attempts to change system properties :(
// also open question to get SSL context adjusted without touching system properties
private static boolean isJenkins = true;//System.getProperty("JENKINS_URL") != null;
// private static KeyStore key;
// todo: one day once rusEFI has a proper commercial certificate this should be removed
private static TrustManager[] trustAllCerts = new TrustManager[]{
new X509TrustManager() {
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return new X509Certificate[0];
}
public void checkClientTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
public void checkServerTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
}
};
public static void init(String fileName, String password) throws MalformedURLException {
// system property setup does not work under Jenkins?
if (!isJenkins)
setupCertificates(new File(fileName), password);
//key = getFromPath(fileName, "PKCS12", password);
}
public static ServerSocket getSSLServerSocket(int port) {
try {
if (isJenkins)
return new ServerSocket(port);
return SSLServerSocketFactory.getDefault().createServerSocket(port);
} catch (IOException e) {
throw new IllegalStateException("Error binding secure server socket " + port, e);
}
// try {
// return getSSLServerSocketFactory(key, TLS).createServerSocket(port);
// } catch (Exception e) {
// throw new IllegalStateException(e);
// }
}
public static Socket getSSLSocket(String host, int port) throws IOException {
if (isJenkins)
return new Socket(host, port);
return getSSLSocketFactory(null /*key*/, TLS).createSocket(host, port);
}
/*
private static SSLServerSocketFactory getSSLServerSocketFactory(KeyStore trustKey, String sslAlgorithm) {
try {
TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmf.init(trustKey);
SSLContext context = SSLContext.getInstance(sslAlgorithm);
context.init(null, tmf.getTrustManagers(), null);
return context.getServerSocketFactory();
} catch (Exception e) {
throw new IllegalStateException(e);
}
}
*/
private static SSLSocketFactory getSSLSocketFactory(KeyStore trustKey, String sslAlgorithm) {
try {
// TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
// tmf.init(trustKey);
SSLContext context = SSLContext.getInstance(sslAlgorithm);
context.init(null, trustAllCerts/*tmf.getTrustManagers()*/, null);
return context.getSocketFactory();
} catch (Exception e) {
throw new IllegalStateException(e);
}
}
public static void setupCertificates(File certificate, String password) throws MalformedURLException {
if (!certificate.exists())
throw new IllegalStateException("Certificate not found " + certificate);
Objects.requireNonNull(password, "password");
String file = certificate.toURI().toURL().getFile();
System.setProperty("javax.net.ssl.keyStore", file);
System.setProperty("javax.net.ssl.keyStorePassword", password);
System.setProperty("javax.net.ssl.trustStore", file);
System.setProperty("javax.net.ssl.trustStorePassword", password);
System.setProperty("javax.net.ssl.keyStoreType", "PKCS12");
}
/*
private static KeyStore getFromPath(String path, String algorithm, String filePassword) {
try {
File f = new File(path);
if (!f.exists())
throw new RuntimeException("File not found: " + path);
FileInputStream keyFile = new FileInputStream(f);
KeyStore keystore = KeyStore.getInstance(algorithm);
keystore.load(keyFile, filePassword.toCharArray());
keyFile.close();
return keystore;
} catch (Exception e) {
throw new IllegalStateException(e);
}
}
*/
}

41
java_console/io/src/main/java/com/rusefi/tools/online/HttpUtil.java Normal file
View File

@ -0,0 +1,41 @@
package com.rusefi.tools.online;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.io.IOException;
public class HttpUtil {
// todo: migrate proxy http json API server to TLS
public static final String RUSEFI_PROXY_JSON_PROTOCOL = "http://";
public static final int HTTP_PORT = 8001;
/**
* hostname of PROXY server, not primary rusEFI web server - those are two separate hosts at the moment
*/
public static String RUSEFI_PROXY_HOSTNAME = System.getProperty("RUSEFI_PROXY_URL", "proxy.rusefi.com");
public static String RUSEFI_ONLINE_JSON_API_PREFIX = "https://rusefi.com/online/api.php?method=";
public static final String RUSEFI_PROXY_JSON_API_PREFIX = RUSEFI_PROXY_JSON_PROTOCOL + RUSEFI_PROXY_HOSTNAME;
public static <T> T getJsonResponse(HttpResponse response) throws IOException, ParseException {
HttpEntity entity = response.getEntity();
String responseString = EntityUtils.toString(entity, "UTF-8");
System.out.println("responseString=" + responseString);
JSONParser parser = new JSONParser();
return (T) parser.parse(responseString);
}
public static HttpResponse executeGet(String url) throws IOException {
HttpClient httpclient = new DefaultHttpClient();
System.out.println("Connecting to " + url);
HttpGet httpget = new HttpGet(url);
return httpclient.execute(httpget);
}
}

27
java_console/io/src/main/java/com/rusefi/tools/online/ProxyClient.java
View File

@ -1,16 +1,10 @@
package com.rusefi.tools.online;
import com.rusefi.server.UserDetails;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
import org.jetbrains.annotations.NotNull;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.io.IOException;
@ -18,23 +12,19 @@ import java.util.ArrayList;
import java.util.List;
public class ProxyClient {
public static final String LOCALHOST = "localhost";
public static final String LIST_PATH = "/list_online";
@NotNull
public static List<UserDetails> getOnlineUsers(int httpPort) throws IOException {
HttpClient httpclient = new DefaultHttpClient();
String url = "http://" + LOCALHOST + ":" + httpPort + LIST_PATH;
System.out.println("Connecting to " + url);
HttpGet httpget = new HttpGet(url);
HttpResponse httpResponse = httpclient.execute(httpget);
return getOnlineUsers(HttpUtil.RUSEFI_PROXY_JSON_API_PREFIX + ":" + httpPort + LIST_PATH);
}
@NotNull
public static List<UserDetails> getOnlineUsers(String url) throws IOException {
HttpResponse httpResponse = HttpUtil.executeGet(url);
HttpEntity entity = httpResponse.getEntity();
String responseString = EntityUtils.toString(entity, "UTF-8");
JSONParser parser = new JSONParser();
List<UserDetails> userLists = new ArrayList<>();
try {
JSONArray array = (JSONArray) parser.parse(responseString);
JSONArray array = HttpUtil.getJsonResponse(httpResponse);
for (int i = 0; i < array.size(); i++) {
JSONObject element = (JSONObject) array.get(i);
@ -44,8 +34,9 @@ public class ProxyClient {
System.out.println("object=" + array);
} catch (ParseException e) {
throw new IllegalStateException(e);
throw new IOException(e);
}
return userLists;
}
}

2
java_console/models/src/main/java/com/rusefi/composite/CompositeParser.java
View File

@ -13,7 +13,7 @@ public class CompositeParser {
public static List<CompositeEvent> parse(byte[] response) {
ByteBuffer byteBuffer = ByteBuffer.wrap(response);
byteBuffer.order(ByteOrder.BIG_ENDIAN);
System.out.println("Got composite " + response.length);
System.out.println("Got composite length=" + response.length);
int ptr = 1;
List<CompositeEvent> events = new ArrayList<>();

48
java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 15 01:37:00 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 19 16:19:31 UTC 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -1303,7 +1303,7 @@ public class Fields {
public static final int TS_RESPONSE_COMMAND_OK = 7;
public static final int TS_RESPONSE_OK = 0;
public static final char TS_SET_LOGGER_SWITCH = 'l';
public static final String TS_SIGNATURE = "rusEFI 2020.07.15.all.3884096862";
public static final String TS_SIGNATURE = "rusEFI 2020.07.19.all.2760614588";
public static final char TS_SINGLE_WRITE_COMMAND = 'W';
public static final int tunerStudioSerialSpeed_offset = 728;
public static final int twoWireBatchIgnition_offset = 1476;
@ -1970,9 +1970,9 @@ public class Fields {
public static final Field ETBIO22_DIRECTIONPIN2 = Field.create("ETBIO22_DIRECTIONPIN2", 1093, FieldType.INT8, brain_pin_e);
public static final Field ETBIO22_CONTROLPIN1 = Field.create("ETBIO22_CONTROLPIN1", 1094, FieldType.INT8, brain_pin_e);
public static final Field ETBIO22_DISABLEPIN = Field.create("ETBIO22_DISABLEPIN", 1095, FieldType.INT8, brain_pin_e);
public static final Field ENGINEMAKE = Field.create("ENGINEMAKE", 1096, FieldType.INT);
public static final Field ENGINECODE = Field.create("ENGINECODE", 1128, FieldType.INT);
public static final Field VEHICLENAME = Field.create("VEHICLENAME", 1160, FieldType.INT);
public static final Field ENGINEMAKE = Field.create("ENGINEMAKE", 1096, 32, FieldType.STRING);
public static final Field ENGINECODE = Field.create("ENGINECODE", 1128, 32, FieldType.STRING);
public static final Field VEHICLENAME = Field.create("VEHICLENAME", 1160, 32, FieldType.STRING);
public static final Field TCU_SOLENOID1 = Field.create("TCU_SOLENOID1", 1192, FieldType.INT8, output_pin_e);
public static final Field TCU_SOLENOID2 = Field.create("TCU_SOLENOID2", 1193, FieldType.INT8, output_pin_e);
public static final Field TCU_SOLENOID3 = Field.create("TCU_SOLENOID3", 1194, FieldType.INT8, output_pin_e);
@ -2394,28 +2394,28 @@ public class Fields {
public static final Field MC33_T_BYPASS = Field.create("MC33_T_BYPASS", 4508, FieldType.INT16);
public static final Field MC33_T_HOLD_OFF = Field.create("MC33_T_HOLD_OFF", 4510, FieldType.INT16);
public static final Field MC33_T_HOLD_TOT = Field.create("MC33_T_HOLD_TOT", 4512, FieldType.INT16);
public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6000, FieldType.INT);
public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6000, 120, FieldType.STRING);
public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6248, FieldType.INT);
public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6328, FieldType.INT);
public static final Field PEDALTOTPSTABLE = Field.create("PEDALTOTPSTABLE", 6400, FieldType.INT);
public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT);
public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT);
public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.INT);
public static final Field FSIOFORMULAS4 = Field.create("FSIOFORMULAS4", 7272, FieldType.INT);
public static final Field FSIOFORMULAS5 = Field.create("FSIOFORMULAS5", 7472, FieldType.INT);
public static final Field FSIOFORMULAS6 = Field.create("FSIOFORMULAS6", 7672, FieldType.INT);
public static final Field FSIOFORMULAS7 = Field.create("FSIOFORMULAS7", 7872, FieldType.INT);
public static final Field FSIOFORMULAS8 = Field.create("FSIOFORMULAS8", 8072, FieldType.INT);
public static final Field FSIOFORMULAS9 = Field.create("FSIOFORMULAS9", 8272, FieldType.INT);
public static final Field FSIOFORMULAS10 = Field.create("FSIOFORMULAS10", 8472, FieldType.INT);
public static final Field FSIOFORMULAS11 = Field.create("FSIOFORMULAS11", 8672, FieldType.INT);
public static final Field FSIOFORMULAS12 = Field.create("FSIOFORMULAS12", 8872, FieldType.INT);
public static final Field FSIOFORMULAS13 = Field.create("FSIOFORMULAS13", 9072, FieldType.INT);
public static final Field FSIOFORMULAS14 = Field.create("FSIOFORMULAS14", 9272, FieldType.INT);
public static final Field FSIOFORMULAS15 = Field.create("FSIOFORMULAS15", 9472, FieldType.INT);
public static final Field FSIOFORMULAS16 = Field.create("FSIOFORMULAS16", 9672, FieldType.INT);
public static final Field TIMINGMULTIPLIER = Field.create("TIMINGMULTIPLIER", 9872, FieldType.INT);
public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 10072, FieldType.INT);
public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, 200, FieldType.STRING);
public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, 200, FieldType.STRING);
public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, 200, FieldType.STRING);
public static final Field FSIOFORMULAS4 = Field.create("FSIOFORMULAS4", 7272, 200, FieldType.STRING);
public static final Field FSIOFORMULAS5 = Field.create("FSIOFORMULAS5", 7472, 200, FieldType.STRING);
public static final Field FSIOFORMULAS6 = Field.create("FSIOFORMULAS6", 7672, 200, FieldType.STRING);
public static final Field FSIOFORMULAS7 = Field.create("FSIOFORMULAS7", 7872, 200, FieldType.STRING);
public static final Field FSIOFORMULAS8 = Field.create("FSIOFORMULAS8", 8072, 200, FieldType.STRING);
public static final Field FSIOFORMULAS9 = Field.create("FSIOFORMULAS9", 8272, 200, FieldType.STRING);
public static final Field FSIOFORMULAS10 = Field.create("FSIOFORMULAS10", 8472, 200, FieldType.STRING);
public static final Field FSIOFORMULAS11 = Field.create("FSIOFORMULAS11", 8672, 200, FieldType.STRING);
public static final Field FSIOFORMULAS12 = Field.create("FSIOFORMULAS12", 8872, 200, FieldType.STRING);
public static final Field FSIOFORMULAS13 = Field.create("FSIOFORMULAS13", 9072, 200, FieldType.STRING);
public static final Field FSIOFORMULAS14 = Field.create("FSIOFORMULAS14", 9272, 200, FieldType.STRING);
public static final Field FSIOFORMULAS15 = Field.create("FSIOFORMULAS15", 9472, 200, FieldType.STRING);
public static final Field FSIOFORMULAS16 = Field.create("FSIOFORMULAS16", 9672, 200, FieldType.STRING);
public static final Field TIMINGMULTIPLIER = Field.create("TIMINGMULTIPLIER", 9872, 200, FieldType.STRING);
public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 10072, 200, FieldType.STRING);
public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 12832, FieldType.INT);
public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 13984, FieldType.INT);
public static final Field FUELTABLE = Field.create("FUELTABLE", 15136, FieldType.INT);

2
java_console/models/src/main/java/com/rusefi/rusEFIVersion.java
View File

@ -3,6 +3,6 @@ package com.rusefi;
import java.util.concurrent.atomic.AtomicReference;
public class rusEFIVersion {
public static final int CONSOLE_VERSION = 20200711;
public static final int CONSOLE_VERSION = 20200717;
public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
}

4
java_console/models/src/main/java/com/rusefi/stream/LogicdataStreamFile.java
View File

@ -40,8 +40,8 @@ public class LogicdataStreamFile extends StreamFile {
private static final long SIGN_FLAG = 0x80000000L;
private static int numChannels = 6;
private static int reservedDurationInSamples = 10;
private static final int numChannels = 6;
private static final int reservedDurationInSamples = 10;
private static int realDurationInSamples = 0;
private static int scaledDurationInSamples = 0;

2
java_console/rusefi.xml
View File

@ -1,6 +1,6 @@
<roms>
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Wed Jul 15 01:37:02 UTC 2020 -->
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sun Jul 19 16:19:32 UTC 2020 -->
<rom>
<romid>

1
java_console/shared_ui/shared_ui.iml
View File

@ -13,5 +13,6 @@
<orderEntry type="library" name="httpclient" level="project" />
<orderEntry type="library" name="json-simple" level="project" />
<orderEntry type="module" module-name="shared_io" />
<orderEntry type="module" module-name="io" />
</component>
</module>

46
java_console/shared_ui/src/com/rusefi/tools/online/Online.java
View File

@ -3,7 +3,6 @@ package com.rusefi.tools.online;
import com.rusefi.shared.FileUtil;
import com.rusefi.tune.xml.Msq;
import com.rusefi.ui.AuthTokenPanel;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
@ -13,10 +12,8 @@ import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.entity.mime.content.StringBody;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import javax.swing.*;
@ -28,28 +25,27 @@ public class Online {
public static final String outputXmlFileName = FileUtil.RUSEFI_SETTINGS_FOLDER + File.separator + "output.msq";
private static final String url = "https://rusefi.com/online/upload.php";
public static UploadResult upload(File fileName, String authTokenValue) throws IOException {
HttpClient httpclient = new DefaultHttpClient();
HttpPost httpPost = new HttpPost(url);
FileBody uploadFilePart = new FileBody(fileName);
MultipartEntity reqEntity = new MultipartEntity();
reqEntity.addPart("upload-file", uploadFilePart);
reqEntity.addPart("rusefi_token", new StringBody(authTokenValue));
httpPost.setEntity(reqEntity);
HttpResponse response = httpclient.execute(httpPost);
System.out.println("response=" + response);
System.out.println("code " + response.getStatusLine().getStatusCode());
HttpEntity entity = response.getEntity();
String responseString = EntityUtils.toString(entity, "UTF-8");
System.out.println("responseString=" + responseString);
JSONParser parser = new JSONParser();
/**
* blocking call for http file upload
*/
public static UploadResult upload(File fileName, String authTokenValue) {
try {
JSONObject object = (JSONObject) parser.parse(responseString);
HttpClient httpclient = new DefaultHttpClient();
HttpPost httpPost = new HttpPost(url);
FileBody uploadFilePart = new FileBody(fileName);
MultipartEntity reqEntity = new MultipartEntity();
reqEntity.addPart("upload-file", uploadFilePart);
reqEntity.addPart("rusefi_token", new StringBody(authTokenValue));
httpPost.setEntity(reqEntity);
HttpResponse response = httpclient.execute(httpPost);
System.out.println("response=" + response);
System.out.println("code " + response.getStatusLine().getStatusCode());
JSONObject object = HttpUtil.getJsonResponse(response);
System.out.println("object=" + object);
JSONArray info = (JSONArray) object.get("info");
JSONArray error = (JSONArray) object.get("error");
@ -61,7 +57,7 @@ public class Online {
return new UploadResult(false, info);
}
} catch (ParseException e) {
} catch (IOException | ParseException e) {
return new UploadResult(true, "Error " + e);
}
}

6
java_console/shared_ui/src/com/rusefi/tools/online/UploadResult.java
View File

@ -21,7 +21,11 @@ public class UploadResult {
return isError;
}
public JSONArray getMessage() {
public JSONArray getMessageArray() {
return message;
}
public String getFirstMessage() {
return message.get(0).toString();
}
}

2
java_console/shared_ui/src/com/rusefi/ui/AuthTokenPanel.java
View File

@ -129,7 +129,7 @@ public class AuthTokenPanel {
}
public boolean hasToken() {
return textField.getText().trim().length() > 0 && !textField.getText().contains(TOKEN_SUBSTRING);
return AutoTokenUtil.isToken(textField.getText());
}
public String getToken() {

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

@ -26,7 +26,7 @@ public class Launcher extends rusEFIVersion {
* @see StartupFrame if no parameters specified
*/
public static void main(final String[] args) throws Exception {
System.out.println("rusEfi UI console " + CONSOLE_VERSION);
System.out.println("rusEFI UI console " + CONSOLE_VERSION);
System.out.println("Compiled " + new Date(ConsoleTools.classBuildTimeMillis()));
System.out.println("\n\n");
PersistentConfiguration.registerShutdownHook();

9
java_console/ui/src/main/java/com/rusefi/sensor_logs/BinarySensorLogRestarter.java
View File

@ -5,10 +5,10 @@ import com.rusefi.Timeouts;
import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral;
import com.rusefi.tools.online.Online;
import com.rusefi.tools.online.UploadResult;
import com.rusefi.ui.AuthTokenPanel;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
@ -57,11 +57,8 @@ public class BinarySensorLogRestarter implements SensorLog {
UPLOAD_EXECUTOR.execute(new Runnable() {
@Override
public void run() {
try {
Online.upload(new File(fileName), AuthTokenPanel.getAuthToken());
} catch (IOException e) {
e.printStackTrace();
}
UploadResult result = Online.upload(new File(fileName), AuthTokenPanel.getAuthToken());
System.out.println(result.toString());
}
});
}

17
java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
View File

@ -21,6 +21,7 @@ import com.rusefi.io.LinkManager;
import com.rusefi.io.serial.SerialIoStreamJSerialComm;
import com.rusefi.io.tcp.BinaryProtocolServer;
import com.rusefi.maintenance.ExecHelper;
import com.rusefi.server.BackendLauncher;
import com.rusefi.tools.online.Online;
import com.rusefi.tune.xml.Msq;
import com.rusefi.ui.AuthTokenPanel;
@ -41,6 +42,7 @@ import static com.rusefi.binaryprotocol.IoHelper.getCrc32;
public class ConsoleTools {
public static final String SET_AUTH_TOKEN = "set_auth_token";
public static final String RUS_EFI_NOT_DETECTED = "rusEFI not detected";
private static Map<String, ConsoleTool> TOOLS = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
private static Map<String, String> toolsHelp = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
@ -60,10 +62,15 @@ public class ConsoleTools {
registerTool("compile_fsio_line", ConsoleTools::invokeCompileExpressionTool, "Convert a line to RPN form.");
registerTool("compile_fsio_file", ConsoleTools::runCompileTool, "Convert all lines from a file to RPN form.");
registerTool("proxy_server", BackendLauncher::start, "NOT A USER TOOL");
registerTool("network_connector", NetworkConnectorStartup::start, "Connect your rusEFI ECU to rusEFI Online");
registerTool("network_authenticator", LocalApplicationProxy::start, "rusEFI Online Authenticator");
registerTool("print_auth_token", args -> printAuthToken(), "Print current rusEFI Online authentication token.");
registerTool(SET_AUTH_TOKEN, ConsoleTools::setAuthToken, "Set rusEFI authentication token.");
registerTool("upload_tune", ConsoleTools::uploadTune, "Upload specified tune file using auth token from settings");
registerTool("version", ConsoleTools::version, "Only print version");
registerTool("lightui", ConsoleTools::lightUI, "Start lightweight GUI for tiny screens");
@ -73,6 +80,10 @@ public class ConsoleTools {
registerTool(Fields.CMD_REBOOT_DFU, args -> sendCommand(Fields.CMD_REBOOT_DFU), "Sends a command to switch rusEFI controller into DFU mode.");
}
private static void version(String[] strings) {
// version is printed by already, all we need is to do nothing
}
public static void main(String[] args) throws Exception {
System.out.println(Arrays.toString(new File(".").list()));
System.setProperty("ini_file_path", "../firmware/tunerstudio");
@ -193,7 +204,7 @@ public class ConsoleTools {
String autoDetectedPort = PortDetector.autoDetectSerial(null);
if (autoDetectedPort == null) {
System.err.println("rusEFI not detected");
System.err.println(RUS_EFI_NOT_DETECTED);
return;
}
LinkManager linkManager = new LinkManager(FileLog.LOGGER);
@ -258,7 +269,7 @@ public class ConsoleTools {
private static String autoDetectPort() {
String autoDetectedPort = PortDetector.autoDetectSerial(null);
if (autoDetectedPort == null) {
System.err.println("rusEFI not detected");
System.err.println(RUS_EFI_NOT_DETECTED);
return null;
}
return autoDetectedPort;
@ -303,7 +314,7 @@ public class ConsoleTools {
static void detect(String[] strings) throws IOException, InterruptedException {
String autoDetectedPort = autoDetectPort();
if (autoDetectedPort == null) {
System.out.println("rusEFI not detected");
System.out.println(RUS_EFI_NOT_DETECTED);
return;
}
IoStream stream = SerialIoStreamJSerialComm.openPort(autoDetectedPort, FileLog.LOGGER);

28
java_console/ui/src/main/java/com/rusefi/tools/NetworkConnectorStartup.java Normal file
View File

@ -0,0 +1,28 @@
package com.rusefi.tools;
import com.rusefi.auth.AutoTokenUtil;
import com.rusefi.autodetect.PortDetector;
import com.rusefi.proxy.NetworkConnector;
import com.rusefi.server.Backend;
import com.rusefi.ui.AuthTokenPanel;
import java.io.IOException;
public class NetworkConnectorStartup {
public static void start(String[] strings) throws IOException, InterruptedException {
String authToken = AuthTokenPanel.getAuthToken();
if (!AutoTokenUtil.isToken(authToken)) {
System.err.println("Please configure authentication token using 'set_auth_token' command");
return;
}
String autoDetectedPort = PortDetector.autoDetectSerial(null);
if (autoDetectedPort == null) {
System.err.println(ConsoleTools.RUS_EFI_NOT_DETECTED);
return;
}
NetworkConnector.runNetworkConnector(authToken, autoDetectedPort, Backend.SERVER_PORT_FOR_CONTROLLERS);
}
}

115
java_console/ui/src/test/java/com/rusefi/FullServerTest.java Normal file
View File

@ -0,0 +1,115 @@
package com.rusefi;
import com.opensr5.ConfigurationImage;
import com.opensr5.Logger;
import com.opensr5.ini.field.ScalarIniField;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.config.generated.Fields;
import com.rusefi.io.ConnectionStateListener;
import com.rusefi.io.LinkManager;
import com.rusefi.proxy.NetworkConnector;
import com.rusefi.server.*;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import static com.rusefi.TestHelper.createIniField;
import static com.rusefi.TestHelper.prepareImage;
import static com.rusefi.Timeouts.READ_IMAGE_TIMEOUT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class FullServerTest {
private final static Logger logger = Logger.CONSOLE;
@Before
public void setTestCertificate() throws MalformedURLException {
ServerTest.commonServerTest();
BinaryProtocol.DISABLE_LOCAL_CACHE = true;
}
@Test
public void testRelayWorkflow() throws InterruptedException, IOException {
ScalarIniField iniField = TestHelper.createIniField(Fields.CYLINDERSCOUNT);
int value = 241;
int userId = 7;
CountDownLatch controllerRegistered = new CountDownLatch(1);
UserDetailsResolver userDetailsResolver = authToken -> new UserDetails(authToken.substring(0, 5), userId);
int httpPort = 8003;
try (Backend backend = new Backend(userDetailsResolver, httpPort, logger) {
@Override
protected void onRegister(ControllerConnectionState controllerConnectionState) {
super.onRegister(controllerConnectionState);
controllerRegistered.countDown();
}
}; LinkManager clientManager = new LinkManager(logger)) {
int serverPortForControllers = 7001;
int serverPortForRemoteUsers = 7003;
// first start backend server
CountDownLatch controllerServerCreated = new CountDownLatch(1);
CountDownLatch applicationServerCreated = new CountDownLatch(1);
backend.runControllerConnector(serverPortForControllers, parameter -> controllerServerCreated.countDown());
backend.runApplicationConnector(serverPortForRemoteUsers, parameter -> applicationServerCreated.countDown());
assertTrue(controllerServerCreated.await(READ_IMAGE_TIMEOUT, TimeUnit.MILLISECONDS));
assertTrue(applicationServerCreated.await(READ_IMAGE_TIMEOUT, TimeUnit.MILLISECONDS));
// create virtual controller to which "rusEFI network connector" connects to
int controllerPort = 7002;
ConfigurationImage controllerImage = prepareImage(value, createIniField(Fields.CYLINDERSCOUNT));
CountDownLatch controllerCreated = new CountDownLatch(1);
TestHelper.createVirtualController(controllerImage, controllerPort, parameter -> controllerCreated.countDown(), logger);
assertTrue(controllerCreated.await(READ_IMAGE_TIMEOUT, TimeUnit.MILLISECONDS));
// start "rusEFI network connector" to connect controller with backend since in real life controller has only local serial port it does not have network
SessionDetails deviceSessionDetails = NetworkConnector.runNetworkConnector(MockRusEfiDevice.TEST_TOKEN_1, TestHelper.LOCALHOST + ":" + controllerPort, serverPortForControllers);
assertTrue(controllerRegistered.await(READ_IMAGE_TIMEOUT, TimeUnit.MILLISECONDS));
SessionDetails authenticatorSessionDetails = new SessionDetails(deviceSessionDetails.getControllerInfo(), MockRusEfiDevice.TEST_TOKEN_3, deviceSessionDetails.getOneTimeToken());
ApplicationRequest applicationRequest = new ApplicationRequest(authenticatorSessionDetails, userId);
// start authenticator
int authenticatorPort = 7004; // local port on which authenticator accepts connections from Tuner Studio
LocalApplicationProxy.startAndRun(logger, serverPortForRemoteUsers, applicationRequest, authenticatorPort);
CountDownLatch connectionEstablishedCountDownLatch = new CountDownLatch(1);
// connect to proxy and read virtual controller through it
clientManager.startAndConnect(TestHelper.LOCALHOST + ":" + authenticatorPort, new ConnectionStateListener() {
@Override
public void onConnectionEstablished() {
connectionEstablishedCountDownLatch.countDown();
}
@Override
public void onConnectionFailed() {
System.out.println("Failed");
}
});
assertTrue("Proxied ECU Connection established", connectionEstablishedCountDownLatch.await(30, TimeUnit.SECONDS));
BinaryProtocol clientStreamState = clientManager.getCurrentStreamState();
Objects.requireNonNull(clientStreamState, "clientStreamState");
ConfigurationImage clientImage = clientStreamState.getControllerConfiguration();
String clientValue = iniField.getValue(clientImage);
assertEquals(Double.toString(value), clientValue);
}
}
}

24
java_console/ui/src/test/java/com/rusefi/MockRusEfiDevice.java
View File

@ -1,16 +1,22 @@
package com.rusefi;
import com.opensr5.Logger;
import com.rusefi.config.generated.Fields;
import com.rusefi.io.tcp.BinaryProtocolServer;
import com.rusefi.io.tcp.TcpIoStream;
import com.rusefi.proxy.BaseBroadcastingThread;
import com.rusefi.server.ControllerInfo;
import com.rusefi.server.SessionDetails;
import com.rusefi.server.rusEFISSLContext;
import java.io.IOException;
import java.net.Socket;
import static com.rusefi.tools.online.ProxyClient.LOCALHOST;
import static com.rusefi.TestHelper.LOCALHOST;
public class MockRusEfiDevice {
public static final String TEST_TOKEN_1 = "00000000-1234-1234-1234-123456789012";
public static final String TEST_TOKEN_3 = "33333333-3333-1234-1234-123456789012";
private SessionDetails sessionDetails;
private final Logger logger;
@ -26,9 +32,21 @@ public class MockRusEfiDevice {
}
public void connect(int serverPort) throws IOException {
BaseBroadcastingThread baseBroadcastingThread = new BaseBroadcastingThread(new Socket(LOCALHOST, serverPort),
Socket socket = rusEFISSLContext.getSSLSocket(LOCALHOST, serverPort);
BaseBroadcastingThread baseBroadcastingThread = new BaseBroadcastingThread(socket,
sessionDetails,
logger);
logger) {
@Override
protected void handleCommand(BinaryProtocolServer.Packet packet, TcpIoStream stream) throws IOException {
super.handleCommand(packet, stream);
if (packet.getPacket()[0] == Fields.TS_OUTPUT_COMMAND) {
byte[] response = new byte[1 + Fields.TS_OUTPUT_SIZE];
response[0] = (byte) BinaryProtocolServer.TS_OK.charAt(0);
stream.sendPacket(response, logger);
}
}
};
baseBroadcastingThread.start();
}
}

155
java_console/ui/src/test/java/com/rusefi/ServerTest.java
View File

@ -1,118 +1,157 @@
package com.rusefi;
import com.opensr5.ConfigurationImage;
import com.opensr5.Logger;
import com.rusefi.config.generated.Fields;
import com.rusefi.io.IoStream;
import com.rusefi.io.commands.HelloCommand;
import com.rusefi.server.Backend;
import com.rusefi.server.ClientConnectionState;
import com.rusefi.server.SessionDetails;
import com.rusefi.server.UserDetails;
import com.rusefi.server.*;
import com.rusefi.tools.online.HttpUtil;
import com.rusefi.tools.online.ProxyClient;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.net.Socket;
import java.net.MalformedURLException;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import static com.rusefi.TestHelper.createIniField;
import static com.rusefi.TestHelper.prepareImage;
import static com.rusefi.tools.online.ProxyClient.LOCALHOST;
import static com.rusefi.Timeouts.READ_IMAGE_TIMEOUT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
* integration test of the rusEFI online backend process
* At the moment this test is very loose with timing it must be unreliable?
* <p>
* https://github.com/rusefi/web_backend/blob/master/documentation/rusEFI%20remote.png
*/
public class ServerTest {
private final static Logger logger = Logger.CONSOLE;
@Before
public void setTestCertificate() throws MalformedURLException {
commonServerTest();
}
static void commonServerTest() throws MalformedURLException {
HttpUtil.RUSEFI_PROXY_HOSTNAME = TestHelper.LOCALHOST;
rusEFISSLContext.init("certificate/test_pkcs12.jks", "password");
}
@Test
public void testSessionTimeout() throws InterruptedException, IOException {
int serverPort = 7000;
public void testControllerSessionTimeout() throws InterruptedException, IOException {
int serverPortForControllers = 7000;
int httpPort = 8000;
Function<String, UserDetails> userDetailsResolver = authToken -> new UserDetails(authToken.substring(0, 5), authToken.charAt(6));
UserDetailsResolver userDetailsResolver = authToken -> new UserDetails(authToken.substring(0, 5), authToken.charAt(6));
CountDownLatch serverCreated = new CountDownLatch(1);
CountDownLatch allClientsDisconnected = new CountDownLatch(1);
CountDownLatch onConnected = new CountDownLatch(2);
Backend backend = new Backend(userDetailsResolver, httpPort, logger) {
CountDownLatch allConnected = new CountDownLatch(1);
try (Backend backend = new Backend(userDetailsResolver, httpPort, logger) {
@Override
public void register(ClientConnectionState clientConnectionState) {
public void register(ControllerConnectionState clientConnectionState) {
super.register(clientConnectionState);
onConnected.countDown();
try {
allConnected.await();
} catch (InterruptedException e) {
throw new IllegalStateException(e);
}
throw new IllegalStateException();
}
@Override
public void close(ClientConnectionState inactiveClient) {
public void close(ControllerConnectionState inactiveClient) {
super.close(inactiveClient);
if (getCount() == 0)
allClientsDisconnected.countDown();
}
};
}) {
Backend.runProxy(serverPort, serverCreated, backend);
assertTrue(serverCreated.await(30, TimeUnit.SECONDS));
assertEquals(0, backend.getCount());
backend.runControllerConnector(serverPortForControllers, parameter -> serverCreated.countDown());
assertTrue(serverCreated.await(30, TimeUnit.SECONDS));
assertEquals(0, backend.getCount());
new MockRusEfiDevice(MockRusEfiDevice.TEST_TOKEN_1, "rusEFI 2020.07.06.frankenso_na6.2468827536", logger).connect(serverPort);
new MockRusEfiDevice("12345678-1234-1234-1234-123456789012", "rusEFI 2020.07.11.proteus_f4.1986715563", logger).connect(serverPort);
new MockRusEfiDevice(MockRusEfiDevice.TEST_TOKEN_1, "rusEFI 2020.07.06.frankenso_na6.2468827536", logger).connect(serverPortForControllers);
new MockRusEfiDevice("12345678-1234-1234-1234-123456789012", "rusEFI 2020.07.11.proteus_f4.1986715563", logger).connect(serverPortForControllers);
assertTrue(onConnected.await(30, TimeUnit.SECONDS));
assertTrue("onConnected", onConnected.await(30, TimeUnit.SECONDS));
List<ClientConnectionState> clients = backend.getClients();
assertEquals(2, clients.size());
List<ControllerConnectionState> clients = backend.getClients();
assertEquals(2, clients.size());
List<UserDetails> onlineUsers = ProxyClient.getOnlineUsers(httpPort);
assertEquals(2, onlineUsers.size());
List<UserDetails> onlineUsers = ProxyClient.getOnlineUsers(HttpUtil.RUSEFI_PROXY_JSON_PROTOCOL + TestHelper.LOCALHOST + ":" + httpPort + ProxyClient.LIST_PATH);
assertEquals(2, onlineUsers.size());
assertTrue(allClientsDisconnected.await(30, TimeUnit.SECONDS));
allConnected.countDown();
assertTrue("allClientsDisconnected", allClientsDisconnected.await(30, TimeUnit.SECONDS));
}
}
@Test
public void testRelayWorkflow() throws InterruptedException, IOException {
Function<String, UserDetails> userDetailsResolver = authToken -> new UserDetails(authToken.substring(0, 5), authToken.charAt(6));
public void testInvalidApplicationRequest() throws InterruptedException, IOException {
UserDetailsResolver userDetailsResolver = authToken -> new UserDetails(authToken.substring(0, 5), authToken.charAt(6));
int httpPort = 8001;
Backend backend = new Backend(userDetailsResolver, httpPort, logger);
int serverPort = 7001;
CountDownLatch serverCreated = new CountDownLatch(1);
int serverPortForRemoteUsers = 6801;
CountDownLatch disconnectedCountDownLatch = new CountDownLatch(1);
try (Backend backend = new Backend(userDetailsResolver, httpPort, logger) {
@Override
protected void onDisconnectApplication() {
super.onDisconnectApplication();
disconnectedCountDownLatch.countDown();
}
}) {
// first start backend server
Backend.runProxy(serverPort, serverCreated, backend);
assertTrue(serverCreated.await(30, TimeUnit.SECONDS));
CountDownLatch applicationServerCreated = new CountDownLatch(1);
backend.runApplicationConnector(serverPortForRemoteUsers, parameter -> applicationServerCreated.countDown());
assertTrue(applicationServerCreated.await(READ_IMAGE_TIMEOUT, TimeUnit.MILLISECONDS));
// start authenticator
IoStream authenticatorToProxyStream = TestHelper.secureConnectToLocalhost(serverPortForRemoteUsers, logger);
new HelloCommand(logger, "hello").handle(authenticatorToProxyStream);
// create virtual controller
int controllerPort = 7002;
ConfigurationImage controllerImage = prepareImage(240, createIniField(Fields.CYLINDERSCOUNT));
CountDownLatch controllerCreated = new CountDownLatch(1);
TestHelper.createVirtualController(controllerImage, controllerPort, parameter -> controllerCreated.countDown(), logger);
assertTrue(controllerCreated.await(30, TimeUnit.SECONDS));
// start network broadcaster to connect controller with backend since in real life controller has only local serial port it does not have network
IoStream targetEcuSocket = TestHelper.createTestStream(controllerPort, logger);
HelloCommand.send(targetEcuSocket, logger);
String controllerSignature = HelloCommand.getHelloResponse(targetEcuSocket.getDataBuffer(), logger);
SessionDetails sessionDetails = MockRusEfiDevice.createTestSession(MockRusEfiDevice.TEST_TOKEN_1, controllerSignature);
BaseBroadcastingThread baseBroadcastingThread = new BaseBroadcastingThread(new Socket(LOCALHOST, serverPort),
sessionDetails,
logger) {
// todo
};
baseBroadcastingThread.start();
assertTrue(disconnectedCountDownLatch.await(30, TimeUnit.SECONDS));
}
}
@Test
public void testAuthenticatorRequestUnknownSession() throws InterruptedException, IOException {
int serverPortForRemoteUsers = 6800;
UserDetailsResolver userDetailsResolver = authToken -> new UserDetails(authToken.substring(0, 5), authToken.charAt(6));
int httpPort = 8002;
CountDownLatch disconnectedCountDownLatch = new CountDownLatch(1);
try (Backend backend = new Backend(userDetailsResolver, httpPort, logger) {
@Override
protected void onDisconnectApplication() {
super.onDisconnectApplication();
disconnectedCountDownLatch.countDown();
}
}) {
CountDownLatch applicationServerCreated = new CountDownLatch(1);
backend.runApplicationConnector(serverPortForRemoteUsers, parameter -> applicationServerCreated.countDown());
assertTrue(applicationServerCreated.await(READ_IMAGE_TIMEOUT, TimeUnit.MILLISECONDS));
SessionDetails sessionDetails = MockRusEfiDevice.createTestSession(MockRusEfiDevice.TEST_TOKEN_1, Fields.TS_SIGNATURE);
ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, 123);
// start authenticator
IoStream authenticatorToProxyStream = TestHelper.secureConnectToLocalhost(serverPortForRemoteUsers, logger);
LocalApplicationProxy localApplicationProxy = new LocalApplicationProxy(logger, applicationRequest);
localApplicationProxy.run(authenticatorToProxyStream);
assertTrue(disconnectedCountDownLatch.await(30, TimeUnit.SECONDS));
}
}
}

25
java_console/ui/src/test/java/com/rusefi/TestHelper.java
View File

@ -11,7 +11,7 @@ import com.rusefi.io.LinkConnector;
import com.rusefi.io.LinkManager;
import com.rusefi.io.tcp.BinaryProtocolServer;
import com.rusefi.io.tcp.TcpIoStream;
import com.rusefi.tools.online.ProxyClient;
import com.rusefi.server.rusEFISSLContext;
import com.rusefi.tune.xml.Constant;
import org.jetbrains.annotations.NotNull;
@ -19,16 +19,18 @@ import java.io.IOException;
import java.net.Socket;
public class TestHelper {
public static final String LOCALHOST = "localhost";
@NotNull
public static ScalarIniField createIniField(Field field) {
return new ScalarIniField(field.getName(), field.getOffset(), "", field.getType(), 1);
return new ScalarIniField(field.getName(), field.getOffset(), "", field.getType(), 1, "0");
}
@NotNull
public static ConfigurationImage prepareImage(int input, ScalarIniField scalarIniField) {
ConfigurationImage ci = new ConfigurationImage(Fields.TOTAL_CONFIG_SIZE);
scalarIniField.setValue(ci, new Constant(scalarIniField.getName(), "", Integer.toString(input)));
scalarIniField.setValue(ci, new Constant(scalarIniField.getName(), "", Integer.toString(input), scalarIniField.getDigits()));
return ci;
}
@ -46,12 +48,23 @@ public class TestHelper {
}
@NotNull
public static IoStream createTestStream(int controllerPort, Logger logger) {
public static IoStream secureConnectToLocalhost(int controllerPort, Logger logger) {
IoStream targetEcuSocket;
try {
targetEcuSocket = new TcpIoStream(logger, new Socket(ProxyClient.LOCALHOST, controllerPort));
targetEcuSocket = new TcpIoStream("[local]", logger, rusEFISSLContext.getSSLSocket(LOCALHOST, controllerPort));
} catch (IOException e) {
throw new IllegalStateException("Failed to connect to controller " + ProxyClient.LOCALHOST + ":" + controllerPort);
throw new IllegalStateException("Failed to connect to controller " + LOCALHOST + ":" + controllerPort);
}
return targetEcuSocket;
}
@NotNull
public static IoStream connectToLocalhost(int controllerPort, Logger logger) {
IoStream targetEcuSocket;
try {
targetEcuSocket = new TcpIoStream("[local]", logger, new Socket(LOCALHOST, controllerPort));
} catch (IOException e) {
throw new IllegalStateException("Failed to connect to controller " + LOCALHOST + ":" + controllerPort);
}
return targetEcuSocket;
}

Some files were not shown because too many files have changed in this diff Show More