Skip to content

Commit 023cee2

Browse files
authored
fixed warning (#2297)
1 parent fcc52e8 commit 023cee2

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

firmware/application/apps/ui_standalone_view.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,9 @@ standalone_application_api_t api = {
124124
};
125125

126126
StandaloneView::StandaloneView(NavigationView& nav, uint8_t* app_image)
127-
: nav_(nav), _app_image(app_image) {
128-
if (_app_image == nullptr) {
127+
: nav_(nav),
128+
_app_image(*app_image) {
129+
if (app_image == nullptr) {
129130
chDbgPanic("Invalid application image");
130131
}
131132

firmware/application/apps/ui_standalone_view.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ class StandaloneView : public View {
5454
private:
5555
bool initialized = false;
5656
NavigationView& nav_;
57-
uint8_t* _app_image;
57+
uint8_t& _app_image;
5858
standalone_application_information_t* get_application_information() const {
59-
return reinterpret_cast<standalone_application_information_t*>(_app_image);
59+
return reinterpret_cast<standalone_application_information_t*>(&_app_image);
6060
}
6161

6262
MessageHandlerRegistration message_handler_sample{

firmware/common/i2cdev_ppmod.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ std::vector<uint8_t> I2cDev_PPmod::downloadStandaloneApp(uint32_t index, size_t
6969
return {};
7070
}
7171

72-
uint16_t data[3] = {(uint16_t)Command::COMMAND_APP_TRANSFER, index, offset / transfer_block_size};
72+
uint16_t data[3] = {(uint16_t)Command::COMMAND_APP_TRANSFER, (uint16_t)index, (uint16_t)(offset / transfer_block_size)};
7373

7474
std::vector<uint8_t> ret(transfer_block_size);
7575
bool success = i2c_read((uint8_t*)&data, sizeof(data), (uint8_t*)ret.data(), transfer_block_size);

0 commit comments

Comments
 (0)