Upgraded to later CAN module

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
+6
View File
@@ -0,0 +1,6 @@
obj
*.o
stm32_charger*
linker.map
*.layout
*.out
+1 -1
View File
@@ -30,7 +30,7 @@ void DisableAll()
DigIo::evseact_out.Clear(); DigIo::evseact_out.Clear();
DigIo::ch1act_out.Clear(); DigIo::ch1act_out.Clear();
DigIo::ch2act_out.Clear(); DigIo::ch2act_out.Clear();
DigIo::ch2act_out.Clear(); DigIo::ch3act_out.Clear();
DigIo::ch1ena_out.Clear(); DigIo::ch1ena_out.Clear();
DigIo::ch2ena_out.Clear(); DigIo::ch2ena_out.Clear();
DigIo::ch3ena_out.Clear(); DigIo::ch3ena_out.Clear();
+2 -1
View File
@@ -79,11 +79,12 @@ static void MapChargerMessages()
{ {
uint32_t dummyId; uint32_t dummyId;
uint8_t dummyOfs, dummyLen; uint8_t dummyOfs, dummyLen;
int8_t dummyAdd;
float dummyGain; float dummyGain;
bool dummyrx; bool dummyrx;
//check sample value, if it is mapped assume valid CAN map //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(); can->Clear();
+2 -2
View File
@@ -60,7 +60,7 @@ extern "C" const TERM_CMD termCmds[] =
{ NULL, NULL } { 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; const char* name = Param::GetAttrib(param)->name;
fprintf(curTerm, "can "); fprintf(curTerm, "can ");
@@ -69,7 +69,7 @@ static void PrintCanMap(Param::PARAM_NUM param, uint32_t canid, uint8_t offset,
fprintf(curTerm, "rx "); fprintf(curTerm, "rx ");
else else
fprintf(curTerm, "tx "); 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 //cantx param id offset len gain
+1
View File
@@ -80,6 +80,7 @@
<Unit filename="libopeninv/src/terminal.cpp" /> <Unit filename="libopeninv/src/terminal.cpp" />
<Unit filename="libopeninv/src/terminalcommands.cpp" /> <Unit filename="libopeninv/src/terminalcommands.cpp" />
<Unit filename="linker.ld" /> <Unit filename="linker.ld" />
<Unit filename="src/charger.cpp" />
<Unit filename="src/chargercan.cpp" /> <Unit filename="src/chargercan.cpp" />
<Unit filename="src/hwinit.cpp" /> <Unit filename="src/hwinit.cpp" />
<Unit filename="src/main.cpp" /> <Unit filename="src/main.cpp" />
BIN
View File
Binary file not shown.