Skudak/stm32-openinverter-teslacharger
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Upgraded to later CAN module

Browse Source 
fixed type
This commit is contained in:
johannes
2023-01-23 11:32:15 +01:00
parent fada3b0cba
commit 7de1ca7d1d
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charger.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ void DisableAll()
DigIo::evseact_out.Clear();
DigIo::ch1act_out.Clear();
DigIo::ch2act_out.Clear();
DigIo::ch2act_out.Clear();
DigIo::ch3act_out.Clear();
DigIo::ch1ena_out.Clear();
DigIo::ch2ena_out.Clear();
DigIo::ch3ena_out.Clear();
src/main.cpp
+2 -1
View File
@@ -79,11 +79,12 @@ static void MapChargerMessages()
{
uint32_t dummyId;
uint8_t dummyOfs, dummyLen;
int8_t dummyAdd;
float dummyGain;
bool dummyrx;
//check sample value, if it is mapped assume valid CAN map
if (can->FindMap(Param::hwaclim, dummyId, dummyOfs, dummyLen, dummyGain, dummyrx)) return;
if (can->FindMap(Param::hwaclim, dummyId, dummyOfs, dummyLen, dummyGain, dummyAdd, dummyrx)) return;
can->Clear();
src/terminal_prj.cpp
+2 -2
View File
@@ -60,7 +60,7 @@ extern "C" const TERM_CMD termCmds[] =
{ NULL, NULL }
};
static void PrintCanMap(Param::PARAM_NUM param, uint32_t canid, uint8_t offset, uint8_t length, float gain, bool rx)
void PrintCanMap(Param::PARAM_NUM param, uint32_t canid, uint8_t offsetBits, uint8_t length, float gain, int8_t offset, bool rx)
{
const char* name = Param::GetAttrib(param)->name;
fprintf(curTerm, "can ");
@@ -69,7 +69,7 @@ static void PrintCanMap(Param::PARAM_NUM param, uint32_t canid, uint8_t offset,
fprintf(curTerm, "rx ");
else
fprintf(curTerm, "tx ");
fprintf(curTerm, "%s %d %d %d %f\r\n", name, canid, offset, length, FP_FROMFLT(gain));
fprintf(curTerm, "%s %d %d %d %f %d\r\n", name, canid, offsetBits, length, FP_FROMFLT(gain), offset);
}
//cantx param id offset len gain