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

SD card logs not valid for REO #1864

This commit is contained in:
rusefillc 2020-10-08 20:17:32 -04:00
parent e721acc60c
commit 0726f168cf
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/console/binary_log/binary_logging.cpp
View File

@ -20,8 +20,8 @@ static scaled_channel<uint32_t, TIME_PRECISION> packedTime;
// todo: make this logic smarter
static const LogField fields[] = {
{tsOutputChannels.rpm, GAUGE_NAME_RPM, "rpm", 0},
// {packedTime, GAUGE_NAME_TIME, "sec", 0},
// {tsOutputChannels.totalTriggerErrorCounter, GAUGE_NAME_TRG_ERR, "err", 0},
{packedTime, GAUGE_NAME_TIME, "sec", 0},
{tsOutputChannels.totalTriggerErrorCounter, GAUGE_NAME_TRG_ERR, "err", 0},
{tsOutputChannels.vehicleSpeedKph, GAUGE_NAME_VVS, "kph", 0},
{tsOutputChannels.internalMcuTemperature, GAUGE_NAME_CPU_TEMP, "C", 0},
{tsOutputChannels.coolantTemperature, GAUGE_NAME_CLT, "C", 1},
@ -48,12 +48,12 @@ static const LogField fields[] = {
{tsOutputChannels.tpsAccelFuel, GAUGE_NAME_FUEL_TPS_EXTRA, "ms", 3},
{tsOutputChannels.ignitionAdvance, GAUGE_NAME_TIMING_ADVANCE, "deg", 1},
{tsOutputChannels.sparkDwell, GAUGE_COIL_DWELL_TIME, "ms", 1},
{tsOutputChannels.coilDutyCycle, GAUGE_NAME_DWELL_DUTY, "%", 0},
// {tsOutputChannels.coilDutyCycle, GAUGE_NAME_DWELL_DUTY, "%", 0},
{tsOutputChannels.idlePosition, GAUGE_NAME_IAC, "%", 1},
{tsOutputChannels.etbTarget, "ETB Target", "%", 2},
{tsOutputChannels.etb1DutyCycle, "ETB Duty", "%", 1},
{tsOutputChannels.etb1Error, "ETB Error", "%", 3},
{tsOutputChannels.fuelTankLevel, "fuel level", "%", 0},
// {tsOutputChannels.fuelTankLevel, "fuel level", "%", 0},
{tsOutputChannels.fuelingLoad, GAUGE_NAME_FUEL_LOAD, "%", 1},
{tsOutputChannels.ignitionLoad, GAUGE_NAME_IGNITION_LOAD, "%", 1},
{tsOutputChannels.massAirFlow, GAUGE_NAME_AIR_FLOW, "kg/h", 1},

9
java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/LocalSdCardReader.java
View File

@ -1,11 +1,14 @@
package com.rusefi.ts_plugin;
import com.efiAnalytics.plugin.ecu.ControllerAccess;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.io.ConnectionStateListener;
import com.rusefi.io.IoStream;
import com.rusefi.io.LinkManager;
import javax.swing.*;
import java.awt.*;
import java.util.Objects;
import java.util.function.Supplier;
public class LocalSdCardReader {
@ -28,7 +31,11 @@ public class LocalSdCardReader {
sdCardReaderPanel = new SdCardReaderPanel(controllerAccessSupplier, new Supplier<IoStream>() {
@Override
public IoStream get() {
return connectPanel.getControllerConnector().getConnector().getBinaryProtocol().getStream();
LinkManager controllerConnector = connectPanel.getControllerConnector();
Objects.requireNonNull(controllerConnector, "controllerConnector");
BinaryProtocol binaryProtocol = controllerConnector.getConnector().getBinaryProtocol();
Objects.requireNonNull(binaryProtocol, "binaryProtocol");
return binaryProtocol.getStream();
}
}, content.getParent());