search

rnd-ash / Macchina-J2534

J2534 drivers for various Macchina hardware
78 stars 18 forks source link

Unable to compile for M2 - 'calc_cs' was not declared in this scope #13

Open thesavant42 opened 3 years ago

thesavant42 commented 3 years ago

Greetings! As the title above indicates, I have been unable to successfully compile for the M2 as of commit c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae. The merge at commit df450532f4d17fdc6a241bd5b6a6b1f55423dc75 compiles fine, but then the LIN changes afterwards breaks things for me.

The A0 compiles without issue on both builds. The hardware is standard retail M2 with no modifications. I have installed all of the libraries from the M2 documentation, as well as pwm_lib.

MacOS Big Sur (latest) Arduino IDE 1.8.15 (latest)

Arduino: 1.8.15 (Mac OS X), Board: "Macchina M2"

In file included from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channels.h:8:0,
                 from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp:1:
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/j2534_mini.h:11:0: warning: "CAN" redefined [enabled by default]
 #define CAN    0x05 // CAN protocol (Uses CAN-D)
 ^
In file included from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/custom_can.h:8:0,
                 from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channels.h:7,
                 from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp:1:
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/due_can.h:45:0: note: this is the location of the previous definition
 #define CAN  Can0
 ^
In file included from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/custom_can.h:8:0,
                 from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channels.h:7,
                 from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/channel.h:6,
                 from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/firmware.ino:3:
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/due_can.h:45:0: warning: "CAN" redefined [enabled by default]
 #define CAN  Can0
 ^
In file included from /Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/firmware.ino:2:0:
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/j2534_mini.h:11:0: note: this is the location of the previous definition
 #define CAN    0x05 // CAN protocol (Uses CAN-D)
 ^
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp: In member function 'void Iso9141Channel::write_data(uint8_t*, uint8_t, bool)':
comm_channel_iso9141.cpp:96:48: error: 'calc_cs' was not declared in this scope
         new_buf[buf_len] = calc_cs(buf, buf_len);
                                                ^
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp: In member function 'virtual void Iso9141Channel::ioctl_get(uint32_t)':
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp:114:85: warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]
     PCCOMM::respond_err(MSG_IOCTL_GET, ERR_FAILED, "ISO9141 IOCTL get unimplemented");
                                                                                     ^
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp: In member function 'virtual void Iso9141Channel::wakeup(uint8_t, uint8_t*, uint8_t)':
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp:118:41: warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]
     PCCOMM::log_message("Wakeup started");
                                         ^
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp:121:84: warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]
         PCCOMM::respond_err(MSG_INIT_LIN_CHANNEL, ERR_FAILED, "Five baud init TODO");
                                                                                    ^
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp:162:81: warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]
             PCCOMM::respond_err(MSG_INIT_LIN_CHANNEL, ERR_TIMEOUT, "ECU TIMEOUT");
                                                                                 ^
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp:170:81: warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]
             PCCOMM::respond_err(MSG_INIT_LIN_CHANNEL, ERR_TIMEOUT, "ECU Timeout");
                                                                                 ^
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp: At global scope:
comm_channel_iso9141.cpp:175:61: error: no 'uint8_t Iso9141Channel::calc_cs(uint8_t*, uint8_t)' member function declared in class 'Iso9141Channel'
 uint8_t Iso9141Channel::calc_cs(uint8_t* buffer, uint8_t len) {
                                                             ^
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp: In member function 'virtual void Iso9141Channel::ioctl_set(uint32_t, uint32_t)':
/Users/savant/Desktop/Macchina-J2534-c9e2ffb6a0f00c01fbdd448c66af42ec92a915ae/firmware/comm_channel_iso9141.cpp:219:89: warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]
         PCCOMM::respond_err(MSG_IOCTL_SET, ERR_FAILED, "ISO9141 IOCTL set unimplemented");
                                                                                         ^
exit status 1
'calc_cs' was not declared in this scope

This report would have more information with
"Show verbose output during compilation"
option enabled in File -> Preferences.

I've confirmed these same results in Windows 10 as well.

Cheers!

Mantix86 commented 2 years ago

Hello thesavant42, Have you managed to a solution to this problem? I am getting a similar error:

Arduino: 1.8.19 (Windows 10), Board: "Macchina M2"

comm_channel_iso9141.cpp:96:48: error: 'calc_cs' was not declared in this scope

     new_buf[buf_len] = calc_cs(buf, buf_len);

                                            ^

