xerolyskinner/MicrochipFor32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新了ModBus库

Browse Source
This commit is contained in:
XerolySkinner
2023-12-20 22:24:11 +08:00
parent a9be43d98e
commit 8bfef9f889
4 changed files with 115 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_Device/bsp_UART/mb_ModBusRTU/mbm_ModBusRTU.c
View File

@@ -72,7 +72,7 @@ _mb_master mb_Master_create(const char* str,...){
str += (strlen(field) + 1); str += (strlen(field) + 1);
} }
// 初始化值 // 初始化值
result->VarBuff=(void*)malloc(128); result->VarBuff=(void*)malloc(512);
result->VarNum=0; result->VarNum=0;
va_end(list); va_end(list);

103
bsp_Device/bsp_UART/mb_ModBusRTU/mbs_ModBusRTU.c
View File

@@ -395,4 +395,107 @@ u8 mb_Slave_Ack(_mb_slave obj){
} }
return 0; return 0;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////
//----------------------------------------------------------------------------------------------------
// 有人云
u8 yr_Slave_WR_Out_COILS_Ask(_mb_slave obj,u8 ID,u16 Addr,u16 Mem,u8* Data){
u8 Byte=ceil_div(Mem,8);
u8* Buff=obj->TxBuff;
u16 crc;
// 填入顺序项
*Buff++=ID;
*Buff++=0x45;
*Buff++=Pn8(Addr,Dat_Endian);
*Buff++=Pn8(Addr,!Dat_Endian);
*Buff++=Pn8(Mem,Dat_Endian);
*Buff++=Pn8(Mem,!Dat_Endian);
*Buff++=Byte;
u8* ByteHead=Buff;
// 数据导入
for(u32 i=0;i<Mem;i++){
if(i%8==0)Buff++;
MODBUS_SET_BIT(ByteHead,i,Data[i]);}
// 计算CRC
crc=mb_crc(obj->TxBuff,Byte+7);
*Buff++=Pn8(crc,CRC_Endian);
*Buff++=Pn8(crc,!CRC_Endian);
// 发送值
obj->tramsmit(obj->TxBuff,Byte+9);
return 0;}
//----------------------------------------------------------------------------------------------------
u8 yr_Slave_WR_In_COILS_Ask(_mb_slave obj,u8 ID,u16 Addr,u16 Mem,u8* Data){
u8 Byte=ceil_div(Mem,8);
u8* Buff=obj->TxBuff;
u16 crc;
// 填入顺序项
*Buff++=ID;
*Buff++=0x42;
*Buff++=Pn8(Addr,Dat_Endian);
*Buff++=Pn8(Addr,!Dat_Endian);
*Buff++=Pn8(Mem,Dat_Endian);
*Buff++=Pn8(Mem,!Dat_Endian);
*Buff++=Byte;
u8* ByteHead=Buff;
// 数据导入
for(u32 i=0;i<Mem;i++){
if(i%8==0)Buff++;
MODBUS_SET_BIT(ByteHead,i,Data[i]);}
// 计算CRC
crc=mb_crc(obj->TxBuff,Byte+7);
*Buff++=Pn8(crc,CRC_Endian);
*Buff++=Pn8(crc,!CRC_Endian);
// 发送值
obj->tramsmit(obj->TxBuff,Byte+9);
return 0;}
//----------------------------------------------------------------------------------------------------
// 向外发送
u8 yr_Slave_WR_Hold_REGS_Ask(_mb_slave obj,u8 ID,u16 Addr,u16 Mem,u16* Data){
u8 Byte=Mem*2;
u8* Buff=obj->TxBuff;
u16 crc;
// 填入顺序项
*Buff++=ID;
*Buff++=0x46;
*Buff++=Pn8(Addr,Dat_Endian);
*Buff++=Pn8(Addr,!Dat_Endian);
*Buff++=Pn8(Mem,Dat_Endian);
*Buff++=Pn8(Mem,!Dat_Endian);
*Buff++=Byte;
// 数据导入
for(u32 i=0;i<Mem;i++){
*Buff++=Pn8(Data[i],Dat_Endian);
*Buff++=Pn8(Data[i],!Dat_Endian);}
// 计算CRC
crc=mb_crc(obj->TxBuff,Byte+7);
*Buff++=Pn8(crc,CRC_Endian);
*Buff++=Pn8(crc,!CRC_Endian);
// 发送值
obj->tramsmit(obj->TxBuff,Byte+9);
return 0;}
//----------------------------------------------------------------------------------------------------
// 向外发送
u8 yr_Slave_WR_In_REGS_Ask(_mb_slave obj,u8 ID,u16 Addr,u16 Mem,u16* Data){
u8 Byte=Mem*2;
u8* Buff=obj->TxBuff;
u16 crc;
// 填入顺序项
*Buff++=ID;
*Buff++=0x44;
*Buff++=Pn8(Addr,Dat_Endian);
*Buff++=Pn8(Addr,!Dat_Endian);
*Buff++=Pn8(Mem,Dat_Endian);
*Buff++=Pn8(Mem,!Dat_Endian);
*Buff++=Byte;
// 数据导入
for(u32 i=0;i<Mem;i++){
*Buff++=Pn8(Data[i],Dat_Endian);
*Buff++=Pn8(Data[i],!Dat_Endian);}
// 计算CRC
crc=mb_crc(obj->TxBuff,Byte+7);
*Buff++=Pn8(crc,CRC_Endian);
*Buff++=Pn8(crc,!CRC_Endian);
// 发送值
obj->tramsmit(obj->TxBuff,Byte+9);
return 0;}
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////

5
bsp_Device/bsp_UART/mb_ModBusRTU/mbs_ModBusRTU.h
View File

@@ -98,6 +98,11 @@ u8 mb_Slave_RD_IN_COIL_Ack(_mb_slave obj,u16 Mem,u8* Data);
u8 mb_Slave_RD_HOLD_REG_Ack(_mb_slave obj,u8 Mem,u16* Data); u8 mb_Slave_RD_HOLD_REG_Ack(_mb_slave obj,u8 Mem,u16* Data);
u8 mb_Slave_RD_IN_REG_Ack(_mb_slave obj,u8 Mem,u16* Data); u8 mb_Slave_RD_IN_REG_Ack(_mb_slave obj,u8 Mem,u16* Data);
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
u8 yr_Slave_WR_In_REGS_Ask(_mb_slave obj,u8 ID,u16 Addr,u16 Mem,u16* Data);
u8 yr_Slave_WR_Hold_REGS_Ask(_mb_slave obj,u8 ID,u16 Addr,u16 Mem,u16* Data);
u8 yr_Slave_WR_In_COILS_Ask(_mb_slave obj,u8 ID,u16 Addr,u16 Mem,u8* Data);
u8 yr_Slave_WR_Out_COILS_Ask(_mb_slave obj,u8 ID,u16 Addr,u16 Mem,u8* Data);
//----------------------------------------------------------------------------------------------------
#define mb_Slave_get(x,y) mb_Slave_Unpack(x,y,mb_Slave_Lencount(y)) #define mb_Slave_get(x,y) mb_Slave_Unpack(x,y,mb_Slave_Lencount(y))
u8 mb_Slave_Unpack(_mb_slave obj,u8* Buff,u32 len); u8 mb_Slave_Unpack(_mb_slave obj,u8* Buff,u32 len);
u8 mb_Slave_Ack(_mb_slave obj); u8 mb_Slave_Ack(_mb_slave obj);