ich777/px4_drv
1
0
Fork 0
mirror of https://github.com/tsukumijima/px4_drv.git synced 2025-07-23 04:03:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

winusb: BonDriver_PX4: エラー発生時の MessageBox を表示しない設定を追加

Browse Source 
ini 内の DisplayErrorMessage を 1 に設定すると今まで通り MessageBox が表示される
This commit is contained in:
tsukumi
2022-01-18 23:56:55 +09:00
parent 7fa9f05d2c
commit 58bb058bd7
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
winusb/pkg/BonDriver_PX4/BonDriver_PX-MLT.ini
View File

@@ -8,6 +8,7 @@ NumberOfPacketsPerBuffer=1024
MaximumNumberOfBuffers=64
MinimumNumberOfBuffers=4
NumberOfBuffersToIgnoreAfterPurge=1
DisplayErrorMessage=0
[BonDriver.ISDB-T]
ChSetPath="BonDriver_PX4-T.ChSet.txt"

1
winusb/pkg/BonDriver_PX4/BonDriver_PX4-S.ini
View File

@@ -8,6 +8,7 @@ NumberOfPacketsPerBuffer=1024
MaximumNumberOfBuffers=64
MinimumNumberOfBuffers=4
NumberOfBuffersToIgnoreAfterPurge=0
DisplayErrorMessage=0
[BonDriver.ISDB-S]
ChSetPath="BonDriver_PX4-S.ChSet.txt"

1
winusb/pkg/BonDriver_PX4/BonDriver_PX4-T.ini
View File

@@ -8,6 +8,7 @@ NumberOfPacketsPerBuffer=1024
MaximumNumberOfBuffers=64
MinimumNumberOfBuffers=4
NumberOfBuffersToIgnoreAfterPurge=0
DisplayErrorMessage=0
[BonDriver.ISDB-T]
ChSetPath="BonDriver_PX4-T.ChSet.txt"

20
winusb/src/BonDriver_PX4/bon_driver.cpp
View File

@@ -35,6 +35,7 @@ BonDriver::BonDriver() noexcept
open_(FALSE),
space_(0),
ch_(0),
display_error_message_(false),
stream_mtx_(),
ioq_(nullptr),
iorp_(*this),
@@ -110,6 +111,13 @@ bool BonDriver::Init()
if (data_ignore_count < 0)
return false;
} catch (const std::out_of_range &) {}
try {
int display_error_message = px4::util::wtoi(bon_config.Get(L"DisplayErrorMessage"));
if (display_error_message == 1) {
display_error_message_ = true;
}
} catch (const std::out_of_range &) {}
} else {
systems_ = px4::SystemType::ISDB_T;
driver_host_path_ = dir_path + L"DriverHost_PX4.exe";
@@ -180,10 +188,10 @@ bool BonDriver::Init()
ioq_.reset(new px4::IoQueue(px4::IoQueue::IoOperation::READ, iorp_, 188 * num_packets, max_buffers, min_buffers, data_ignore_count));
} catch (const std::runtime_error &e) {
MessageBoxA(nullptr, e.what(), "BonDriver_PX4 (BonDriver::Init)", MB_OK);
if (display_error_message_) MessageBoxA(nullptr, e.what(), "BonDriver_PX4 (BonDriver::Init)", MB_OK);
return false;
} catch (...) {
MessageBoxA(nullptr, "Fatal error!", "BonDriver_PX4 (BonDriver::Init)", MB_OK);
if (display_error_message_) MessageBoxA(nullptr, "Fatal error!", "BonDriver_PX4 (BonDriver::Init)", MB_OK);
return false;
}
@@ -290,10 +298,10 @@ const BOOL BonDriver::OpenTuner()
open_ = TRUE;
} catch (const std::exception &e) {
ret = FALSE;
MessageBoxA(nullptr, e.what(), "BonDriver_PX4 (BonDriver::OpenTuner)", MB_OK | MB_ICONERROR);
if (display_error_message_) MessageBoxA(nullptr, e.what(), "BonDriver_PX4 (BonDriver::OpenTuner)", MB_OK | MB_ICONERROR);
} catch (...) {
ret = FALSE;
MessageBoxA(nullptr, "Fatal error!", "BonDriver_PX4 (BonDriver::OpenTuner)", MB_OK | MB_ICONERROR);
if (display_error_message_) MessageBoxA(nullptr, "Fatal error!", "BonDriver_PX4 (BonDriver::OpenTuner)", MB_OK | MB_ICONERROR);
}
if (!open_) {
@@ -540,9 +548,9 @@ const BOOL BonDriver::SetChannel(const DWORD dwSpace, const DWORD dwChannel)
ret = ctrl_client_.Tune(tune_timeout_);
}
} catch (const std::exception &e) {
MessageBoxA(nullptr, e.what(), "BonDriver_PX4 (BonDriver::SetChannel)", MB_OK | MB_ICONERROR);
if (display_error_message_) MessageBoxA(nullptr, e.what(), "BonDriver_PX4 (BonDriver::SetChannel)", MB_OK | MB_ICONERROR);
} catch (...) {
MessageBoxA(nullptr, "Fatal error!", "BonDriver_PX4 (BonDriver::SetChannel)", MB_OK | MB_ICONERROR);
if (display_error_message_) MessageBoxA(nullptr, "Fatal error!", "BonDriver_PX4 (BonDriver::SetChannel)", MB_OK | MB_ICONERROR);
}
delete[] reinterpret_cast<std::uint8_t*>(param_set);

1
winusb/src/BonDriver_PX4/bon_driver.hpp
View File

@@ -89,6 +89,7 @@ private:
std::unique_ptr<px4::PipeClient> data_pipe_;
BOOL open_;
DWORD space_, ch_;
BOOL display_error_message_;
std::mutex stream_mtx_;
std::unique_ptr<px4::IoQueue> ioq_;