Skip to content

Commit

Permalink
#34 #36 MATLAB library compiler error solving 1
Browse files Browse the repository at this point in the history
  • Loading branch information
LeonJung committed Oct 19, 2016
1 parent 98451e4 commit f7d500c
Show file tree
Hide file tree
Showing 20 changed files with 86 additions and 82 deletions.
Binary file modified c++/build/win32/.vs/dxl_x86_cpp/v14/.suo
Binary file not shown.
Binary file modified c++/build/win64/.vs/dxl_x64_cpp/v14/.suo
Binary file not shown.
Binary file not shown.
Binary file modified c/build/win32/.vs/dxl_x86_c/v14/.suo
Binary file not shown.
Binary file modified c/build/win32/output/dxl_x86_c.dll
Binary file not shown.
Binary file modified c/build/win32/output/dxl_x86_c.lib
Binary file not shown.
Binary file modified c/build/win64/.vs/dxl_x64_c/v14/.suo
Binary file not shown.
Binary file modified c/build/win64/output/dxl_x64_c.dll
Binary file not shown.
Binary file modified c/build/win64/output/dxl_x64_c.lib
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 1 addition & 2 deletions c/src/dynamixel_sdk/group_bulk_read.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,11 @@ uint8_t groupBulkReadIsAvailable(int group_num, uint8_t id, uint16_t address, ui
uint32_t groupBulkReadGetData(int group_num, uint8_t id, uint16_t address, uint16_t data_length)
{
int data_num = find(group_num, id);
uint16_t start_addr = groupData[group_num].data_list[data_num].start_address;

if (groupBulkReadIsAvailable(group_num, id, address, data_length) == False)
return 0;

uint16_t start_addr = groupData[group_num].data_list[data_num].start_address;

switch (data_length)
{
case 1:
Expand Down
2 changes: 1 addition & 1 deletion c/src/dynamixel_sdk/group_bulk_write.c
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ void groupBulkWriteTxPacket(int group_num)
{
if (groupData[group_num].protocol_version == 1)
{
packetData[groupData[group_num].port_num].communication_result = COMM_NOT_AVAILABLE;
packetData[groupData[group_num].port_num].communication_result = COMM_NOT_AVAILABLE;
return;
}

Expand Down
3 changes: 2 additions & 1 deletion c/src/dynamixel_sdk/group_sync_write.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,11 @@ void groupSyncWriteRemoveParam(int group_num, uint8_t id)

uint8_t groupSyncWriteChangeParam(int group_num, uint8_t id, uint32_t data, uint16_t input_length, uint16_t data_pos)
{
int data_num = 0;
if (id == NOT_USED_ID) // NOT exist
return False;

int data_num = find(group_num, id);
data_num = find(group_num, id);

if (data_num == groupData[group_num].data_list_length)
return False;
Expand Down
72 changes: 36 additions & 36 deletions c/src/dynamixel_sdk/packet_handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void printTxRxResult(int protocol_version, int result)
{
printTxRxResult2(result);
}
};
}
void printRxPacketError(int protocol_version, uint8_t error)
{
if (protocol_version == 1)
Expand All @@ -80,7 +80,7 @@ void printRxPacketError(int protocol_version, uint8_t error)
{
printRxPacketError2(error);
}
};
}

int getLastTxRxResult(int port_num, int protocol_version)
{
Expand Down Expand Up @@ -139,7 +139,7 @@ void txPacket(int port_num, int protocol_version)
{
txPacket2(port_num);
}
};
}

void rxPacket(int port_num, int protocol_version)
{
Expand All @@ -151,7 +151,7 @@ void rxPacket(int port_num, int protocol_version)
{
rxPacket2(port_num);
}
};
}

void txRxPacket(int port_num, int protocol_version)
{
Expand All @@ -163,7 +163,7 @@ void txRxPacket(int port_num, int protocol_version)
{
txRxPacket2(port_num);
}
};
}

