Dual CANbus monitor and instrumentation cluster supporting ILI9341 display controller
Dependencies: SPI_TFTx2_ILI9341 TOUCH_TFTx2_ILI9341 TFT_fonts mbed
Fork of CANary by
Diff: utility.cpp
- Branch:
- Metric
- Revision:
- 112:b41b35401eb6
- Parent:
- 111:d1559bb25c43
- Child:
- 114:3f8c59a8a2b9
--- a/utility.cpp Sun Jun 30 23:04:56 2013 +0000 +++ b/utility.cpp Mon Jul 01 01:58:36 2013 +0000 @@ -310,10 +310,8 @@ packA -= 1; //Slight correction to value required (unique to my Leaf?) imWs_x4 = packV; // Volts*milliSeconds*2 imWs_x4 *= -packA; // milliWattseconds*4 - //if (!((imotorRPM<2)&&(imWs_x4<0))){ //Ignore if charging from wall mWs_x4 += imWs_x4; // total mWs_x4 numWsamples++; - //} }else if((mType==1)&&(canRXmsg.id==0x1da)){ //Motor Speed imotorRPM=((canRXmsg.data[4]<<8)|(canRXmsg.data[5])); if(imotorRPM<0){ // take absolute value