Merge branch 'master' into v0.3.0-dev
Paul Hollinsky
commit
8c9d3a5e6a
|
|
@ -269,6 +269,7 @@ if(LIBICSNEO_BUILD_ICSNEOLEGACY)
|
|||
api/icsneolegacy/icsneolegacy.cpp
|
||||
api/icsneolegacy/icsneolegacyextra.cpp
|
||||
api/icsneoc/icsneoc.cpp
|
||||
platform/windows/icsneolegacy.def
|
||||
)
|
||||
target_include_directories(icsneolegacy
|
||||
PUBLIC
|
||||
|
|
|
|||
|
|
@ -84,6 +84,9 @@ bool icsneo_serialNumToString(uint32_t num, char* str, size_t* count) {
|
|||
}
|
||||
|
||||
uint32_t icsneo_serialStringToNum(const char* str) {
|
||||
if(!str)
|
||||
return 0;
|
||||
|
||||
return Device::SerialStringToNum(str);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
//Basic Functions
|
||||
FINDNEODEVICES icsneoFindNeoDevices;
|
||||
OPENNEODEVICE icsneoOpenNeoDevice;
|
||||
OPENDEVICE icsneoOpenDevice;
|
||||
CLOSEPORT icsneoClosePort;
|
||||
FREEOBJECT icsneoFreeObject;
|
||||
////OPENPORTEX icsneoOpenPortEx;
|
||||
|
|
@ -137,6 +138,7 @@ bool LoadDLLAPI(HINSTANCE &hAPIDLL)
|
|||
|
||||
icsneoFindNeoDevices = (FINDNEODEVICES) GetProcAddress(hAPIDLL, "icsneoFindNeoDevices");
|
||||
icsneoOpenNeoDevice = (OPENNEODEVICE) GetProcAddress(hAPIDLL, "icsneoOpenNeoDevice");
|
||||
icsneoOpenDevice = (OPENDEVICE) GetProcAddress(hAPIDLL, "icsneoOpenDevice");
|
||||
icsneoClosePort = (CLOSEPORT) GetProcAddress(hAPIDLL, "icsneoClosePort");
|
||||
icsneoFreeObject = (FREEOBJECT) GetProcAddress(hAPIDLL, "icsneoFreeObject");
|
||||
//// icsneoOpenPortEx = (OPENPORTEX) GetProcAddress(hAPIDLL, "icsneoOpenPortEx");
|
||||
|
|
@ -204,7 +206,7 @@ bool LoadDLLAPI(HINSTANCE &hAPIDLL)
|
|||
|
||||
icsneoEnableDOIPLine = (ENABLEDOIPACTIVATIONLINE)GetProcAddress(hAPIDLL, "icsneoEnableDOIPLine");
|
||||
|
||||
if(!icsneoFindNeoDevices || !icsneoOpenNeoDevice || !icsneoClosePort || !icsneoFreeObject ||
|
||||
if(!icsneoFindNeoDevices || !icsneoOpenNeoDevice || !icsneoOpenDevice || !icsneoClosePort || !icsneoFreeObject ||
|
||||
!icsneoTxMessages || !icsneoGetMessages || !icsneoWaitForRxMessagesWithTimeOut ||
|
||||
!icsneoGetTimeStampForMsg || !icsneoEnableNetworkRXQueue || !icsneoGetISO15765Status || !icsneoTxMessagesEx ||
|
||||
!icsneoSetISO15765RxParameters || !icsneoGetConfiguration || !icsneoSendConfiguration ||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ void UnloadDLLAPI(HINSTANCE &hAPIDLL);
|
|||
//Basic Functions
|
||||
typedef int (__stdcall *FINDNEODEVICES)(unsigned long DeviceTypes, NeoDevice *pNeoDevice, int *pNumDevices);
|
||||
typedef int (__stdcall *OPENNEODEVICE)(NeoDevice *pNeoDevice, void * hObject, unsigned char *bNetworkIDs, int bConfigRead, int bSyncToPC);
|
||||
typedef int (__stdcall *OPENDEVICE)(NeoDeviceEx* pNeoDeviceEx, void** hObject, unsigned char* bNetworkIDs, int bConfigRead, int iOptions, OptionsOpenNeoEx* stOptionsOpenNeoEx, unsigned long reserved);
|
||||
typedef int (__stdcall *CLOSEPORT)(void * hObject, int *pNumberOfErrors);
|
||||
typedef void (__stdcall *FREEOBJECT)(void * hObject);
|
||||
typedef int (__stdcall *OPENPORTEX)(void * lPortNumber, int lPortType, int lDriverType, int lIPAddressMSB, int lIPAddressLSBOrBaudRate,
|
||||
|
|
@ -115,6 +116,7 @@ typedef int (__stdcall *SCRIPTWRITEISO15765TXMESSAGE)(void * hObject, unsigned
|
|||
//Basic Functions
|
||||
extern FINDNEODEVICES icsneoFindNeoDevices;
|
||||
extern OPENNEODEVICE icsneoOpenNeoDevice;
|
||||
extern OPENDEVICE icsneoOpenDevice;
|
||||
extern CLOSEPORT icsneoClosePort;
|
||||
extern FREEOBJECT icsneoFreeObject;
|
||||
extern SERIALNUMBERTOSTRING icsneoSerialNumberToString;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -14,11 +14,11 @@
|
|||
using namespace icsneo;
|
||||
|
||||
extern "C" {
|
||||
extern int DLLExport icsneoValidateHObject(void* hObject);
|
||||
extern int DLLExport icsneoWaitForRxMessagesWithTimeOut(void* hObject, unsigned int iTimeOut);
|
||||
extern int LegacyDLLExport icsneoValidateHObject(void* hObject);
|
||||
extern int LegacyDLLExport icsneoWaitForRxMessagesWithTimeOut(void* hObject, unsigned int iTimeOut);
|
||||
}
|
||||
|
||||
int icsneoWaitForRxMessagesWithTimeOut(void* hObject, unsigned int iTimeOut) {
|
||||
int LegacyDLLExport icsneoWaitForRxMessagesWithTimeOut(void* hObject, unsigned int iTimeOut) {
|
||||
if(!icsneoValidateHObject(hObject))
|
||||
return false;
|
||||
neodevice_t* device = (neodevice_t*)hObject;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
#ifndef _J2534_H
|
||||
#define _J2534_H
|
||||
|
||||
//J2534 Commands
|
||||
#define J1534_NUM_PERIOD_TX_MSGS 128
|
||||
#define J1534_NUM_PERIOD_RX_MSGS 128
|
||||
#define J2534NVCMD_SetISJ2534 0
|
||||
#define J2534NVCMD_SetISO5Baud 1
|
||||
#define J2534NVCMD_SetISOFastInit 2
|
||||
#define J2534NVCMD_SetISOCheckSum 3
|
||||
#define J2534NVCMD_SetISO9141Parms 4
|
||||
#define J2534NVCMD_GetISO9141Parms 5
|
||||
#define J2534NVCMD_ISO9141APIChkSum 6
|
||||
#define J2534NVCMD_SetNetworkBaudRate 7
|
||||
#define J2534NVCMD_GetNetworkBaudRate 8
|
||||
#define J2534NVCMD_EnableTransmitEvent 9
|
||||
#define J2534NVCMD_SetTransmitEvent 10
|
||||
#define J2534NVCMD_BlueEnableStopFilters 11
|
||||
#define J2534NVCMD_Blue15765HWSupport 12
|
||||
#define J2534NVCMD_GetTXBufferInfo 13
|
||||
#define J2534NVCMD_GetEncryptionKey 14
|
||||
#define J2534NVCMD_SetMiscIOForVBATT 15
|
||||
#define J2534NVCMD_EnableISO_KW_Network 16
|
||||
#define J2534NVCMD_SetJ1708CheckSum 17
|
||||
#define J2534NVCMD_GetTimestamp 18
|
||||
#define J2534NVCMD_GetCANFDRate 19
|
||||
#define J2534NVCMD_SetCANFDRate 20
|
||||
#define J2534NVCMD_GetCANFDTermination 21
|
||||
#define J2534NVCMD_SetCANFDTermination 22
|
||||
#define J2534NVCMD_GetCANFDFormat 23
|
||||
#define J2534NVCMD_SetCANFDFormat 24
|
||||
|
||||
#endif
|
||||
|
|
@ -18,6 +18,9 @@ enum class Command : uint8_t {
|
|||
GetSecondaryVersions = 0xA9, // Previously known as RED_CMD_PERIPHERALS_APP_VERSION_REQ, versions other than the main chip
|
||||
RequestStatusUpdate = 0xBC,
|
||||
ReadSettings = 0xC7, // Previously known as 3G_READ_SETTINGS_EX
|
||||
SetVBattMonitor = 0xDB, // Previously known as RED_CMD_CM_VBATT_MONITOR
|
||||
RequestBitSmash = 0xDC, // Previously known as RED_CMD_CM_BITSMASH
|
||||
GetVBattReq = 0xDF, // Previously known as RED_CMD_VBATT_REQUEST
|
||||
MiscControl = 0xE7,
|
||||
FlexRayControl = 0xF3
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1965,6 +1965,7 @@ typedef enum _EDeviceSettingsType
|
|||
DeviceECU_AVBSettingsType,
|
||||
DeviceRADSuperMoonSettingsType,
|
||||
DeviceRADMoon2SettingsType,
|
||||
DeviceRADGigalogSettingsType,
|
||||
//
|
||||
// add new settings type here
|
||||
// ...
|
||||
|
|
@ -2421,6 +2422,17 @@ typedef union {
|
|||
icsFire2DeviceStatus fire2Status;
|
||||
icsVcan4DeviceStatus vcan4Status;
|
||||
} icsDeviceStatus;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int8_t szName[128]; //Adaptor name - ASCII Null terminated
|
||||
int8_t szDeviceName[64]; //Device name - ASCII Null terminated
|
||||
uint32_t Status; //Adaptor Status, 0 for disabled, 1 for enabled
|
||||
uint8_t bMAC_Address[6]; // The Media Access Control (MAC) Address of the Network interface in the PC that is to be connected to the vehicle.
|
||||
uint8_t bIPV6_Address[16]; //The Ipv6 address assigned to the Network interface. No compressed or short form notation// If not available, all bytes are set to zero to imply the absence of an address.
|
||||
uint8_t bIPV4_Address[4]; // The Ipv4 address assigned to the Network interface. If not available, all bytes are set to zero.
|
||||
} NETWORK_ADAPTER_INFO;
|
||||
|
||||
#ifndef INTREPID_NO_CHECK_STRUCT_SIZE
|
||||
|
||||
#if defined(__cplusplus) && (__cplusplus > 199711L)
|
||||
|
|
|
|||
|
|
@ -8,93 +8,159 @@
|
|||
typedef uint8_t byte; // Typedef helper for the following include
|
||||
#include "icsneo/icsnVC40.h" // Definitions for structs
|
||||
|
||||
// From coremini.h
|
||||
#define MAX_BIT_SMASH_ARBIDS (4)
|
||||
#define BIT_SMASH_OPTION_EXTENDED (1)
|
||||
#define BIT_SMASH_OPTION_REMOTE (2)
|
||||
#define BIT_SMASH_OPTION_BUSTEST (4)
|
||||
#define BIT_SMASH_OPTION_WHITELIST (8)
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
//Basic Functions
|
||||
extern int DLLExport icsneoFindDevices(NeoDeviceEx* pNeoDeviceEx, int* pNumDevices, unsigned int* DeviceTypes, unsigned int numDeviceTypes,POptionsFindNeoEx* pOptionsNeoEx, unsigned int* reserved);
|
||||
extern int DLLExport icsneoFindNeoDevices(unsigned long DeviceTypes, NeoDevice* pNeoDevice, int* pNumDevices);
|
||||
extern int DLLExport icsneoOpenNeoDevice(NeoDevice* pNeoDevice, void** hObject, unsigned char* bNetworkIDs, int bConfigRead, int bSyncToPC);
|
||||
extern int DLLExport icsneoClosePort(void* hObject, int* pNumberOfErrors);
|
||||
extern void DLLExport icsneoFreeObject(void* hObject);
|
||||
extern int DLLExport icsneoSerialNumberToString(unsigned long serial, char* data, unsigned long data_size);
|
||||
extern int LegacyDLLExport icsneoFindDevices(NeoDeviceEx* pNeoDeviceEx, int* pNumDevices, unsigned int* DeviceTypes, unsigned int numDeviceTypes,POptionsFindNeoEx* pOptionsNeoEx, unsigned int* reserved);
|
||||
extern int LegacyDLLExport icsneoFindNeoDevices(unsigned long DeviceTypes, NeoDevice* pNeoDevice, int* pNumDevices);
|
||||
extern int LegacyDLLExport icsneoOpenNeoDevice(NeoDevice* pNeoDevice, void** hObject, unsigned char* bNetworkIDs, int bConfigRead, int bSyncToPC);
|
||||
extern int LegacyDLLExport icsneoOpenDevice(NeoDeviceEx* pNeoDeviceEx, void** hObject, unsigned char* bNetworkIDs, int bConfigRead, int iOptions, OptionsOpenNeoEx* stOptionsOpenNeoEx, unsigned long reserved);
|
||||
extern int LegacyDLLExport icsneoClosePort(void* hObject, int* pNumberOfErrors);
|
||||
extern void LegacyDLLExport icsneoFreeObject(void* hObject);
|
||||
extern int LegacyDLLExport icsneoOpenDevice(NeoDeviceEx* pNeoDeviceEx, void** hObject, unsigned char* bNetworkIDs, int bConfigRead, int iOptions, OptionsOpenNeoEx* stOptionsOpenNeoEx, unsigned long reserved);
|
||||
|
||||
//Message Functions
|
||||
extern int DLLExport icsneoGetMessages(void* hObject, icsSpyMessage* pMsg, int* pNumberOfMessages, int* pNumberOfErrors);
|
||||
extern int DLLExport icsneoTxMessages(void* hObject, icsSpyMessage* pMsg, int lNetworkID, int lNumMessages);
|
||||
extern int DLLExport icsneoTxMessagesEx(void* hObject,icsSpyMessage* pMsg, unsigned int lNetworkID, unsigned int lNumMessages, unsigned int* NumTxed, unsigned int zero2);
|
||||
extern int DLLExport icsneoWaitForRxMessagesWithTimeOut(void* hObject, unsigned int iTimeOut);
|
||||
extern int DLLExport icsneoEnableNetworkRXQueue(void* hObject, int iEnable);
|
||||
extern int DLLExport icsneoGetTimeStampForMsg(void* hObject, icsSpyMessage* pMsg, double* pTimeStamp);
|
||||
extern void DLLExport icsneoGetISO15765Status(void* hObject, int lNetwork, int lClearTxStatus, int lClearRxStatus, int*lTxStatus, int*lRxStatus);
|
||||
extern void DLLExport icsneoSetISO15765RxParameters(void* hObject, int lNetwork, int lEnable, spyFilterLong* pFF_CFMsgFilter, icsSpyMessage* pTxMsg,
|
||||
extern int LegacyDLLExport icsneoGetMessages(void* hObject, icsSpyMessage* pMsg, int* pNumberOfMessages, int* pNumberOfErrors);
|
||||
extern int LegacyDLLExport icsneoTxMessages(void* hObject, icsSpyMessage* pMsg, int lNetworkID, int lNumMessages);
|
||||
extern int LegacyDLLExport icsneoTxMessagesEx(void* hObject,icsSpyMessage* pMsg, unsigned int lNetworkID, unsigned int lNumMessages, unsigned int* NumTxed, unsigned int zero2);
|
||||
extern int LegacyDLLExport icsneoWaitForRxMessagesWithTimeOut(void* hObject, unsigned int iTimeOut);
|
||||
extern int LegacyDLLExport icsneoEnableNetworkRXQueue(void* hObject, int iEnable);
|
||||
extern int LegacyDLLExport icsneoGetTimeStampForMsg(void* hObject, icsSpyMessage* pMsg, double* pTimeStamp);
|
||||
extern void LegacyDLLExport icsneoGetISO15765Status(void* hObject, int lNetwork, int lClearTxStatus, int lClearRxStatus, int*lTxStatus, int*lRxStatus);
|
||||
extern void LegacyDLLExport icsneoSetISO15765RxParameters(void* hObject, int lNetwork, int lEnable, spyFilterLong* pFF_CFMsgFilter, icsSpyMessage* pTxMsg,
|
||||
int lCFTimeOutMs, int lFlowCBlockSize, int lUsesExtendedAddressing, int lUseHardwareIfPresent);
|
||||
|
||||
//Device Functions
|
||||
extern int DLLExport icsneoGetConfiguration(void* hObject, unsigned char* pData, int* lNumBytes);
|
||||
extern int DLLExport icsneoSendConfiguration(void* hObject, unsigned char* pData, int lNumBytes);
|
||||
extern int DLLExport icsneoGetFireSettings(void* hObject, SFireSettings* pSettings, int iNumBytes);
|
||||
extern int DLLExport icsneoSetFireSettings(void* hObject, SFireSettings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
extern int LegacyDLLExport icsneoGetConfiguration(void* hObject, unsigned char* pData, int* lNumBytes);
|
||||
extern int LegacyDLLExport icsneoSendConfiguration(void* hObject, unsigned char* pData, int lNumBytes);
|
||||
extern int LegacyDLLExport icsneoGetFireSettings(void* hObject, SFireSettings* pSettings, int iNumBytes);
|
||||
extern int LegacyDLLExport icsneoSetFireSettings(void* hObject, SFireSettings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
|
||||
extern int DLLExport icsneoGetVCAN3Settings(void* hObject, SVCAN3Settings* pSettings, int iNumBytes);
|
||||
extern int DLLExport icsneoSetVCAN3Settings(void* hObject, SVCAN3Settings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
extern int LegacyDLLExport icsneoGetVCAN3Settings(void* hObject, SVCAN3Settings* pSettings, int iNumBytes);
|
||||
extern int LegacyDLLExport icsneoSetVCAN3Settings(void* hObject, SVCAN3Settings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
|
||||
extern int DLLExport icsneoGetFire2Settings(void* hObject, SFire2Settings* pSettings, int iNumBytes);
|
||||
extern int DLLExport icsneoSetFire2Settings(void* hObject, SFire2Settings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
extern int LegacyDLLExport icsneoGetFire2Settings(void* hObject, SFire2Settings* pSettings, int iNumBytes);
|
||||
extern int LegacyDLLExport icsneoSetFire2Settings(void* hObject, SFire2Settings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
|
||||
extern int DLLExport icsneoGetVCANRFSettings(void* hObject, SVCANRFSettings* pSettings, int iNumBytes);
|
||||
extern int DLLExport icsneoSetVCANRFSettings(void* hObject, SVCANRFSettings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
extern int LegacyDLLExport icsneoGetVCANRFSettings(void* hObject, SVCANRFSettings* pSettings, int iNumBytes);
|
||||
extern int LegacyDLLExport icsneoSetVCANRFSettings(void* hObject, SVCANRFSettings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
|
||||
extern int DLLExport icsneoGetVCAN412Settings(void* hObject, SVCAN412Settings* pSettings, int iNumBytes);
|
||||
extern int DLLExport icsneoSetVCAN412Settings(void* hObject, SVCAN412Settings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
extern int LegacyDLLExport icsneoGetVCAN412Settings(void* hObject, SVCAN412Settings* pSettings, int iNumBytes);
|
||||
extern int LegacyDLLExport icsneoSetVCAN412Settings(void* hObject, SVCAN412Settings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
|
||||
extern int DLLExport icsneoGetRADGalaxySettings(void* hObject, SRADGalaxySettings* pSettings, int iNumBytes);
|
||||
extern int DLLExport icsneoSetRADGalaxySettings(void* hObject, SRADGalaxySettings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
extern int LegacyDLLExport icsneoGetRADGalaxySettings(void* hObject, SRADGalaxySettings* pSettings, int iNumBytes);
|
||||
extern int LegacyDLLExport icsneoSetRADGalaxySettings(void* hObject, SRADGalaxySettings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
|
||||
extern int DLLExport icsneoGetRADStar2Settings(void* hObject, SRADStar2Settings* pSettings, int iNumBytes);
|
||||
extern int DLLExport icsneoSetRADStar2Settings(void* hObject, SRADStar2Settings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
extern int LegacyDLLExport icsneoGetRADStar2Settings(void* hObject, SRADStar2Settings* pSettings, int iNumBytes);
|
||||
extern int LegacyDLLExport icsneoSetRADStar2Settings(void* hObject, SRADStar2Settings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
|
||||
extern int DLLExport icsneoSetBitRate(void* hObject, int BitRate, int NetworkID);
|
||||
extern int DLLExport icsneoSetFDBitRate(void* hObject, int BitRate, int NetworkID);
|
||||
extern int DLLExport icsneoGetDeviceParameters(void* hObject, char* pParameter, char* pValues, short ValuesLength);
|
||||
extern int DLLExport icsneoSetDeviceParameters(void* hObject, char* pParmValue, int* pErrorIndex, int bSaveToEEPROM);
|
||||
extern int LegacyDLLExport icsneoSetBitRate(void* hObject, int BitRate, int NetworkID);
|
||||
extern int LegacyDLLExport icsneoSetBitRateEx(void* hObject, unsigned long BitRate, int NetworkID, int iOptions);
|
||||
extern int LegacyDLLExport icsneoSetFDBitRate(void* hObject, int BitRate, int NetworkID);
|
||||
|
||||
extern int LegacyDLLExport icsneoGetDeviceParameters(void* hObject, char* pParameter, char* pValues, short ValuesLength);
|
||||
extern int LegacyDLLExport icsneoSetDeviceParameters(void* hObject, char* pParmValue, int* pErrorIndex, int bSaveToEEPROM);
|
||||
|
||||
extern int LegacyDLLExport icsneoGetVCAN4Settings(void* hObject, SVCAN4Settings* pSettings, int iNumBytes);
|
||||
extern int LegacyDLLExport icsneoSetVCAN4Settings(void* hObject, SVCAN4Settings* pSettings, int iNumBytes, int bSaveToEEPROM);
|
||||
|
||||
extern int LegacyDLLExport icsneoGetDeviceSettingsType(void* hObject, EPlasmaIonVnetChannel_t vnetSlot, EDeviceSettingsType* pDeviceSettingsType);
|
||||
extern int LegacyDLLExport icsneoSetDeviceSettings(void* hObject, SDeviceSettings* pSettings, int iNumBytes, int bSaveToEEPROM, EPlasmaIonVnetChannel_t vnetSlot);
|
||||
extern int LegacyDLLExport icsneoGetDeviceSettings(void* hObject, SDeviceSettings* pSettings, int iNumBytes, EPlasmaIonVnetChannel_t vnetSlot);
|
||||
|
||||
extern int LegacyDLLExport icsneoSetUSBLatency(NeoDevice* pNeoDevice, unsigned long LatencyVal);
|
||||
|
||||
extern unsigned int LegacyDLLExport icsneoGetCANControllerClockFrequency(void* hObject, int lNetworkID);
|
||||
extern int LegacyDLLExport icsneoSetCANParameters(void* hObject,unsigned int baudRatePrescaler,unsigned int propagationTqs,unsigned int phase1Tqs,unsigned int phase2Tqs,unsigned int syncJumpWidthTqs,unsigned int optionBits,int lNetworkID);
|
||||
extern int LegacyDLLExport icsneoSetCANParametersPhilipsSJA1000(void* hObject,unsigned int btr0,unsigned int btr1,unsigned int optionBits,int lNetworkID);
|
||||
|
||||
//Remote Device Functions
|
||||
extern int LegacyDLLExport icsneoOpenRemoteNeoDevice(const char* pIPAddress,NeoDevice* pNeoDevice,void** hObject,unsigned char* bNetworkIDs,int iOptions);
|
||||
extern int LegacyDLLExport icsneoFindRemoteNeoDevices(const char* pIPAddress, NeoDevice* pNeoDevice, int* pNumDevices);
|
||||
|
||||
//Error Functions
|
||||
extern int DLLExport icsneoGetLastAPIError(void* hObject, unsigned long* pErrorNumber);
|
||||
extern int DLLExport icsneoGetErrorMessages(void* hObject, int* pErrorMsgs, int* pNumberOfErrors);
|
||||
extern int DLLExport icsneoGetErrorInfo(int lErrorNumber, TCHAR*szErrorDescriptionShort, TCHAR*szErrorDescriptionLong, int* lMaxLengthShort, int* lMaxLengthLong,int* lErrorSeverity,int* lRestartNeeded);
|
||||
extern int LegacyDLLExport icsneoGetLastAPIError(void* hObject, unsigned long* pErrorNumber);
|
||||
extern int LegacyDLLExport icsneoGetErrorMessages(void* hObject, int* pErrorMsgs, int* pNumberOfErrors);
|
||||
extern int LegacyDLLExport icsneoGetErrorInfo(int lErrorNumber, TCHAR*szErrorDescriptionShort, TCHAR*szErrorDescriptionLong, int* lMaxLengthShort, int* lMaxLengthLong,int* lErrorSeverity,int* lRestartNeeded);
|
||||
|
||||
//ISO15765-2 Functions
|
||||
extern int DLLExport icsneoISO15765_EnableNetworks(void* hObject, unsigned long ulNetworks);
|
||||
extern int DLLExport icsneoISO15765_DisableNetworks(void* hObject);
|
||||
extern int DLLExport icsneoISO15765_TransmitMessage(void* hObject, unsigned long ulNetworkID, stCM_ISO157652_TxMessage* pMsg, unsigned long ulBlockingTimeout);
|
||||
extern int DLLExport icsneoISO15765_ReceiveMessage(void* hObject,int ulNetworkID, stCM_ISO157652_RxMessage* pMsg);
|
||||
extern int LegacyDLLExport icsneoISO15765_EnableNetworks(void* hObject, unsigned long ulNetworks);
|
||||
extern int LegacyDLLExport icsneoISO15765_DisableNetworks(void* hObject);
|
||||
extern int LegacyDLLExport icsneoISO15765_TransmitMessage(void* hObject, unsigned long ulNetworkID, stCM_ISO157652_TxMessage* pMsg, unsigned long ulBlockingTimeout);
|
||||
extern int LegacyDLLExport icsneoISO15765_TransmitMessageEx(void* hObject,unsigned long ulNetworkID,ISO15765_2015_TxMessage* pMsg,unsigned long ulBlockingTimeout);
|
||||
extern int LegacyDLLExport icsneoISO15765_ReceiveMessage(void* hObject, int ulNetworkID, stCM_ISO157652_RxMessage* pMsg);
|
||||
|
||||
//General Utility Functions
|
||||
extern int DLLExport icsneoValidateHObject(void* hObject);
|
||||
extern int DLLExport icsneoGetDLLVersion(void);
|
||||
extern int DLLExport icsneoGetSerialNumber(void* hObject, unsigned int*iSerialNumber);
|
||||
extern int DLLExport icsneoStartSockServer(void* hObject, int iPort);
|
||||
extern int DLLExport icsneoStopSockServer(void* hObject);
|
||||
extern int LegacyDLLExport icsneoValidateHObject(void* hObject);
|
||||
|
||||
extern int LegacyDLLExport icsneoGetDLLVersion(void);
|
||||
extern void LegacyDLLExport icsneoGetDLLVersionEx(unsigned long* dwMSVersion, unsigned long* dwLSVersion);
|
||||
|
||||
extern int LegacyDLLExport icsneoGetSerialNumber(void* hObject, unsigned int*iSerialNumber);
|
||||
extern int LegacyDLLExport icsneoSerialNumberFromString(unsigned long* serial, char* data);
|
||||
extern int LegacyDLLExport icsneoSerialNumberToString(unsigned long serial, char* data, unsigned long data_size);
|
||||
|
||||
extern int LegacyDLLExport icsneoStartSockServer(void* hObject, int iPort);
|
||||
extern int LegacyDLLExport icsneoStopSockServer(void* hObject);
|
||||
|
||||
//CoreMini Script functions
|
||||
extern int DLLExport icsneoScriptStart(void* hObject, int iLocation);
|
||||
extern int DLLExport icsneoScriptStop(void* hObject);
|
||||
extern int DLLExport icsneoScriptLoad(void* hObject, const unsigned char* bin, unsigned long len_bytes, int iLocation);
|
||||
extern int DLLExport icsneoScriptClear(void* hObject, int iLocation);
|
||||
extern int DLLExport icsneoScriptStartFBlock(void* hObject,unsigned int fb_index);
|
||||
extern int DLLExport icsneoScriptGetFBlockStatus(void* hObject, unsigned int fb_index, int* piRunStatus);
|
||||
extern int DLLExport icsneoScriptStopFBlock(void* hObject,unsigned int fb_index);
|
||||
extern int DLLExport icsneoScriptGetScriptStatus(void* hObject, int* piStatus);
|
||||
extern int DLLExport icsneoScriptReadAppSignal(void* hObject, unsigned int iIndex, double*dValue);
|
||||
extern int DLLExport icsneoScriptWriteAppSignal(void* hObject, unsigned int iIndex, double dValue);
|
||||
extern int LegacyDLLExport icsneoScriptStart(void* hObject, int iLocation);
|
||||
extern int LegacyDLLExport icsneoScriptStop(void* hObject);
|
||||
extern int LegacyDLLExport icsneoScriptLoad(void* hObject, const unsigned char* bin, unsigned long len_bytes, int iLocation);
|
||||
extern int LegacyDLLExport icsneoScriptClear(void* hObject, int iLocation);
|
||||
extern int LegacyDLLExport icsneoScriptStartFBlock(void* hObject,unsigned int fb_index);
|
||||
extern int LegacyDLLExport icsneoScriptGetFBlockStatus(void* hObject, unsigned int fb_index, int* piRunStatus);
|
||||
extern int LegacyDLLExport icsneoScriptStopFBlock(void* hObject,unsigned int fb_index);
|
||||
extern int LegacyDLLExport icsneoScriptGetScriptStatus(void* hObject, int* piStatus);
|
||||
extern int LegacyDLLExport icsneoScriptReadAppSignal(void* hObject, unsigned int iIndex, double*dValue);
|
||||
extern int LegacyDLLExport icsneoScriptWriteAppSignal(void* hObject, unsigned int iIndex, double dValue);
|
||||
|
||||
//Deprecated (but still suppored in the DLL)
|
||||
extern int DLLExport icsneoOpenPortEx(void* lPortNumber, int lPortType, int lDriverType, int lIPAddressMSB, int lIPAddressLSBOrBaudRate, int bConfigRead, unsigned char* bNetworkID, int* hObject);
|
||||
extern int DLLExport icsneoOpenPort(int lPortNumber, int lPortType, int lDriverType, unsigned char* bNetworkID, unsigned char* bSCPIDs, int* hObject);
|
||||
extern int DLLExport icsneoEnableNetworkCom(void* hObject, int Enable);
|
||||
extern int DLLExport icsneoFindAllCOMDevices(int lDriverType, int lGetSerialNumbers, int lStopAtFirst, int lUSBCommOnly, int* p_lDeviceTypes, int* p_lComPorts, int* p_lSerialNumbers, int*lNumDevices);
|
||||
extern int LegacyDLLExport icsneoOpenPortEx(void* lPortNumber, int lPortType, int lDriverType, int lIPAddressMSB, int lIPAddressLSBOrBaudRate, int bConfigRead, unsigned char* bNetworkID, int* hObject);
|
||||
extern int LegacyDLLExport icsneoOpenPort(int lPortNumber, int lPortType, int lDriverType, unsigned char* bNetworkID, unsigned char* bSCPIDs, int* hObject);
|
||||
extern int LegacyDLLExport icsneoFindAllCOMDevices(int lDriverType, int lGetSerialNumbers, int lStopAtFirst, int lUSBCommOnly, int* p_lDeviceTypes, int* p_lComPorts, int* p_lSerialNumbers, int*lNumDevices);
|
||||
extern int LegacyDLLExport icsneoOpenNeoDeviceByChannels(NeoDevice* pNeoDevice,void** hObject,unsigned char* uChannels,int iSize,int bConfigRead,int iOptions);
|
||||
extern int LegacyDLLExport icsneoLockChannels(void* hObject, unsigned char* uChannels, int iSize);
|
||||
extern int LegacyDLLExport icsneoUnlockChannels(void* hObject, unsigned char* uChannels, int iSize);
|
||||
extern int LegacyDLLExport icsneoGetChannelLockStatus(void* hObject, unsigned char* uChannels, int iSize);
|
||||
|
||||
//Enable Network Com Functions
|
||||
extern int LegacyDLLExport icsneoEnableNetworkComEx(void* hObject, int iEnable, int iNetId);
|
||||
extern int LegacyDLLExport icsneoEnableNetworkCom(void* hObject, int Enable);
|
||||
|
||||
//Firmware Info/Update calls
|
||||
extern int LegacyDLLExport icsneoForceFirmwareUpdate(void* hObject);
|
||||
extern int LegacyDLLExport icsneoGetHWFirmwareInfo(void* hObject, stAPIFirmwareInfo* pInfo);
|
||||
extern int LegacyDLLExport icsneoGetDLLFirmwareInfo(void* hObject, stAPIFirmwareInfo* pInfo);
|
||||
extern int LegacyDLLExport icsneoGetDLLFirmwareInfoEx(void* hObject, stAPIFirmwareInfo* pInfo, EPlasmaIonVnetChannel_t vnetSlot);
|
||||
extern int LegacyDLLExport icsneoFirmwareUpdateRequired(void* hObject);
|
||||
|
||||
//J2534 API functions
|
||||
extern int LegacyDLLExport icsneoJ2534Cmd(void* hObject, unsigned char* CmdBuf, short Len, void* pVoid);
|
||||
extern int LegacyDLLExport icsneoSendRawCmds(void* hObject, icsneoVICommand* pCmdMsgs, int lNumOfCmds);
|
||||
extern int LegacyDLLExport icsneoEnableBusVoltageMonitor(void* hObject, unsigned int enable, unsigned int reserved);
|
||||
extern int LegacyDLLExport icsneoGetBusVoltage(void* hObject, unsigned long* pVBusVoltage, unsigned int reserved);
|
||||
extern int LegacyDLLExport icsneoGetNetidforSlaveVNETs(size_t* NetworkIndex, EPlasmaIonVnetChannel_t vnetSlot);
|
||||
extern int LegacyDLLExport icsneoGetVnetSimpleNetid(size_t* FullNetID);
|
||||
extern int LegacyDLLExport icsneoEnableDOIPLine(void* hObject, bool bActivate);
|
||||
extern int LegacyDLLExport icsneoGetMiniportAdapterInfo(void* hObject, NETWORK_ADAPTER_INFO* aInfo);
|
||||
|
||||
// Hardware Time API functions
|
||||
extern int LegacyDLLExport icsneoSendHWTimeRequest(void* hObject);
|
||||
extern int LegacyDLLExport icsneoReceiveHWTimeResponse(void* hObject, double* TimeHardware, unsigned long TimeOut);
|
||||
|
||||
//Bitsmash functions
|
||||
extern int LegacyDLLExport icsneoEnableBitSmash(void* hObject,int netId,unsigned int numWaitBits,unsigned int numSmashBits,unsigned int numFrames,unsigned int timeout_ms,unsigned int optionBits,unsigned int numArbIds,unsigned int arbIds[MAX_BIT_SMASH_ARBIDS]);
|
||||
extern int LegacyDLLExport icsneoDisableBitSmash(void* hObject, unsigned int reservedZero);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
#include "icsneo/platform/posix/linux/dynamiclib.h"
|
||||
#endif
|
||||
|
||||
// Nothing special is needed to export
|
||||
#define DLLExport
|
||||
#define DLLExport __attribute__((visibility("default")))
|
||||
#define LegacyDLLExport DLLExport
|
||||
|
||||
// #ifndef ICSNEO_NO_AUTO_DESTRUCT
|
||||
// #define ICSNEO_DESTRUCTOR __attribute__((destructor));
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
#else
|
||||
#define DLLExport __declspec(dllimport)
|
||||
#endif
|
||||
#define LegacyDLLExport _stdcall DLLExport
|
||||
|
||||
// MSVC does not have the ability to specify a destructor
|
||||
#define ICSNEO_DESTRUCTOR
|
||||
|
|
|
|||
|
|
@ -0,0 +1,211 @@
|
|||
|
||||
LIBRARY icsneolegacy
|
||||
|
||||
EXPORTS
|
||||
icsneoOpenPort @21
|
||||
icsneoClosePort @22
|
||||
icsneoGetMessages @23
|
||||
icsneoTxMessages @24
|
||||
icsneoFreeObject @25
|
||||
icsneoGetErrorMessages @26
|
||||
icsneoStartSockServer @29
|
||||
icsneoSendConfiguration @30
|
||||
icsneoGetSerialNumber @32
|
||||
icsneoFindAllUSBDevices @33
|
||||
icsneoOpenPortEx @34
|
||||
icsneoStopSockServer @35
|
||||
icsneoGetErrorInfo @36
|
||||
icsneoGetDLLVersion @37
|
||||
icsneoGetConfiguration @38
|
||||
icsneoFindAllCOMDevices @39
|
||||
icsneoGetISO15765Status @40
|
||||
icsneoSetISO15765RxParameters @41
|
||||
icsneoSetPerformanceParameters @42
|
||||
icsneoEnableNetworkCom @ 43
|
||||
icsneoGetPerformanceParameters @ 44
|
||||
icsneoSetupISO15765HwSupport @ 45
|
||||
icsneoWaitForRxMessagesWithTimeOut @ 46
|
||||
icsneoGetErrorInfoW @47
|
||||
icsneoGetOpenPorts @ 48
|
||||
icsneoGetPerformanceTimer @ 49
|
||||
icsneoFindFirstFreeDevice @ 50
|
||||
icsneoJ2534Cmd @ 51
|
||||
|
||||
icsneoScriptStartFBlock @ 52
|
||||
icsneoScriptStopFBlock @ 53
|
||||
icsneoScriptGetFBlockStatus @ 54
|
||||
icsneoScriptReadTxMessage @ 55
|
||||
icsneoScriptWriteTxMessage @ 56
|
||||
icsneoScriptStart @ 57
|
||||
icsneoScriptStop @ 58
|
||||
|
||||
icsneoFindNeoDevices @ 62
|
||||
icsneoOpenNeoDevice @ 63
|
||||
icsneoOpenNeoDeviceBySerialNumber @ 64
|
||||
|
||||
icsneoForceFirmwareUpdate @ 65
|
||||
icsneoGetHWFirmwareInfo @ 66
|
||||
icsneoGetDLLFirmwareInfo @ 67
|
||||
|
||||
icsneoSetupISO15765HwSupportEx @ 68
|
||||
|
||||
icsneoSetBitRate @ 69
|
||||
|
||||
icsneoReadSDCard @ 72
|
||||
icsneoGetTimeStampForMsg @ 73
|
||||
|
||||
icsneoWriteSDCard @ 76
|
||||
|
||||
icsneoScriptLoad @ 77
|
||||
icsneoScriptClear @ 78
|
||||
icsneoGetLastAPIError @ 79
|
||||
icsneoValidateHObject @ 80
|
||||
|
||||
icsneoScriptReadAppSignal @ 81
|
||||
icsneoScriptWriteAppSignal @ 82
|
||||
|
||||
icsneoScriptReadISO15765_2_TxMessage @ 84
|
||||
icsneoScriptWriteISO15765_2_TxMessage @ 85
|
||||
icsneoScriptReadRxMessage @ 86
|
||||
icsneoScriptWriteRxMessage @ 87
|
||||
|
||||
icsneoScriptGetScriptStatus @ 91
|
||||
|
||||
icsneoEnableNetworkRXQueue @ 94
|
||||
icsneoGetFireSettings @ 95
|
||||
icsneoSetFireSettings @ 96
|
||||
|
||||
icsneoGetVCAN3Settings @ 97
|
||||
icsneoSetVCAN3Settings @ 98
|
||||
|
||||
icsneoGetDeviceParameters @99
|
||||
icsneoSetDeviceParameters @100
|
||||
|
||||
icsneoSetReflashCallback @101
|
||||
|
||||
icsneoSetReflashDisplayCallbacks @102
|
||||
icsneoClearReflashDisplayCallbacks @103
|
||||
|
||||
icsneoGetStoredFirmwareInfo @104
|
||||
icsneoDownloadISO15765_2_TXScript @ 105
|
||||
icsneoTransmitISO15765_2_Message @106
|
||||
icsneoClearISO15765_2_TxScript @ 107
|
||||
|
||||
icsneoGetDLLVersionEx @108
|
||||
|
||||
icsneoEnable_ISO15765_2_By_Network @ 111
|
||||
icsneoDisable_ISO15765_2 @ 112
|
||||
icsneoSetISO15765_2_FlowCtlID @ 113
|
||||
icsneoClearISO15765_2_FlowCtlID @ 114
|
||||
icsneoClearAllISO15765_2_FlowCtlIDs @ 115
|
||||
|
||||
icsneoSetContext @ 116
|
||||
icsneoFindNeoDevicesEx @ 117
|
||||
icsneoOpenNeoDeviceEx @ 118
|
||||
|
||||
icsneoFindRemoteNeoDevices @ 120
|
||||
icsneoOpenRemoteNeoDevice @ 121
|
||||
icsneoISO15765_EnableNetworks @122
|
||||
icsneoISO15765_DisableNetworks @123
|
||||
icsneoISO15765_TransmitMessage @124
|
||||
|
||||
icsneoGetCANControllerClockFrequency @129
|
||||
icsneoSetCANParameters @130
|
||||
icsneoSetCANParametersPhilipsSJA1000 @131
|
||||
|
||||
icsneoSendTextApi @132
|
||||
icsneoGetTextApi @133
|
||||
icsneoScriptReadISO15765_2_RxMessage @ 134
|
||||
icsneoScriptWriteISO15765_2_RxMessage @ 135
|
||||
|
||||
icsneoScriptLoadReadBin @ 136
|
||||
icsneoEnableCoreMiniUsbFilter @ 137
|
||||
icsneoConfigureNetworkMsgQueue @ 138
|
||||
icsneoEnableBusVoltageMonitor @ 139
|
||||
icsneoGetBusVoltage @ 140
|
||||
icsneoEnableBitSmash @141
|
||||
icsneoDisableBitSmash @142
|
||||
icsneoReceiveHWTimeResponse @143
|
||||
icsneoSendHWTimeRequest @144
|
||||
icsneoSetUSBLatency @145
|
||||
icsneoLoadDefaultSettings @146
|
||||
icsneoGetAllChipVersions @149
|
||||
icsneoSetBitRateEx @ 150
|
||||
icsneoScriptGetScriptStatusEx @ 151
|
||||
icsneoOpenNeoDeviceByChannels @ 152
|
||||
icsneoGetChannelLockStatus @ 153
|
||||
icsneoRequestEnterSleepMode @ 154
|
||||
icsneoEnableNetworkComEx @ 155
|
||||
icsneoLockChannels @ 156
|
||||
icsneoUnlockChannels @ 157
|
||||
|
||||
icsneoGetFireVnetSettings @ 160
|
||||
icsneoSetFireVnetSettings @ 161
|
||||
|
||||
icsneoGetFire2Settings @ 162
|
||||
icsneoSetFire2Settings @ 163
|
||||
icsneoSetFDBitRate @ 164
|
||||
|
||||
icsneoTxMessagesEx @165
|
||||
|
||||
icsneoGetVCANRFSettings @ 167
|
||||
icsneoSetVCANRFSettings @ 168
|
||||
|
||||
icsneoFirmwareUpdateRequired @ 169
|
||||
|
||||
icsneoGetRADGalaxySettings @170
|
||||
icsneoSetRADGalaxySettings @171
|
||||
|
||||
icsneoGetNetidforSlaveVNETs @172
|
||||
icsneoGetVnetSimpleNetid @173
|
||||
icsneoISO15765_ReceiveMessage @174
|
||||
icsneoGetDLLFirmwareInfoEx @175
|
||||
icsneoBase36enc @176
|
||||
icsneoGetRADStar2Settings @177
|
||||
icsneoSetRADStar2Settings @178
|
||||
|
||||
icsneoGetBackupPowerEnabled @179
|
||||
icsneoSetBackupPowerEnabled @180
|
||||
icsneoGetBackupPowerReady @181
|
||||
icsneoSerialNumberFromString @182
|
||||
icsneoSerialNumberToString @183
|
||||
icsneoISO15765_TransmitMessageEx @184
|
||||
|
||||
icsneoGetActiveVNETChannel @ 189
|
||||
icsneoSetActiveVNETChannel @ 190
|
||||
|
||||
icsneoGetDeviceSettings @191
|
||||
icsneoSetDeviceSettings @192
|
||||
icsneoGetDeviceSettingsType @193
|
||||
|
||||
icsneoGetVCAN412Settings @ 194
|
||||
icsneoSetVCAN412Settings @ 195
|
||||
|
||||
icsneoGetVividCANSettings @ 196
|
||||
icsneoSetVividCANSettings @ 197
|
||||
icsneoFindNeoDevicesNewStyle @ 198
|
||||
|
||||
icsneoGetDeviceStatus @ 202
|
||||
|
||||
icsneoFindDevices @ 203
|
||||
icsneoOpenDevice @ 204
|
||||
|
||||
icsneoEnableDOIPLine @ 205
|
||||
icsneoGetMiniportAdapterInfo @ 206
|
||||
|
||||
icsneoGetVCAN4Settings @ 207
|
||||
icsneoSetVCAN4Settings @ 208
|
||||
|
||||
icsneoReadWritePHYSettings @ 214
|
||||
|
||||
icsneoRequestDiskDetails @ 217
|
||||
icsneoRequestDiskFormat @ 218
|
||||
icsneoRequestDiskFormatProgress @ 219
|
||||
icsneoRequestDiskFormatCancel @ 220
|
||||
|
||||
icsneoGetRADGigastarSettings @ 221
|
||||
icsneoSetRADGigastarSettings @ 222
|
||||
icsneoGetRADA2BSettings @ 223
|
||||
icsneoSetRADA2BSettings @ 224
|
||||
|
||||
icsneoScriptClearRxMessage @225
|
||||
Loading…
Reference in New Issue