Compare commits
2 Commits
305a8c54fa
...
master
Author | SHA1 | Date | |
---|---|---|---|
beca00ff70 | |||
ed6694b99d |
@@ -8,9 +8,9 @@ test for build:
|
||||
- cpp-test-universal
|
||||
only:
|
||||
- master
|
||||
variables:
|
||||
GIT_SUBMODULE_STRATEGY: recursive
|
||||
script:
|
||||
- git submodule init
|
||||
- git submodule update
|
||||
- cmake -DCMAKE_BUILD_TYPE=Debug -DMODEM_TYPE=TDMA -B cmake-build-debug-tdma
|
||||
- cmake -DCMAKE_BUILD_TYPE=Debug -DMODEM_TYPE=SCPC -B cmake-build-debug-scpc
|
||||
- cmake -DCMAKE_BUILD_TYPE=Debug -DMODEM_TYPE=SHPS -B cmake-build-debug-shps
|
||||
|
@@ -472,16 +472,15 @@ void api_driver::obj::TerminalDeviceState::updateCallback(proxy::CpProxy &cp) {
|
||||
fTempZynq = ds.pl_temp;
|
||||
fTempFpga = ds.zynq_temp;
|
||||
}
|
||||
// FIXME: тут происходит зависание по неизвестной причине
|
||||
// #ifdef MODEM_IS_TDMA
|
||||
// {
|
||||
// progress_msg ds{};
|
||||
// cp.getUpdateStatus(ds);
|
||||
// fUpgradeStatus = ds.status;
|
||||
// fUpgradePercent = ds.dwl_percent;
|
||||
// fUpgradeImage = ds.cur_image;
|
||||
// }
|
||||
// #endif
|
||||
#ifdef MODEM_IS_TDMA
|
||||
{
|
||||
progress_msg ds{};
|
||||
cp.getUpdateStatus(ds);
|
||||
fUpgradeStatus = ds.status;
|
||||
fUpgradePercent = ds.dwl_percent;
|
||||
fUpgradeImage = ds.cur_image;
|
||||
}
|
||||
#endif
|
||||
|
||||
struct sysinfo info{};
|
||||
sysinfo(&info);
|
||||
|
Reference in New Issue
Block a user