增加杨格锁私有属性编译和优化解析HEX文件逻辑

This commit is contained in:
2026-01-21 19:27:57 +08:00
parent 713a36b383
commit 87cc292012
7 changed files with 122 additions and 11 deletions

View File

@@ -8756,7 +8756,8 @@ Public Class FrmCSeriesConfig
'偏移地址 0x04 数据类型指示偏移地址
Dim LineAddOffestBase As Integer = 0
'’偏移地址 0x02 数据类型指示偏移地址
Dim LineAddOffestBase2 As Integer = 0
'结束地址
endAddr = 0
@@ -8802,7 +8803,7 @@ Public Class FrmCSeriesConfig
'本行地址取出来放在 flashAddress中
StrToHex(tmpLineAdd, flashAddressBuf)
flashAddress = LineAddOffestBase + tmpLineAdd
flashAddress = LineAddOffestBase + tmpLineAdd + LineAddOffestBase2
'B3数据类型
Dim dataType = StrToHex(hexBuffer(i + 8))
@@ -8822,8 +8823,19 @@ Public Class FrmCSeriesConfig
Else
Return True
End If
Case 2, 3, 5 '扩展段地址, 开始段地址, 开始线性地址’
Case 3, 5 '扩展段地址, 开始段地址, 开始线性地址’ 4 '扩展线性地址
Continue For
Case 2 ',
If dataLen = 2 Then
LineAddOffestBase2 = (dataValBuf(0) * 256 + dataValBuf(1))
LineAddOffestBase2 = LineAddOffestBase2 << 4
Else
'resultli.Analysis = "文件偏移地址异常!!"
Return False '确认DataLen必须是2否则报错
End If
Case 4 '扩展线性地址
If dataLen = 2 Then
LineAddOffestBase = (dataValBuf(0) * 256 + dataValBuf(1)) * 65536