diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aef8952 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +obj +*.o +stm32_charger* +linker.map +*.layout +*.out diff --git a/src/charger.cpp b/src/charger.cpp index afa2300..db1c528 100644 --- a/src/charger.cpp +++ b/src/charger.cpp @@ -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(); diff --git a/src/main.cpp b/src/main.cpp index 3dcec61..1ee6361 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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(); diff --git a/src/terminal_prj.cpp b/src/terminal_prj.cpp index be95ea0..8b0f533 100644 --- a/src/terminal_prj.cpp +++ b/src/terminal_prj.cpp @@ -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 diff --git a/tesla.cbp b/tesla.cbp index b61f75d..bad410e 100644 --- a/tesla.cbp +++ b/tesla.cbp @@ -80,6 +80,7 @@ + diff --git a/test/test.out b/test/test.out deleted file mode 100755 index 6594a49..0000000 Binary files a/test/test.out and /dev/null differ