void ping(int port_num, int protocol_version, uint8_t id)
{
Expand All @@ -175,7 +175,7 @@ void ping(int port_num, int protocol_version, uint8_t id)
{
ping2(port_num, id);
}
};
}

uint16_t pingGetModelNum(int port_num, int protocol_version, uint8_t id)
{
Expand All @@ -187,7 +187,7 @@ uint16_t pingGetModelNum(int port_num, int protocol_version, uint8_t id)
{
return pingGetModelNum2(port_num, id);
}
};
}

// broadcastPing
void broadcastPing(int port_num, int protocol_version)
Expand All @@ -200,7 +200,7 @@ void broadcastPing(int port_num, int protocol_version)
{
broadcastPing2(port_num);
}
};
}

uint8_t getBroadcastPingResult(int port_num, int protocol_version, int id)
{
Expand All @@ -224,7 +224,7 @@ void reboot(int port_num, int protocol_version, uint8_t id)
{
reboot2(port_num, id);
}
};
}

void factoryReset(int port_num, int protocol_version, uint8_t id, uint8_t option)
{
Expand All @@ -236,7 +236,7 @@ void factoryReset(int port_num, int protocol_version, uint8_t id, uint8_t option
{
factoryReset2(port_num, id, option);
}
};
}

void readTx(int port_num, int protocol_version, uint8_t id, uint16_t address, uint16_t length)
{
Expand All @@ -248,7 +248,7 @@ void readTx(int port_num, int protocol_version, uint8_t id, uint16_t address, ui
{
readTx2(port_num, id, address, length);
}
};
}
void readRx(int port_num, int protocol_version, uint16_t length)
{
if (protocol_version == 1)
Expand All @@ -259,7 +259,7 @@ void readRx(int port_num, int protocol_version, uint16_t length)
{
readRx2(port_num, length);
}
};
}
void readTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address, uint16_t length)
{
if (protocol_version == 1)
Expand All @@ -270,7 +270,7 @@ void readTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address,
{
readTxRx2(port_num, id, address, length);
}
};
}

void read1ByteTx(int port_num, int protocol_version, uint8_t id, uint16_t address)
{
Expand All @@ -282,7 +282,7 @@ void read1ByteTx(int port_num, int protocol_version, uint8_t id, uint16_t addres
{
read1ByteTx2(port_num, id, address);
}
};
}
uint8_t read1ByteRx(int port_num, int protocol_version)
{
if (protocol_version == 1)
Expand All @@ -293,7 +293,7 @@ uint8_t read1ByteRx(int port_num, int protocol_version)
{
return read1ByteRx2(port_num);
}
};
}
uint8_t read1ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address)
{
if (protocol_version == 1)
Expand All @@ -304,7 +304,7 @@ uint8_t read1ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t a
{
return read1ByteTxRx2(port_num, id, address);
}
};
}

void read2ByteTx(int port_num, int protocol_version, uint8_t id, uint16_t address)
{
Expand All @@ -316,7 +316,7 @@ void read2ByteTx(int port_num, int protocol_version, uint8_t id, uint16_t addres
{
read2ByteTx2(port_num, id, address);
}
};
}
uint16_t read2ByteRx(int port_num, int protocol_version)
{
if (protocol_version == 1)
Expand All @@ -327,7 +327,7 @@ uint16_t read2ByteRx(int port_num, int protocol_version)
{
return read2ByteRx2(port_num);
}
};
}
uint16_t read2ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address)
{
if (protocol_version == 1)
Expand All @@ -338,7 +338,7 @@ uint16_t read2ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t
{
return read2ByteTxRx2(port_num, id, address);
}
};
}