comm_channel_iso9141.cpp:175:61: error: no 'uint8_t Iso9141Channel::calc_cs(uint8_t*, uint8_t)' member function declared in class 'Iso9141Channel'

uint8_t Iso9141Channel::calc_cs(uint8_t* buffer, uint8_t len) {

                                                         ^

exit status 1

'calc_cs' was not declared in this scope

naskocholev commented 2 years ago

Hello, i have a solution to this problem? Just change all file comm_channel_iso9141.cpp with this:

include "comm_channels.h"

include "pt_device.h"

if defined(CFG_MACCHINA_M2)

define RX_PIN LIN_KRX

define TX_PIN LIN_KTX

define SLP_PIN LIN_KSLP

void Iso9141Channel::set_port(bool state) { if (state) { this->obdSerial->begin(this->baud); } else { this->obdSerial->end(); pinMode(SLP_PIN, OUTPUT); digitalWrite(SLP_PIN, HIGH); } }

void Iso9141Channel::set_line(bool state) { digitalWrite(TX_PIN, state); }

bool Iso9141Channel::setup(int id, int protocol, int baud, int flags) { this->channel_id = id; this->obdSerial = &Serial1; this->baud = baud; pinMode(SLP_PIN, OUTPUT); digitalWrite(SLP_PIN, HIGH); PT_DEVICE->set_kline_led(true);

pinMode(RX_PIN, INPUT);
digitalWrite(RX_PIN, HIGH);
#ifdef ARDUINO_SAM_DUE
      g_APinDescription[RX_PIN].pPort -> PIO_PDR = g_APinDescription[RX_PIN].ulPin;
      g_APinDescription[TX_PIN].pPort -> PIO_PDR = g_APinDescription[TX_PIN].ulPin;
#endif
this->obdSerial->begin(baud);

// Default timings
uint32_t p1_min = 0;
uint32_t p1_max = 20;
uint32_t p2_min = 25;
uint32_t p2_max = 50;
uint32_t p3_min = 55;
uint32_t p3_max = 5000;
uint32_t p4_min = 5;
uint32_t p4_max = 20;

uint32_t w1 = 300;
uint32_t w2 = 20;
uint32_t w3 = 20;
uint32_t w4 = 50;
uint32_t w5 = 300;

uint32_t tidle = w5;
uint32_t tinl = 25;
uint32_t twup = 50;

uint32_t parity = 0;
return true;

}

void Iso9141Channel::addFilter(int type, int filter_id, char mask, char pattern, char* flowcontrol, int mask_len, int pattern_len, int flowcontrol_len) { PCCOMM::respond_ok(MSG_SET_CHAN_FILT, nullptr, 0); }

void Iso9141Channel::update() {

}

void Iso9141Channel::removeFilter(int id) { PCCOMM::respond_ok(MSG_REM_CHAN_FILT, nullptr, 0); }

void Iso9141Channel::destroy() { this->obdSerial->end(); this->obdSerial = nullptr; PT_DEVICE->set_kline_led(false); }

/**

void Iso9141Channel::write_data(uint8_t buf, uint8_t buf_len, bool do_checksum) { uint8_t len = buf_len; uint8_t new_buf = nullptr; //test1 uint8_t test1=0; for (uint8_t i = 0; i < buf_len; i++) { test1 += buf[i]; } //end test1 if (do_checksum) { new_buf = (uint8_t*)malloc(buf_len+1); memcpy(&new_buf[0], &buf[0], buf_len);

   // new_buf[buf_len] = calc_cs(buf, buf_len);
    //test1
    new_buf[buf_len] = test1;
    //test1
    len += 1;
} else {
    new_buf = (uint8_t*)malloc(buf_len);
    memcpy(&new_buf[0], &buf[0], buf_len);
}

for (int i = 0; i < len; i++) {
    this->obdSerial->write(new_buf[i]);
    delay(this->p4_min);
}
this->obdSerial->setTimeout(this->p1_max*len);
this->obdSerial->readBytes(new_buf, len);
delete[] new_buf;

}

void Iso9141Channel::ioctl_get(uint32_t id) { PCCOMM::respond_err(MSG_IOCTL_GET, ERR_FAILED, "ISO9141 IOCTL get unimplemented"); }

void Iso9141Channel::wakeup(uint8_t type, uint8_t* request, uint8_t request_len) { PCCOMM::log_message("Wakeup started"); if (type == 0) { // TODO FIVE BAUD INIT PCCOMM::respond_err(MSG_INIT_LIN_CHANNEL, ERR_FAILED, "Five baud init TODO"); } else { // Fast init this->set_port(false); this->set_line(true); delay(this->tidle); this->set_line(false); delay(this->tinl); this->set_line(true); delay(this->twup);

    this->set_port(true);
    /**
     * Request according the passthru API looks like this
     * request[0] - Format(functional addressing) (First header byte)
     * request[1] - Initialization address used to activate all ECUs (Second header byte)
     * request[2] - Scan tool physical source address (Third header byte)
     * request[3] - Start communication request Service ID (First data byte)
     */
    this->write_data(request, request_len, true); // Todo handle no checksum

    /**
     * Some responses I got in W215...nothing  makes sense
     * NOTE: RX fields ignore the echoed back data from TX, that is handled in 'write_data'
     * 
     * TX: 81, 20, F3, 81
     * RX: 73, FF, 81, 15, 90, 5D, 07, 20, 00, 00, 00, 02, F1, 40, 08, 00, 01, 00, 00, 00, 01, 00, 00, 00, 01, 01, 00, 00, 
     *     C0, 32, 07, 20, E8, 09, 07, 20, AD, 15, 08, 00, 04, 00, 00, 00, C9, 32, 07, 20, 01, 00, 00, 00, F7, 08
     * 
     * TX: 81, 20, F3, 81
     * RX: FF, F3, FF, FF, 81, 15, FF, FF, 00, 00, 00, 02, F1, 40, 08, 00, 01, 00, 00, 00, 01, 00, 00, 00, 01, 01, 00, 00, 
     *     C0, 32, 07, 20, E8, 09, 07, 20, AD, 15, 08, 00, 04, 00, 00, 00, C9, 32, 07, 20, 01, 00, 00, 00, F7, 08, 08, 00, 
     *     11, 00, 00, 00, C0, 32, 07, 20, 00, 00
     * 
     * TX: 81, 20, F3, 81
     * RX: 15, FF, FF, 00, 90, 5D, 07, 20, 00, 00, 00, 02, F1, 40, 08, 00, 01, 00, 00, 00, 01, 00, 00, 00
     * 
     * Returning "RX" back to Vediamo results in it crashing 
     */

    this->obdSerial->setTimeout(this->p1_max + this->p3_min);
    uint8_t resp[30];
    if(!this->obdSerial->readBytes(resp, 1)) {
        PCCOMM::respond_err(MSG_INIT_LIN_CHANNEL, ERR_TIMEOUT, "ECU TIMEOUT");
    }
    uint8_t len = resp[0] & 0b111111;
    uint8_t remainder = len + 2;
    this->obdSerial->setTimeout(this->p1_max * (remainder+1) + this->p3_min);
    if (this->obdSerial->readBytes(&resp[1], remainder)) {
        PCCOMM::respond_ok(MSG_INIT_LIN_CHANNEL, resp, remainder+1);
    } else {
        PCCOMM::respond_err(MSG_INIT_LIN_CHANNEL, ERR_TIMEOUT, "ECU Timeout");
    }
}

}

