why does it not filter
This commit is contained in:
parent
c07238b85e
commit
d0d6f69b47
|
@ -11,6 +11,7 @@ import com.rusefi.io.serial.AbstractIoStream;
|
|||
import com.rusefi.io.tcp.BinaryProtocolServer;
|
||||
import com.rusefi.ui.StatusConsumer;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import peak.can.MutableInteger;
|
||||
import peak.can.basic.*;
|
||||
|
||||
import java.io.IOException;
|
||||
|
@ -85,6 +86,47 @@ public class PCanIoStream extends AbstractIoStream {
|
|||
private PCanIoStream(PCANBasic can, StatusConsumer statusListener) {
|
||||
this.can = can;
|
||||
this.statusListener = statusListener;
|
||||
{
|
||||
MutableInteger intBuffer = new MutableInteger(TPCANParameterValue.PCAN_FILTER_CLOSE.getValue());
|
||||
TPCANStatus status = can.SetValue(CHANNEL, TPCANParameter.PCAN_MESSAGE_FILTER, intBuffer, Integer.SIZE);
|
||||
if (status != TPCANStatus.PCAN_ERROR_OK) {
|
||||
statusListener.append("Error SetValue PCAN: " + status);
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
MutableInteger buffer = new MutableInteger(0);
|
||||
GetFilterStatus(buffer);
|
||||
if (buffer.value != TPCANParameterValue.PCAN_FILTER_CLOSE.getValue())
|
||||
throw new IllegalStateException("Must be closed");
|
||||
}
|
||||
{
|
||||
TPCANStatus status = can.FilterMessages(CHANNEL, CAN_ECU_SERIAL_TX_ID, CAN_ECU_SERIAL_TX_ID, TPCANMode.PCAN_MODE_STANDARD);
|
||||
if (status != TPCANStatus.PCAN_ERROR_OK) {
|
||||
statusListener.append("Error FilterMessages PCAN: " + status);
|
||||
return;
|
||||
}
|
||||
}
|
||||
{
|
||||
MutableInteger buffer = new MutableInteger(0);
|
||||
GetFilterStatus(buffer);
|
||||
if (buffer.value != TPCANParameterValue.PCAN_FILTER_CUSTOM.getValue())
|
||||
throw new IllegalStateException("Custom filter expected");
|
||||
}
|
||||
System.out.println("Filter applied");
|
||||
}
|
||||
|
||||
// Gets the current status of the PCAN-Basic message filter
|
||||
private void GetFilterStatus(MutableInteger filterStatus) {
|
||||
TPCANStatus status;
|
||||
|
||||
// Tries to get the status of the filter for the current connected hardware
|
||||
status = can.GetValue(CHANNEL, TPCANParameter.PCAN_MESSAGE_FILTER, filterStatus, Integer.SIZE);
|
||||
|
||||
// If it fails, a error message is shown
|
||||
if (status != TPCANStatus.PCAN_ERROR_OK) {
|
||||
throw new IllegalStateException("Error " + status);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -0,0 +1,93 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-only */
|
||||
/*
|
||||
* $Id: MutableInteger.java 7377 2020-08-07 14:40:53Z Fabrice $
|
||||
* @LastChange $Date: 2020-08-07 16:40:53 +0200 (Fri, 07 Aug 2020) $
|
||||
*
|
||||
* Demo Application for PCANBasic JAVA JNI Interface.
|
||||
*
|
||||
* Copyright (C) 2001-2020 PEAK System-Technik GmbH <www.peak-system.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* PCAN is a registered Trademark of PEAK-System Germany GmbH
|
||||
*
|
||||
* Author: Jonathan Urban/Uwe Wilhelm/Fabrice Vergnaud
|
||||
* Contact: <linux@peak-system.com>
|
||||
* Maintainer: Fabrice Vergnaud <f.vergnaud@peak-system.com>
|
||||
*/
|
||||
package peak.can;
|
||||
|
||||
/**
|
||||
* The MutableInteger class wraps a value of the primitive type int in an object. An object of type Integer contains a single field whose type is int.
|
||||
* This class is used because Java.Lang.Integer objects are defined as Imutable. Yet, we need to maintain object reference when it's passed to the JNI library using.
|
||||
* So, we defined a simple Class which extends Java.Lang.Object to resolve the problematic.
|
||||
*
|
||||
* @version 1.9
|
||||
* @LastChange $Date: 2020-08-07 16:40:53 +0200 (Fri, 07 Aug 2020) $
|
||||
* @author Jonathan Urban/Uwe Wilhelm
|
||||
*
|
||||
* @Copyright (C) 1999-2014 PEAK-System Technik GmbH, Darmstadt
|
||||
* more Info at http://www.peak-system.com
|
||||
*/
|
||||
public class MutableInteger
|
||||
{
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
* @param value int value
|
||||
*/
|
||||
public MutableInteger(int value)
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor parsing the string argument as a integer
|
||||
* @param value integer as string
|
||||
*/
|
||||
public MutableInteger(String value)
|
||||
{
|
||||
this.value = Integer.parseInt(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets integer value
|
||||
* @return integer value
|
||||
*/
|
||||
public int getValue()
|
||||
{
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets integer value
|
||||
* @param value Integer value
|
||||
*/
|
||||
public void setValue(int value)
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
public int value;
|
||||
|
||||
/**
|
||||
* Overrides toString() to display int value
|
||||
* @return MutableInteger's value as a string
|
||||
*/
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
return Integer.toString(value);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue