From faba6b022b86f066d95b1cfdf752573724d5fbcd Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期五, 29 八月 2025 19:08:13 +0800
Subject: [PATCH] 常规提交
---
src/messageproc.cpp | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/messageproc.cpp b/src/messageproc.cpp
index bc6d6a6..652424f 100644
--- a/src/messageproc.cpp
+++ b/src/messageproc.cpp
@@ -47,16 +47,16 @@
int data_len;
ToB* tob = ToB::GetInstance();
- u16 LevelCnt = tob->GetLevels(Levels);
+ u16 LevelCnt = tob->GetLevels(Levels); //864 levels
u32 msgLen = LevelCnt * sizeof(*Levels);
-
- int Packegs = (LevelCnt+MSG_DATA_LEN-1)/MSG_DATA_LEN;
+ int Packegs = (msgLen+MSG_DATA_LEN-1)/MSG_DATA_LEN;
pmsg->magic = 0x5aa5;
// pmsg->dataLen = LevelCnt;
pmsg->totalPkts = Packegs;
// pmsg->pktNo = 1;
pmsg->msgType = MSG_GET_LEVEL;
+ pmsg->msgID = LevelCnt;
// Split packeg
for(i=0; i<Packegs; i++){
@@ -67,11 +67,11 @@
data_len = MSG_DATA_LEN;
}
- memcpy(pmsg->data, Levels + i * MSG_DATA_LEN, data_len);
- pmsg->dataLen = LevelCnt;
+ memcpy(pmsg->data, Levels + i * MSG_DATA_LEN / sizeof(*Levels), data_len);
+ pmsg->dataLen = data_len;
pmsg->pktNo = i;
- pmsg->Enc(MsgType::MSG_GET_LEVEL, 0, msgLen);
+ pmsg->Enc(MsgType::MSG_GET_LEVEL, 0, data_len);
txQueue->Push(*pmsg);
}
}
@@ -97,8 +97,8 @@
s16* data = (s16*)(ptr + 1);
data_num = (data_num - sizeof(struct ParamCtrl))/sizeof(s16);
+// ptr->mid = var.pscene->get_module_id(ptr->mid, type, ptr->cmd) ;
- ptr->mid = var.pscene->get_module_id(ptr->mid, type, ptr->cmd) ;
tob->toCtrl(ptr->mid, ptr->cmd, data, data_num);
}
@@ -120,7 +120,7 @@
bin = (u8*)sram_malloc(SRAM_DDR, mem_any, pmsg->totalPkts*MSG_DATA_LEN);
}
if(bin == NULL) return -1;
- printf("No:%d len %d\n", pmsg->pktNo,pmsg->dataLen);
+// printf("No:%d len %d\n", pmsg->pktNo,pmsg->dataLen);
var.TopoLoading = utrue;
memcpy(bin+pmsg->pktNo*MSG_DATA_LEN, pmsg->data , pmsg->dataLen);
@@ -232,7 +232,7 @@
ParamCtrl(pmsg);
break;
case MsgType::MSG_GET_LEVEL:
- //ReportLevel(pmsg);
+ ReportLevel(pmsg);
break;
case MsgType::MSG_PARAM_CONFIG:
case MsgType::MSG_PARAM_COMPLETED:
--
Gitblit v1.9.3