// uint8_t Iso9141Channel::calc_cs(uint8_t* buffer, uint8_t len) { // uint8_t res = 0; // for (uint8_t i = 0; i < len; i++) { // res += buffer[i]; // } // return res; // }

void Iso9141Channel::ioctl_set(uint32_t id, uint32_t value) { if (id == P1_MIN) { this->p1_min = value; } else if (id == P1_MAX) { this->p1_max = value; } else if (id == P2_MIN) { this->p2_min = value; } else if (id == P2_MAX) { this->p2_max = value; } else if (id == P3_MIN) { this->p3_min = value; } else if (id == P3_MAX) { this->p3_max = value; } else if (id == P4_MIN) { this->p4_min = value; } else if (id == P4_MAX) { this->p4_max = value; } else if (id == W1) { this->w1 = value; } else if (id == W2) { this->w2 = value; } else if (id == W3) { this->w3 = value; } else if (id == W4) { this->w4 = value; } else if (id == W5) { this->w5 = value; } else if (id == TIDLE) { this->tidle = value; } else if (id == TINL) { this->tinl = value; } else if (id == TWUP) { this->twup = value; } else if (id == PARITY) { this->parity = value; } else { PCCOMM::respond_err(MSG_IOCTL_SET, ERR_FAILED, "ISO9141 IOCTL set unimplemented"); return; } PCCOMM::respond_ok(MSG_IOCTL_SET, nullptr, 0); }

endif