Further work on CAN native code

nanoframework · Dec 6, 2018 · b6208ff · b6208ff
1 parent 96650b5
commit b6208ff
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 519 deletions.
diff --git a/targets/CMSIS-OS/ChibiOS/nanoCLR/nanoFramework.Devices.Can/nf_devices_can_native.cpp b/targets/CMSIS-OS/ChibiOS/nanoCLR/nanoFramework.Devices.Can/nf_devices_can_native.cpp
@@ -58,19 +58,12 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
 };
 
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Devices_Can =
 {
     "nanoFramework.Devices.Can", 
-    0xA85321ED,
+    0xD2E9416A,
     method_lookup,
     { 1, 0, 0, 1 }
 };
diff --git a/targets/CMSIS-OS/ChibiOS/nanoCLR/nanoFramework.Devices.Can/nf_devices_can_native.h b/targets/CMSIS-OS/ChibiOS/nanoCLR/nanoFramework.Devices.Can/nf_devices_can_native.h
@@ -22,6 +22,7 @@ struct Library_nf_devices_can_native_nanoFramework_Devices_Can_CanController
     static const int FIELD___controllerId = 4;
     static const int FIELD___settings = 5;
     static const int FIELD___message = 6;
+    static const int FIELD__ControllerId = 7;
 
     NANOCLR_NATIVE_DECLARE(WriteMessage___VOID__nanoFrameworkDevicesCanCanMessage);
     NANOCLR_NATIVE_DECLARE(GetMessage___nanoFrameworkDevicesCanCanMessage);
@@ -56,12 +57,9 @@ struct Library_nf_devices_can_native_nanoFramework_Devices_Can_CanControllerMana
 struct Library_nf_devices_can_native_nanoFramework_Devices_Can_CanMessage
 {
     static const int FIELD___id = 1;
-    static const int FIELD___isSID = 2;
-    static const int FIELD___isDataFrame = 3;
-    static const int FIELD___byteMessage = 4;
-    static const int FIELD___uShortMessage = 5;
-    static const int FIELD___uIntMessage = 6;
-    static const int FIELD___uLongMessage = 7;
+    static const int FIELD___identifierType = 2;
+    static const int FIELD___frameType = 3;
+    static const int FIELD___message = 4;
 
 
     //--//
@@ -78,15 +76,6 @@ struct Library_nf_devices_can_native_nanoFramework_Devices_Can_CanMessageEvent
 
 };
 
-struct Library_nf_devices_can_native_nanoFramework_Devices_Can_CanMessageReceivedEventArgs
-{
-    static const int FIELD___message = 1;
-
-
-    //--//
-
-};
-
 struct Library_nf_devices_can_native_nanoFramework_Devices_Can_CanSettings
 {
     static const int FIELD___baudRatePrescaler = 1;
@@ -99,6 +88,8 @@ struct Library_nf_devices_can_native_nanoFramework_Devices_Can_CanSettings
 
 };
 
+
+
 extern const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Devices_Can;
 
 // struct representing the CAN