Compare commits

...

2 Commits

Author SHA1 Message Date
rusefillc 5707eabaa9 CanSender 2024-01-06 00:29:29 -05:00
rusefillc e05d02475f SocketCAN sender 2024-01-06 00:15:03 -05:00
6 changed files with 73 additions and 4 deletions

View File

@ -7,8 +7,10 @@ apply from: 'dependencies.gradle'
group 'org.rusefi'
version '0.11-SNAPSHOT'
repositories {
mavenCentral()
allprojects {
repositories {
mavenCentral()
}
}
dependencies {

1
gradle.properties Normal file
View File

@ -0,0 +1 @@
javaCanVersion=3.2.4

View File

@ -6,4 +6,6 @@ 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'
}

View File

@ -0,0 +1,5 @@
package com.rusefi.io.can;
public interface CanSender {
void send(int id, byte[] payload);
}

View File

@ -9,7 +9,7 @@ public class PCanHelper {
public static final TPCANHandle CHANNEL = TPCANHandle.PCAN_USBBUS1;
// @NotNull
public static PCANBasic create() {
public static PCANBasic createPCAN() {
PCANBasic can = new PCANBasic();
can.initializeAPI();
return can;
@ -27,7 +27,7 @@ public class PCanHelper {
}
public static PCANBasic createAndInit() {
PCANBasic pcan = create();
PCANBasic pcan = createPCAN();
TPCANStatus initStatus = init(pcan);
if (initStatus != TPCANStatus.PCAN_ERROR_OK) {
System.out.println("TPCANStatus " + initStatus);
@ -35,4 +35,14 @@ 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);
}
};
}
}

View File

@ -0,0 +1,49 @@
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);
}
};
}
}