SikongJueluo
/
FPGA_WebLab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复udp突发长度错误的问题，以及camera的i2c地址错误的问题

This commit is contained in:
SikongJueluo 2025-07-11 11:54:21 +08:00
parent 4a5709a783
commit 33a2dbf437
No known key found for this signature in database
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/Peripherals/CameraClient.cs
View File

@ -23,8 +23,8 @@ class Camera
private IPEndPoint ep; private IPEndPoint ep;
const uint CAM_I2C_ADDR = 0x78; const uint CAM_I2C_ADDR = 0x3C;
const Peripherals.I2cClient.I2cProtocol CAM_PROTO = Peripherals.I2cClient.I2cProtocol.I2c; const Peripherals.I2cClient.I2cProtocol CAM_PROTO = Peripherals.I2cClient.I2cProtocol.SCCB;
const UInt16 V_CMOS_DISP = 480; const UInt16 V_CMOS_DISP = 480;
const UInt16 H_CMOS_DISP = 640; const UInt16 H_CMOS_DISP = 640;
const UInt16 TOTAL_H_PIXEL = 2570; const UInt16 TOTAL_H_PIXEL = 2570;
@ -357,7 +357,7 @@ class Camera
logger.Error($"STORE_NUM write returned false for camera at {this.address}:{this.port}"); logger.Error($"STORE_NUM write returned false for camera at {this.address}:{this.port}");
return new(new Exception($"STORE_NUM write returned false for camera at {this.address}:{this.port}")); return new(new Exception($"STORE_NUM write returned false for camera at {this.address}:{this.port}"));
} }
} }78
{ {
var ret = await UDPClientPool.WriteAddr(this.ep, 2, CameraAddr.CAPTURE_ON, 0x01); var ret = await UDPClientPool.WriteAddr(this.ep, 2, CameraAddr.CAPTURE_ON, 0x01);

6
server/src/UdpClientPool.cs
View File

@ -458,11 +458,13 @@ public class UDPClientPool
dataArray[(i * (256 * (32 / 8)))..] : dataArray[(i * (256 * (32 / 8)))..] :
dataArray[(i * (256 * (32 / 8)))..((i + 1) * (256 * (32 / 8)))]; dataArray[(i * (256 * (32 / 8)))..((i + 1) * (256 * (32 / 8)))];
// Calculate BurstLength
opts.BurstLength = ((byte)( opts.BurstLength = ((byte)(
sendDataArray.Length % 4 == 0 ? sendDataArray.Length % 4 == 0 ?
(sendDataArray.Length / 4) : (sendDataArray.Length / 4 - 1) :
(sendDataArray.Length / 4) + 1 (sendDataArray.Length / 4)
)); ));
ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts)); ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts));
if (!ret) return new(new Exception("Send 1st address package failed!")); if (!ret) return new(new Exception("Send 1st address package failed!"));