Skip to content

Commit 07da74b

Browse files
committed
Fix OSX builds (maybe?)
1 parent 58ff570 commit 07da74b

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

include/radio_tool/codeplug/rdt_general.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ namespace radio_tool::codeplug
6868
intro_line2.shrink_to_fit();
6969
}
7070

71-
auto ToString() const -> const std::u16string
71+
auto ToString() const -> const std::wstring
7272
{
73-
std::basic_stringstream<char16_t> out;
73+
std::basic_stringstream<wchar_t> out;
7474

7575
out
76-
<< "Intro 1: " << intro_line1 << std::endl
77-
<< "Intro 2: " << intro_line2; //<< std::endl;
76+
<< "Intro 1: " << std::wstring(intro_line1.begin(), intro_line1.end()) << std::endl
77+
<< "Intro 2: " << std::wstring(intro_line2.begin(), intro_line2.end()); //<< std::endl;
7878

7979
return out.str();
8080
}

src/tyt_radio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ auto TYTRadio::WriteFirmware(const std::string &file) const -> void
6161
auto b_offset = 0u;
6262
flash::FlashUtil::AlignedContiguousMemoryOp(flash::STM32F40X, r.address, r.address + r.size, [this, &fw, &r, &TransferSize, &b_offset](const uint32_t &addr, const uint32_t &size, const flash::FlashSector &sector) {
6363
const auto& binary_data = r.data;
64-
const auto blocks = (int)std::ceil(size / (double)TransferSize);
64+
const auto blocks = (int)ceil(size / (double)TransferSize);
6565

6666
std::cerr << "Writing: 0x" << std::setw(8) << std::setfill('0') << std::hex << addr
6767
<< " [Size=0x" << std::hex << size << "]" << std::endl;

0 commit comments

Comments
 (0)