Merge branch 'PureCode' of http://x-copper.cn:8418/WolfSpirit/EJM_Display into PureCode
This commit is contained in:
@@ -45,6 +45,7 @@ void P09_RemotePage::UIRefreshTimeOut()
|
||||
{
|
||||
if(gPageIndexStr != "P09")
|
||||
return;
|
||||
<<<<<<< HEAD
|
||||
|
||||
// 使用多核心管理器异步获取数据
|
||||
MultiCoreManager::instance()->submitTask([this]() {
|
||||
@@ -81,6 +82,13 @@ void P09_RemotePage::UIRefreshTimeOut()
|
||||
uint16_t dX = map(extractUInt32_8BitPart(AK1,2) + 256,0,512.,0,140)- ui->Label_TransportPos->width()/2;
|
||||
uint16_t dY = map(extractUInt32_8BitPart(AK1,3) + 256,0,512.,0,140)- ui->Label_TransportPos->height()/2;
|
||||
ui->Label_TransportPos->move(dX,dY);
|
||||
=======
|
||||
QString StyleSheetSet;
|
||||
uint32_t DK1 = getNodeValue("PageContol.RemoteDKey1") .toUInt();
|
||||
uint32_t DK2 = getNodeValue("PageContol.RemoteDKey2") .toUInt();
|
||||
uint32_t AK1 = getNodeValue("PageContol.RemoteAKey1") .toUInt();
|
||||
uint32_t AK2 = getNodeValue("PageContol.RemoteAKey2") .toUInt();
|
||||
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
|
||||
|
||||
// 通用模拟量
|
||||
SetStyle2( ui->Switch_5 , BitMaps().RemUI_SwitchStyles , extractUInt32_8BitPart(AK2,0) < 127 , extractUInt32_8BitPart(AK2,0) > 127 );
|
||||
|
||||
Reference in New Issue
Block a user