Compare commits
No commits in common. "5707eabaa94fecbfb08a17110754f7feaefe96c1" and "1e9efdfa6df2ab7e1730454ff36893d939499409" have entirely different histories.
5707eabaa9
...
1e9efdfa6d
|
@ -7,11 +7,9 @@ apply from: 'dependencies.gradle'
|
|||
group 'org.rusefi'
|
||||
version '0.11-SNAPSHOT'
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation libs.snakeyaml
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
javaCanVersion=3.2.4
|
|
@ -6,6 +6,4 @@ plugins {
|
|||
dependencies {
|
||||
api rootProject
|
||||
api project(':peak-can-basic')
|
||||
api group: 'tel.schich', name: 'javacan-core', version: "$javaCanVersion"
|
||||
api group: 'tel.schich', name: 'javacan-core', version: "$javaCanVersion", classifier: 'x86_64'
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
package com.rusefi.io.can;
|
||||
|
||||
public interface CanSender {
|
||||
void send(int id, byte[] payload);
|
||||
}
|
|
@ -9,7 +9,7 @@ public class PCanHelper {
|
|||
public static final TPCANHandle CHANNEL = TPCANHandle.PCAN_USBBUS1;
|
||||
|
||||
// @NotNull
|
||||
public static PCANBasic createPCAN() {
|
||||
public static PCANBasic create() {
|
||||
PCANBasic can = new PCANBasic();
|
||||
can.initializeAPI();
|
||||
return can;
|
||||
|
@ -27,7 +27,7 @@ public class PCanHelper {
|
|||
}
|
||||
|
||||
public static PCANBasic createAndInit() {
|
||||
PCANBasic pcan = createPCAN();
|
||||
PCANBasic pcan = create();
|
||||
TPCANStatus initStatus = init(pcan);
|
||||
if (initStatus != TPCANStatus.PCAN_ERROR_OK) {
|
||||
System.out.println("TPCANStatus " + initStatus);
|
||||
|
@ -35,14 +35,4 @@ public class PCanHelper {
|
|||
}
|
||||
return pcan;
|
||||
}
|
||||
|
||||
public static CanSender create() {
|
||||
PCANBasic pcan = createAndInit();
|
||||
return new CanSender() {
|
||||
@Override
|
||||
public void send(int id, byte[] payload) {
|
||||
PCanHelper.send(pcan, id, payload);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
package com.rusefi.io.can;
|
||||
|
||||
import com.sun.istack.internal.NotNull;
|
||||
import tel.schich.javacan.CanChannels;
|
||||
import tel.schich.javacan.CanFrame;
|
||||
import tel.schich.javacan.NetworkDevice;
|
||||
import tel.schich.javacan.RawCanChannel;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import static tel.schich.javacan.CanFrame.FD_NO_FLAGS;
|
||||
import static tel.schich.javacan.CanSocketOptions.RECV_OWN_MSGS;
|
||||
|
||||
public class SocketCANHelper {
|
||||
@NotNull
|
||||
public static RawCanChannel createSocket() {
|
||||
final RawCanChannel socket;
|
||||
try {
|
||||
NetworkDevice canInterface = NetworkDevice.lookup(System.getProperty("CAN_DEVICE_NAME", "can0"));
|
||||
socket = CanChannels.newRawChannel();
|
||||
socket.bind(canInterface);
|
||||
|
||||
socket.configureBlocking(true); // we want reader thread to wait for messages
|
||||
socket.setOption(RECV_OWN_MSGS, false);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("Error looking up", e);
|
||||
}
|
||||
return socket;
|
||||
}
|
||||
|
||||
public static void send(int id, byte[] payload, RawCanChannel channel) {
|
||||
CanFrame packet = CanFrame.create(id, FD_NO_FLAGS, payload);
|
||||
try {
|
||||
channel.write(packet);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public static CanSender create() {
|
||||
RawCanChannel canChannel = createSocket();
|
||||
return new CanSender() {
|
||||
@Override
|
||||
public void send(int id, byte[] payload) {
|
||||
SocketCANHelper.send(id, payload, canChannel);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue