Ajout du de l'interface avec le bootloader PIC32
This commit is contained in:
@@ -12,6 +12,7 @@ CChaletMainStatus::CChaletMainStatus()
|
||||
mBatteryVoltage = 0;
|
||||
mIsOnline = false;
|
||||
mLostRequestPercentage = 0;
|
||||
mChaletTemperature = -100;
|
||||
|
||||
}
|
||||
|
||||
@@ -46,7 +47,8 @@ QDataStream &operator>>(QDataStream &in, CChaletMainStatus &dest)
|
||||
>> dest.mLostRequestPercentage
|
||||
>> dest.mThisStatusDateTime
|
||||
>> dest.mLastLoraStatus
|
||||
>> dest.mStatusToggleBit;
|
||||
>> dest.mStatusToggleBit
|
||||
>> dest.mChaletTemperature;
|
||||
|
||||
return in;
|
||||
}
|
||||
|
||||
@@ -43,6 +43,7 @@ public:
|
||||
qint8 mCurrentSensorStatus;
|
||||
|
||||
float mBatteryVoltage;
|
||||
float mChaletTemperature;
|
||||
qint16 mBatteryCurrent;
|
||||
qint16 mBatterySOC;
|
||||
|
||||
|
||||
@@ -87,6 +87,7 @@ int CChaletGui::UpdateChaletStatus(CChaletMainStatus Status)
|
||||
ui->mBatterySOCLabel->setText("Battery SOC: Unknown");
|
||||
ui->mSolarPanelCurrentLabel->setText("Solar Panel Current: Unknown");
|
||||
ui->mLostReqPercentLbl->setText("N/A");
|
||||
ui->mChaletTemperatureLbl->setText("Temperature: -100)");
|
||||
|
||||
|
||||
return RET_OK;
|
||||
@@ -212,6 +213,10 @@ int CChaletGui::UpdateChaletStatus(CChaletMainStatus Status)
|
||||
|
||||
mBatteryPlotWidget->replot();
|
||||
}
|
||||
|
||||
QString Temperature = QString("Temperature: %1").arg(Status.mChaletTemperature);
|
||||
ui->mChaletTemperatureLbl->setText(Temperature);
|
||||
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="mEnableHarakiriChkBx">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
@@ -347,6 +347,19 @@
|
||||
<string>PushButton</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="mChaletTemperatureLbl">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>190</x>
|
||||
<y>320</y>
|
||||
<width>241</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Temperature:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<zorder>groupBox</zorder>
|
||||
<zorder>MainPageLabel</zorder>
|
||||
<zorder>mInverterRlyStatusLabel</zorder>
|
||||
@@ -371,6 +384,7 @@
|
||||
<zorder>mLasCommRequestReceivedLbl</zorder>
|
||||
<zorder>mLogStartDateEdit</zorder>
|
||||
<zorder>mGetChaletLogButton</zorder>
|
||||
<zorder>mChaletTemperatureLbl</zorder>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
||||
Reference in New Issue
Block a user