Skip to content

Commit

Permalink
Merge pull request #883 from llange/fix-warning-as-errors
Browse files Browse the repository at this point in the history
Fix warning as errors
  • Loading branch information
dexterbg committed Apr 29, 2023
2 parents 6d2298b + 55fcaa1 commit 82e6073
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ void OvmsServerV2::ProcessServerMsg()

delete pm_crypto1;
delete pm_crypto2;
delete d;
delete[] d;
ESP_LOGI(TAG, "Decoded Paranoid Msg: %s",line.c_str());
}

Expand Down Expand Up @@ -763,7 +763,7 @@ bool OvmsServerV2::Transmit(const std::string& message)
strcat(s,code);
base64encode(d, len-6, (uint8_t*)s+8);
// The messdage is now in paranoid mode...
delete d;
delete[] d;
delete pm_crypto1;
delete pm_crypto2;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -471,11 +471,11 @@ CANopenResult_t SevconClient::QueryLogs(int verbosity, OvmsWriter* writer, int w
buf.str(""); buf.clear();
buf << "RT-ENG-LogFaults," << n << ",86400,";
AddFaultInfo(buf, sdoval);
_readsdo(0x4112, 0x02); buf << "," << sdoval;
_readsdo(0x4112, 0x03); buf << "," << sdoval;
_readsdo(0x4112, 0x04); buf << "," << sdoval;
_readsdo(0x4112, 0x05); buf << "," << sdoval;
_readsdo(0x4112, 0x06); buf << "," << sdoval;
(void)_readsdo(0x4112, 0x02); buf << "," << sdoval;
(void)_readsdo(0x4112, 0x03); buf << "," << sdoval;
(void)_readsdo(0x4112, 0x04); buf << "," << sdoval;
(void)_readsdo(0x4112, 0x05); buf << "," << sdoval;
(void)_readsdo(0x4112, 0x06); buf << "," << sdoval;
_output(buf);
outcnt++;
}
Expand All @@ -497,11 +497,11 @@ CANopenResult_t SevconClient::QueryLogs(int verbosity, OvmsWriter* writer, int w
buf.str(""); buf.clear();
buf << "RT-ENG-LogSystem," << n << ",86400,";
AddFaultInfo(buf, sdoval);
_readsdo(0x4102, 0x02); buf << "," << sdoval;
_readsdo(0x4102, 0x03); buf << "," << sdoval;
_readsdo(0x4102, 0x04); buf << "," << sdoval;
_readsdo(0x4102, 0x05); buf << "," << sdoval;
_readsdo(0x4102, 0x06); buf << "," << sdoval;
(void)_readsdo(0x4102, 0x02); buf << "," << sdoval;
(void)_readsdo(0x4102, 0x03); buf << "," << sdoval;
(void)_readsdo(0x4102, 0x04); buf << "," << sdoval;
(void)_readsdo(0x4102, 0x05); buf << "," << sdoval;
(void)_readsdo(0x4102, 0x06); buf << "," << sdoval;
_output(buf);
outcnt++;
}
Expand All @@ -525,11 +525,11 @@ CANopenResult_t SevconClient::QueryLogs(int verbosity, OvmsWriter* writer, int w
buf.str(""); buf.clear();
buf << "RT-ENG-LogCounts," << n << ",86400,";
AddFaultInfo(buf, sdoval);
_readsdo(0x4201+n, 0x04); buf << "," << sdoval;
_readsdo(0x4201+n, 0x05); buf << "," << sdoval;
_readsdo(0x4201+n, 0x02); buf << "," << sdoval;
_readsdo(0x4201+n, 0x03); buf << "," << sdoval;
_readsdo(0x4201+n, 0x06); buf << "," << sdoval;
(void)_readsdo(0x4201+n, 0x04); buf << "," << sdoval;
(void)_readsdo(0x4201+n, 0x05); buf << "," << sdoval;
(void)_readsdo(0x4201+n, 0x02); buf << "," << sdoval;
(void)_readsdo(0x4201+n, 0x03); buf << "," << sdoval;
(void)_readsdo(0x4201+n, 0x06); buf << "," << sdoval;
_output(buf);
outcnt++;
}
Expand All @@ -553,15 +553,15 @@ CANopenResult_t SevconClient::QueryLogs(int verbosity, OvmsWriter* writer, int w
if (!_readsdo(0x4300+n, 0x02)) break;
buf.str(""); buf.clear();
buf << "RT-ENG-LogMinMax," << n << ",86400," << sdoval;
_readsdo(0x4300+n, 0x03); buf << "," << (int16_t) sdoval;
_readsdo(0x4300+n, 0x04); buf << "," << (int16_t) sdoval;
_readsdo(0x4300+n, 0x05); buf << "," << (int16_t) sdoval;
_readsdo(0x4300+n, 0x06); buf << "," << (int16_t) sdoval;
_readsdo(0x4300+n, 0x07); buf << "," << (int16_t) sdoval;
_readsdo(0x4300+n, 0x0a); buf << "," << (int16_t) sdoval;
_readsdo(0x4300+n, 0x0b); buf << "," << (int16_t) sdoval;
_readsdo(0x4300+n, 0x0c); buf << "," << (int16_t) sdoval;
_readsdo(0x4300+n, 0x0d); buf << "," << (int16_t) sdoval;
(void)_readsdo(0x4300+n, 0x03); buf << "," << (int16_t) sdoval;
(void)_readsdo(0x4300+n, 0x04); buf << "," << (int16_t) sdoval;
(void)_readsdo(0x4300+n, 0x05); buf << "," << (int16_t) sdoval;
(void)_readsdo(0x4300+n, 0x06); buf << "," << (int16_t) sdoval;
(void)_readsdo(0x4300+n, 0x07); buf << "," << (int16_t) sdoval;
(void)_readsdo(0x4300+n, 0x0a); buf << "," << (int16_t) sdoval;
(void)_readsdo(0x4300+n, 0x0b); buf << "," << (int16_t) sdoval;
(void)_readsdo(0x4300+n, 0x0c); buf << "," << (int16_t) sdoval;
(void)_readsdo(0x4300+n, 0x0d); buf << "," << (int16_t) sdoval;
_output(buf);
outcnt++;
}
Expand Down
1 change: 1 addition & 0 deletions vehicle/OVMS.V3/main/test_framework.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ void test_watchdog(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, int argc
writer->puts("Error: We should never get here");
}

__attribute__((noreturn))
void test_stackoverflow(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, int argc, const char* const* argv)
{
uint8_t data[256];
Expand Down

0 comments on commit 82e6073

Please sign in to comment.