void read4ByteTx(int port_num, int protocol_version, uint8_t id, uint16_t address)
{
Expand All @@ -350,7 +350,7 @@ void read4ByteTx(int port_num, int protocol_version, uint8_t id, uint16_t addres
{
read4ByteTx2(port_num, id, address);
}
};
}
uint32_t read4ByteRx(int port_num, int protocol_version)
{
if (protocol_version == 1)
Expand All @@ -361,7 +361,7 @@ uint32_t read4ByteRx(int port_num, int protocol_version)
{
return read4ByteRx2(port_num);
}
};
}
uint32_t read4ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address)
{
if (protocol_version == 1)
Expand All @@ -372,7 +372,7 @@ uint32_t read4ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t
{
return read4ByteTxRx2(port_num, id, address);
}
};
}

void writeTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t address, uint16_t length)
{
Expand All @@ -384,7 +384,7 @@ void writeTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t addres
{
writeTxOnly2(port_num, id, address, length);
}
};
}
void writeTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address, uint16_t length)
{
if (protocol_version == 1)
Expand All @@ -395,7 +395,7 @@ void writeTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address,
{
writeTxRx2(port_num, id, address, length);
}
};
}

void write1ByteTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t address, uint8_t data)
{
Expand All @@ -407,7 +407,7 @@ void write1ByteTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t a
{
write1ByteTxOnly2(port_num, id, address, data);
}
};
}
void write1ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address, uint8_t data)
{
if (protocol_version == 1)
Expand All @@ -418,7 +418,7 @@ void write1ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t add
{
write1ByteTxRx2(port_num, id, address, data);
}
};
}

void write2ByteTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t address, uint16_t data)
{
Expand All @@ -430,7 +430,7 @@ void write2ByteTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t a
{
write2ByteTxOnly2(port_num, id, address, data);
}
};
}
void write2ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address, uint16_t data)
{
if (protocol_version == 1)
Expand All @@ -441,7 +441,7 @@ void write2ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t add
{
write2ByteTxRx2(port_num, id, address, data);
}
};
}

void write4ByteTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t address, uint32_t data)
{
Expand All @@ -453,7 +453,7 @@ void write4ByteTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t a
{
write4ByteTxOnly2(port_num, id, address, data);
}
};
}
void write4ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address, uint32_t data)
{
if (protocol_version == 1)
Expand All @@ -464,7 +464,7 @@ void write4ByteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t add
{
write4ByteTxRx2(port_num, id, address, data);
}
};
}

void regWriteTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t address, uint16_t length)
{
Expand All @@ -476,7 +476,7 @@ void regWriteTxOnly(int port_num, int protocol_version, uint8_t id, uint16_t add
{
regWriteTxOnly2(port_num, id, address, length);
}
};
}
void regWriteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t address, uint16_t length)
{
if (protocol_version == 1)
Expand All @@ -487,7 +487,7 @@ void regWriteTxRx(int port_num, int protocol_version, uint8_t id, uint16_t addre
{
regWriteTxRx2(port_num, id, address, length);
}
};
}

void syncReadTx(int port_num, int protocol_version, uint16_t start_address, uint16_t data_length, uint16_t param_length)
{
Expand All @@ -499,7 +499,7 @@ void syncReadTx(int port_num, int protocol_version, uint16_t start_address, uint
{
syncReadTx2(port_num, start_address, data_length, param_length);
}
};
}
// syncReadRx -> GroupSyncRead
// syncReadTxRx -> GroupSyncRead

Expand All @@ -513,7 +513,7 @@ void syncWriteTxOnly(int port_num, int protocol_version, uint16_t start_address,
{
syncWriteTxOnly2(port_num, start_address, data_length, param_length);
}
};
}

void bulkReadTx(int port_num, int protocol_version, uint16_t param_length)
{
Expand All @@ -525,7 +525,7 @@ void bulkReadTx(int port_num, int protocol_version, uint16_t param_length)
{
bulkReadTx2(port_num, param_length);
}
};
}
// bulkReadRx -> GroupBulkRead
// bulkReadTxRx -> GroupBulkRead

Expand All @@ -539,4 +539,4 @@ void bulkWriteTxOnly(int port_num, int protocol_version, uint16_t param_length)
{
bulkWriteTxOnly2(port_num, param_length);
}
};
}
Loading

0 comments on commit f7d500c

Please sign in to comment.