sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into v0.3.0-dev

v0.3.0-dev
Paul Hollinsky 2021-06-11 18:54:36 -04:00
parent 8c9d3a5e6a da4ab6ef62
commit e5bf87ba7d
4 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/icsneolegacy/icsneolegacy.cpp
View File

@ -1024,7 +1024,7 @@ int LegacyDLLExport icsneoGetDLLFirmwareInfoEx(void *hObject, stAPIFirmwareInfo
int LegacyDLLExport icsneoJ2534Cmd(void *hObject, unsigned char *CmdBuf, short Len, void *pVoid) int LegacyDLLExport icsneoJ2534Cmd(void *hObject, unsigned char *CmdBuf, short Len, void *pVoid)
{ {
unsigned long *pTmp = nullptr; uint64_t* pTmp = nullptr;
int iRetVal = 0, iNumBytes = 0, NetworkID; int iRetVal = 0, iNumBytes = 0, NetworkID;
if (!icsneoValidateHObject(hObject)) if (!icsneoValidateHObject(hObject))
@ -1045,15 +1045,18 @@ int LegacyDLLExport icsneoJ2534Cmd(void *hObject, unsigned char *CmdBuf, short L
break; break;
case J2534NVCMD_GetNetworkBaudRate: case J2534NVCMD_GetNetworkBaudRate:
{
pTmp = (uint64_t *)&CmdBuf[1]; pTmp = (uint64_t *)&CmdBuf[1];
NetworkID = (uint16_t)*pTmp; NetworkID = (uint16_t)*pTmp;
pTmp = (uint64_t *)&CmdBuf[5]; pTmp = (uint64_t *)&CmdBuf[5];
//Ignoring 2G hardwares here - CmdBuf[9] //Ignoring 2G hardwares here - CmdBuf[9]
*pTmp = icsneo_getBaudrate(device, NetworkID); int64_t ret = icsneo_getBaudrate(device, NetworkID);
if (ret < 0)
return false;
*pTmp = static_cast<uint64_t>(ret);
break; break;
}
case J2534NVCMD_SetCANFDRate: case J2534NVCMD_SetCANFDRate:
pTmp = (uint64_t *)&CmdBuf[1]; pTmp = (uint64_t *)&CmdBuf[1];

6
communication/packet/versionpacket.cpp
View File

@ -8,7 +8,8 @@ std::shared_ptr<VersionMessage> HardwareVersionPacket::DecodeMainToMessage(const
auto msg = std::make_shared<VersionMessage>(VersionMessage::MainChip); auto msg = std::make_shared<VersionMessage>(VersionMessage::MainChip);
optional<DeviceAppVersion>& version = msg->Versions.emplace_back(); msg->Versions.emplace_back();
optional<DeviceAppVersion>& version = msg->Versions.back();
version.emplace(); version.emplace();
version->major = bytestream[1]; version->major = bytestream[1];
version->minor = bytestream[2]; version->minor = bytestream[2];
@ -24,7 +25,8 @@ std::shared_ptr<VersionMessage> HardwareVersionPacket::DecodeSecondaryToMessage(
bytesLeft--; // Disregard command byte bytesLeft--; // Disregard command byte
while(bytesLeft >= 3) { while(bytesLeft >= 3) {
const bool versionValid = bytestream[bytestream.size() - bytesLeft + 0]; const bool versionValid = bytestream[bytestream.size() - bytesLeft + 0];
optional<DeviceAppVersion>& version = msg->Versions.emplace_back(); msg->Versions.emplace_back();
optional<DeviceAppVersion>& version = msg->Versions.back();
if(versionValid) { if(versionValid) {
version.emplace(); version.emplace();
version->major = bytestream[bytestream.size() - bytesLeft + 1]; version->major = bytestream[bytestream.size() - bytesLeft + 1];

2
include/icsneo/platform/windows/dynamiclib.h
View File

@ -8,7 +8,7 @@
#else #else
#define DLLExport __declspec(dllimport) #define DLLExport __declspec(dllimport)
#endif #endif
#define LegacyDLLExport _stdcall DLLExport #define LegacyDLLExport DLLExport _stdcall
// MSVC does not have the ability to specify a destructor // MSVC does not have the ability to specify a destructor
#define ICSNEO_DESTRUCTOR #define ICSNEO_DESTRUCTOR

138
platform/windows/icsneolegacy.def
View File

@ -11,7 +11,7 @@ EXPORTS
icsneoStartSockServer @29 icsneoStartSockServer @29
icsneoSendConfiguration @30 icsneoSendConfiguration @30
icsneoGetSerialNumber @32 icsneoGetSerialNumber @32
icsneoFindAllUSBDevices @33 ; icsneoFindAllUSBDevices @33
icsneoOpenPortEx @34 icsneoOpenPortEx @34
icsneoStopSockServer @35 icsneoStopSockServer @35
icsneoGetErrorInfo @36 icsneoGetErrorInfo @36
@ -20,41 +20,41 @@ EXPORTS
icsneoFindAllCOMDevices @39 icsneoFindAllCOMDevices @39
icsneoGetISO15765Status @40 icsneoGetISO15765Status @40
icsneoSetISO15765RxParameters @41 icsneoSetISO15765RxParameters @41
icsneoSetPerformanceParameters @42 ; icsneoSetPerformanceParameters @42
icsneoEnableNetworkCom @ 43 icsneoEnableNetworkCom @ 43
icsneoGetPerformanceParameters @ 44 ; icsneoGetPerformanceParameters @ 44
icsneoSetupISO15765HwSupport @ 45 ; icsneoSetupISO15765HwSupport @ 45
icsneoWaitForRxMessagesWithTimeOut @ 46 icsneoWaitForRxMessagesWithTimeOut @ 46
icsneoGetErrorInfoW @47 ; icsneoGetErrorInfoW @47
icsneoGetOpenPorts @ 48 ; icsneoGetOpenPorts @ 48
icsneoGetPerformanceTimer @ 49 ; icsneoGetPerformanceTimer @ 49
icsneoFindFirstFreeDevice @ 50 ; icsneoFindFirstFreeDevice @ 50
icsneoJ2534Cmd @ 51 icsneoJ2534Cmd @ 51
icsneoScriptStartFBlock @ 52 icsneoScriptStartFBlock @ 52
icsneoScriptStopFBlock @ 53 icsneoScriptStopFBlock @ 53
icsneoScriptGetFBlockStatus @ 54 icsneoScriptGetFBlockStatus @ 54
icsneoScriptReadTxMessage @ 55 ; icsneoScriptReadTxMessage @ 55
icsneoScriptWriteTxMessage @ 56 ; icsneoScriptWriteTxMessage @ 56
icsneoScriptStart @ 57 icsneoScriptStart @ 57
icsneoScriptStop @ 58 icsneoScriptStop @ 58
icsneoFindNeoDevices @ 62 icsneoFindNeoDevices @ 62
icsneoOpenNeoDevice @ 63 icsneoOpenNeoDevice @ 63
icsneoOpenNeoDeviceBySerialNumber @ 64 ; icsneoOpenNeoDeviceBySerialNumber @ 64
icsneoForceFirmwareUpdate @ 65 icsneoForceFirmwareUpdate @ 65
icsneoGetHWFirmwareInfo @ 66 icsneoGetHWFirmwareInfo @ 66
icsneoGetDLLFirmwareInfo @ 67 icsneoGetDLLFirmwareInfo @ 67
icsneoSetupISO15765HwSupportEx @ 68 ; icsneoSetupISO15765HwSupportEx @ 68
icsneoSetBitRate @ 69 icsneoSetBitRate @ 69
icsneoReadSDCard @ 72 ; icsneoReadSDCard @ 72
icsneoGetTimeStampForMsg @ 73 icsneoGetTimeStampForMsg @ 73
icsneoWriteSDCard @ 76 ; icsneoWriteSDCard @ 76
icsneoScriptLoad @ 77 icsneoScriptLoad @ 77
icsneoScriptClear @ 78 icsneoScriptClear @ 78
@ -64,10 +64,10 @@ EXPORTS
icsneoScriptReadAppSignal @ 81 icsneoScriptReadAppSignal @ 81
icsneoScriptWriteAppSignal @ 82 icsneoScriptWriteAppSignal @ 82
icsneoScriptReadISO15765_2_TxMessage @ 84 ; icsneoScriptReadISO15765_2_TxMessage @ 84
icsneoScriptWriteISO15765_2_TxMessage @ 85 ; icsneoScriptWriteISO15765_2_TxMessage @ 85
icsneoScriptReadRxMessage @ 86 ; icsneoScriptReadRxMessage @ 86
icsneoScriptWriteRxMessage @ 87 ; icsneoScriptWriteRxMessage @ 87
icsneoScriptGetScriptStatus @ 91 icsneoScriptGetScriptStatus @ 91
@ -81,27 +81,27 @@ EXPORTS
icsneoGetDeviceParameters @99 icsneoGetDeviceParameters @99
icsneoSetDeviceParameters @100 icsneoSetDeviceParameters @100
icsneoSetReflashCallback @101 ; icsneoSetReflashCallback @101
icsneoSetReflashDisplayCallbacks @102 ; icsneoSetReflashDisplayCallbacks @102
icsneoClearReflashDisplayCallbacks @103 ; icsneoClearReflashDisplayCallbacks @103
icsneoGetStoredFirmwareInfo @104 ; icsneoGetStoredFirmwareInfo @104
icsneoDownloadISO15765_2_TXScript @ 105 ; icsneoDownloadISO15765_2_TXScript @ 105
icsneoTransmitISO15765_2_Message @106 ; icsneoTransmitISO15765_2_Message @106
icsneoClearISO15765_2_TxScript @ 107 ; icsneoClearISO15765_2_TxScript @ 107
icsneoGetDLLVersionEx @108 icsneoGetDLLVersionEx @108
icsneoEnable_ISO15765_2_By_Network @ 111 ; icsneoEnable_ISO15765_2_By_Network @ 111
icsneoDisable_ISO15765_2 @ 112 ; icsneoDisable_ISO15765_2 @ 112
icsneoSetISO15765_2_FlowCtlID @ 113 ; icsneoSetISO15765_2_FlowCtlID @ 113
icsneoClearISO15765_2_FlowCtlID @ 114 ; icsneoClearISO15765_2_FlowCtlID @ 114
icsneoClearAllISO15765_2_FlowCtlIDs @ 115 ; icsneoClearAllISO15765_2_FlowCtlIDs @ 115
icsneoSetContext @ 116 ; icsneoSetContext @ 116
icsneoFindNeoDevicesEx @ 117 ; icsneoFindNeoDevicesEx @ 117
icsneoOpenNeoDeviceEx @ 118 ; icsneoOpenNeoDeviceEx @ 118
icsneoFindRemoteNeoDevices @ 120 icsneoFindRemoteNeoDevices @ 120
icsneoOpenRemoteNeoDevice @ 121 icsneoOpenRemoteNeoDevice @ 121
@ -113,14 +113,14 @@ EXPORTS
icsneoSetCANParameters @130 icsneoSetCANParameters @130
icsneoSetCANParametersPhilipsSJA1000 @131 icsneoSetCANParametersPhilipsSJA1000 @131
icsneoSendTextApi @132 ; icsneoSendTextApi @132
icsneoGetTextApi @133 ; icsneoGetTextApi @133
icsneoScriptReadISO15765_2_RxMessage @ 134 ; icsneoScriptReadISO15765_2_RxMessage @ 134
icsneoScriptWriteISO15765_2_RxMessage @ 135 ; icsneoScriptWriteISO15765_2_RxMessage @ 135
icsneoScriptLoadReadBin @ 136 ; icsneoScriptLoadReadBin @ 136
icsneoEnableCoreMiniUsbFilter @ 137 ; icsneoEnableCoreMiniUsbFilter @ 137
icsneoConfigureNetworkMsgQueue @ 138 ; icsneoConfigureNetworkMsgQueue @ 138
icsneoEnableBusVoltageMonitor @ 139 icsneoEnableBusVoltageMonitor @ 139
icsneoGetBusVoltage @ 140 icsneoGetBusVoltage @ 140
icsneoEnableBitSmash @141 icsneoEnableBitSmash @141
@ -128,19 +128,19 @@ EXPORTS
icsneoReceiveHWTimeResponse @143 icsneoReceiveHWTimeResponse @143
icsneoSendHWTimeRequest @144 icsneoSendHWTimeRequest @144
icsneoSetUSBLatency @145 icsneoSetUSBLatency @145
icsneoLoadDefaultSettings @146 ; icsneoLoadDefaultSettings @146
icsneoGetAllChipVersions @149 ; icsneoGetAllChipVersions @149
icsneoSetBitRateEx @ 150 icsneoSetBitRateEx @ 150
icsneoScriptGetScriptStatusEx @ 151 ; icsneoScriptGetScriptStatusEx @ 151
icsneoOpenNeoDeviceByChannels @ 152 icsneoOpenNeoDeviceByChannels @ 152
icsneoGetChannelLockStatus @ 153 ; icsneoGetChannelLockStatus @ 153
icsneoRequestEnterSleepMode @ 154 ; icsneoRequestEnterSleepMode @ 154
icsneoEnableNetworkComEx @ 155 icsneoEnableNetworkComEx @ 155
icsneoLockChannels @ 156 ; icsneoLockChannels @ 156
icsneoUnlockChannels @ 157 ; icsneoUnlockChannels @ 157
icsneoGetFireVnetSettings @ 160 ; icsneoGetFireVnetSettings @ 160
icsneoSetFireVnetSettings @ 161 ; icsneoSetFireVnetSettings @ 161
icsneoGetFire2Settings @ 162 icsneoGetFire2Settings @ 162
icsneoSetFire2Settings @ 163 icsneoSetFire2Settings @ 163
@ -160,19 +160,19 @@ EXPORTS
icsneoGetVnetSimpleNetid @173 icsneoGetVnetSimpleNetid @173
icsneoISO15765_ReceiveMessage @174 icsneoISO15765_ReceiveMessage @174
icsneoGetDLLFirmwareInfoEx @175 icsneoGetDLLFirmwareInfoEx @175
icsneoBase36enc @176 ; icsneoBase36enc @176
icsneoGetRADStar2Settings @177 icsneoGetRADStar2Settings @177
icsneoSetRADStar2Settings @178 icsneoSetRADStar2Settings @178
icsneoGetBackupPowerEnabled @179 ; icsneoGetBackupPowerEnabled @179
icsneoSetBackupPowerEnabled @180 ; icsneoSetBackupPowerEnabled @180
icsneoGetBackupPowerReady @181 ; icsneoGetBackupPowerReady @181
icsneoSerialNumberFromString @182 icsneoSerialNumberFromString @182
icsneoSerialNumberToString @183 icsneoSerialNumberToString @183
icsneoISO15765_TransmitMessageEx @184 icsneoISO15765_TransmitMessageEx @184
icsneoGetActiveVNETChannel @ 189 ; icsneoGetActiveVNETChannel @ 189
icsneoSetActiveVNETChannel @ 190 ; icsneoSetActiveVNETChannel @ 190
icsneoGetDeviceSettings @191 icsneoGetDeviceSettings @191
icsneoSetDeviceSettings @192 icsneoSetDeviceSettings @192
@ -181,11 +181,11 @@ EXPORTS
icsneoGetVCAN412Settings @ 194 icsneoGetVCAN412Settings @ 194
icsneoSetVCAN412Settings @ 195 icsneoSetVCAN412Settings @ 195
icsneoGetVividCANSettings @ 196 ; icsneoGetVividCANSettings @ 196
icsneoSetVividCANSettings @ 197 ; icsneoSetVividCANSettings @ 197
icsneoFindNeoDevicesNewStyle @ 198 ; icsneoFindNeoDevicesNewStyle @ 198
icsneoGetDeviceStatus @ 202 ; icsneoGetDeviceStatus @ 202
icsneoFindDevices @ 203 icsneoFindDevices @ 203
icsneoOpenDevice @ 204 icsneoOpenDevice @ 204
@ -196,16 +196,16 @@ EXPORTS
icsneoGetVCAN4Settings @ 207 icsneoGetVCAN4Settings @ 207
icsneoSetVCAN4Settings @ 208 icsneoSetVCAN4Settings @ 208
icsneoReadWritePHYSettings @ 214 ; icsneoReadWritePHYSettings @ 214
icsneoRequestDiskDetails @ 217 ; icsneoRequestDiskDetails @ 217
icsneoRequestDiskFormat @ 218 ; icsneoRequestDiskFormat @ 218
icsneoRequestDiskFormatProgress @ 219 ; icsneoRequestDiskFormatProgress @ 219
icsneoRequestDiskFormatCancel @ 220 ; icsneoRequestDiskFormatCancel @ 220
icsneoGetRADGigastarSettings @ 221 ; icsneoGetRADGigastarSettings @ 221
icsneoSetRADGigastarSettings @ 222 ; icsneoSetRADGigastarSettings @ 222
icsneoGetRADA2BSettings @ 223 ; icsneoGetRADA2BSettings @ 223
icsneoSetRADA2BSettings @ 224 ; icsneoSetRADA2BSettings @ 224
icsneoScriptClearRxMessage @225 ; icsneoScriptClearRxMessage @225