Dual CANbus monitor and instrumentation cluster. Presently tuned for the Nissan Leaf EV.

Dependencies:   SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2_ILI9341 mbed

Fork of CANary_corrupt by Tick Tock

After adding the LPC1768 platform, import as a program and do not select the "update to latest revision" box

User Guide

Eagle Schematic and Board design

/media/uploads/TickTock/canaryr6.zip

/media/uploads/TickTock/canary_sch.jpg

/media/uploads/TickTock/canaryr6brd.jpg

For LCD Rev 1.01:

/media/uploads/TickTock/lcdsch.jpg

For VCD Rev 2.00:

/media/uploads/TickTock/lcdr2.jpg

Parts List

qtyinstancepart #packagesupplierDescription
1BAT3Vhttp://www.ebay.com/itm/10x-CR2032-SMD-Battery-Holder-for-CR2032-Battery-/180938057979?pt=LH_DefaultDomain_0&hash=item2a20bfa8fbLithium 2032 coin battery holder
4C1-C4ECST1DC106R6032Tantalium capacitor 10uF
3FC1-FC3ZF1-20-01-T-WThttp://www.samtec.com/cable-systems/idc-ffc/ffc/zero-insertion.aspx20 conductor 1mm pitch flex cable connector (optional)
1FJ-20-R-08.00-4http://www.samtec.com/cable-systems/idc-ffc/ffc/zero-insertion.aspx8\" 20 conductor 1mm pitch flex connector, end reversed (optional)
2H1-H4(DON'T populate H1-H4 headers - solder mbed directly)
1H5http://www.ebay.com/itm/221186042943?ssPageName=STRK:MEWNX:IT&_trksid=p3984.m1497.l26491x12 .1\" pitch header (optional)
1H62x6 .1\" pitch header (optional)
2IC1,IC2VP230LMDSOP8http://www.ebay.com/itm/130488665247?ssPageName=STRK:MEWNX:IT&_trksid=p3984.m1497.l2649canbus transciever
1IC3LM1117-5VSOT2235V regulator
5JP*2 pin .1\" jumper header
1mbedLPC1768http://www.ebay.com/itm/200830573509?ssPageName=STRK:MEWNX:IT&_trksid=p3984.m1497.l2649mbed uC
2Q1,Q22N2222SOT23General purpose NPN transistor
1R1R393M120639K resistor
1R2R103M120610K resistor
4R4-R6R102M12061K resistor
1R3R500M120650 Ohm resistor
2TR1-TR5ZJYS81R5-2PL51TG01http://www.digikey.com/product-detail/en/ZJYS81R5-2PL51T-G01/445-2223-1-ND/765232CM Choke
1Z11N5340BGC1702-15http://www.ebay.com/itm/150878122425?ssPageName=STRK:MEWNX:IT&_trksid=p3984.m1497.l26496V, 5W Zener Diode
1Z1DC-DC conveterhttp://www.ebay.com/itm/251142727849?ssPageName=STRK:MEWNX:IT&_trksid=p3984.m1497.l264912V-7V, 3W DC-DC converter
1X1USBhttp://www.ebay.com/itm/New-Vertical-USB-2-0-A-pcb-connector-socket-USB-A-Type-/300553895292?pt=LH_DefaultDomain_0&hash=item45fa687d7cvertical USB connector
2LCD0,LCD1TFThttp://www.mikroe.com/add-on-boards/display/tft-proto/320x240 LCD with touch screen
1E0Enclosurehttp://www.shapeways.com/model/1077799/canary.html?li=user-profile&materialId=63d printed enclosure

Assembly

1) LCD Displays

I found ribbon cable is a nice way to organize the wires to the displays. There are two versions of the display and each must be wired differently. The original project used HW REV. 1.01. For that version, you'll need 12 conductors and I connected them in the following order:

1LED+
2LED-
3RST
4SDI
5WR/SCLK
6CS
7X+
8X-
9Y+
10Y-
11VDD
12GND

If, instead, you have HW REV 2.0, you will need 13 conductors with the following order:

1LED+
2LED-
3RST
4SDI
5RS (SCLK)
6WR (DC)
7CS
8X+
9X-
10Y+
11Y-
12VDD
13GND

First I connected all the GND connections (2 GND & IM0, IM1, IM3 for REV1.01 or 2 GND, RD, & IM0 for REV2.00). Do not connect the bottom GND until you have the ribbon cable connected. After making all the ribbon cable connections (connecting the GND of the ribbon cable to the bottom GND pad), solder the GND bar from the previous step to the back of the bottom GND connection. Finally, make a connection from the back side 3.3V pin to IM2 for REV1.01 or to IM1,IM2,&IM3 for REV2.00. Take a break and repeat for the second display.

Examples of REV1.01 boards:

/media/uploads/TickTock/lcdtop.jpg /media/uploads/TickTock/lcdbot.jpg

Examples of REV2.00:

/media/uploads/TickTock/rev2front.jpg /media/uploads/TickTock/rev2back.jpg

Once the two displays are complete combine all wires except CS0, CS1, X+, X-, Y+, and Y-. Connect X- of the left display to X+ of the right. Similarly connect Y- of the left display to Y+ of the right. Insulate any exposed wires.

2) PCB

Refer to the schematics to place all the components on the board. If you plan to install into the CANary 3D enclosure, DO NOT install the battery holder or the socket for the mbed and, instead, connect two wires to the VB and GND pads nearby. You will have to install the battery holder against the back wall to avoid interfering with the right-hand display and the mbed will have to be directly soldered. I have not found a socket with a low enough profile to fit in the space provided (depth of enclosure is limited by the space behind the center console). Also, I recommend keeping as much lead as possible on the Zener diode (bending it as shown to clear the back wall). Although it is operating well within parameters, the Zener gets quite hot during extended operation and the leads help dissipate the heat and keep it away from the PCB and other components.Update: Several Zeners have failed resulting in damage to some users boards so I recommend using a DC-DC converter instead to bring the 12V down to 7V.

/media/uploads/TickTock/pcbtop.jpg /media/uploads/TickTock/pcbbot.jpg

Once the PCB is populated, solder the LCDs to the PCB. CS0 connects to the right display and CS1 connects to the left. /media/uploads/TickTock/brddis.jpg

Update: The Zener diodes tended to fail after a few months so I am recommending removing them and replacing with a DC-DC converter. This will run cooler and waste less energy, too. To install, remove the left display panel to gain access to the Zener. From there, the Zener can be removed and it's pads used to connect to the DC-DC converter. I recommend setting the output voltage on the bench before installing since the trim pot is tricky to reach once installed. Set it to 7V. The input can be connected to the left pad previously occupied by the zener and the output can connect to the right. GND(-) can be connected to the bottom right pad on the 2x6 header below the flex cable connector. Make sure the GND wire lies flat so it doesn't interfere with the connection of the flex cable. /media/uploads/TickTock/dcdcinst2.jpg

Once soldered in place, the DC-DC converter can easily be mounted to the back wall with double sided tape above the battery holder. /media/uploads/TickTock/dcdcinst3.jpg

3) Testing

1)First step is to buzz out all connections from the LCDs to the pins in the main board
2)Next check the touch screen connections. On the main board, place an Ohm meter across X+ and X-. You should read 700 Ohms. Repeat for Y+ and Y-. Then test the resistance from X+ to Y+. With nothing touching the screens, it should read >100K Ohms and <1K when touching either screen.
3)When all connections are checked, solder in the mbed. Download and install the touch2 program http://mbed.org/users/TickTock/code/touch2/ to test the basic operation of the mbed and touch screens.
tips:
Touch screen is sensitive - excess flux on X+,X-,Y+,Y- connection on mbed can result in flakey operation
If touch is not working, double-check the LCD0_CS and LCD1_CS are not swapped. LCD0_CS must connect to the CS of the LCD that has X- & Y- connected to the mbed. LCD1_CS must connect to the CS of the LCD that has X+ & Y+ connected to the mbed.
4)Once touch2 works, it is time to connect to the OBD connector. I highly recommend double checking all connections from the OBD to the PCB with the cable in place before connecting to the Leaf. Buzz out all the pins in the OBS to make sure none are shorting to each other, Check that the 12V goes to the Zener (and nothing else) and the switched 12V to the resistor divider (and nothing else). Test the ground connection properly connects to ground and nothing else.
5)Once you are confident there are no shorts or wrong connections from the OBD connector, take a deep breath and plug it into your leaf. Touch2 program should come up and function. Unplug and install the latest CANary firmware. If you have the REV2.00 LCD boards, you will need to edit the precompile.h file in the TOUCH_TFTx2_w9341 library and set USE_ILI9341 to 1. Test all features before installing into the enclosure (gids, cellpair, menu system, logging) since installing and removing from the enclosure is a PITA.

/media/uploads/TickTock/pcbdone.jpg /media/uploads/TickTock/functioning.jpg

4) Enclosure

The 3D printer leaves a lot of powder behind - I used a strong spray of water to get it out of all the cracks. The enclosure comes with a rather rough finish. I recommend convincing yourself you like it, then simply lightly sand then paint before assembly. Sanding is very difficult - the nylon is very nicely fused and doesn't want to sand. I tried sandblasting and that didn't work either. I had some limited success with filler and then sanding, but only on the outside - it is too difficult to sand the face. /media/uploads/TickTock/enclosure.jpg

5) Final Assembly

Make sure you are well rested with lots of patience before attempting assembly. It is a puzzle figuring out how to get both displays and the PCB in place. Enclosure was too expensive for me to keep iterating to optimize for assembly. I ended up snipping the thin display posts shorter and using various tools to push the displays into place. Also, some USB connectors are taller than others. If you have one of the taller ones, you will have to deflect the back wall a bit while inserting the PCB (being careful not to bend the housing) to get it to it's opening in the back wall. Do use a screw in the provided post to secure the PCB as USB insertion will otherwise dislodge it.

I added an additional safety line which wraps around the center post to prevent the enclosure from becoming a projectile in the event of an accident. /media/uploads/TickTock/safety.jpg Installed: /media/uploads/TickTock/installed.jpg

Committer:
TickTock
Date:
Sun Jun 30 17:52:58 2013 +0000
Branch:
Metric
Revision:
109:3e6f0e8fca0d
Parent:
108:29b5a760adc2
Child:
110:ffddff3ad2f2
Change filesystem library.  Got logging and playback working.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
TickTock 13:62e0f7f39ff5 1 // utility.cpp
TickTock 13:62e0f7f39ff5 2 #include "utility.h"
TickTock 13:62e0f7f39ff5 3
TickTock 13:62e0f7f39ff5 4 void mbed_reset();
TickTock 22:a43df3905863 5
TickTock 13:62e0f7f39ff5 6 void RTC_IRQHandler() {
TickTock 13:62e0f7f39ff5 7 timer.reset(); // zero ms at the-seconds-tic
TickTock 20:3bf176d14b14 8 canIdle=(++secsNoMsg>canTimeout)?true:false;
TickTock 20:3bf176d14b14 9 userIdle=(++secsNoTouch>userTimeout)?true:false;
TickTock 13:62e0f7f39ff5 10 LPC_RTC->ILR |= (1<<0); // clear interrupt to prepare for next
TickTock 34:4751a8259b18 11 tick=true;
garygid 69:6bfdfc002036 12 // will use this to generate a logTP() just before the next Message received.
garygid 69:6bfdfc002036 13 if( (time(NULL) % 60) == 0) ZeroSecTick = true; // gg - at 0-second of each minute
TickTock 13:62e0f7f39ff5 14 }
TickTock 13:62e0f7f39ff5 15
TickTock 37:fea2c1d52c5f 16 void RTC_Init (void) {
TickTock 13:62e0f7f39ff5 17 LPC_RTC->ILR=0x00; // set up the RTC interrupts
TickTock 13:62e0f7f39ff5 18 LPC_RTC->CIIR=0x01; // interrupts each second
TickTock 13:62e0f7f39ff5 19 LPC_RTC->CCR = 0x01; // Clock enable
TickTock 92:935adef49ea4 20 //NVIC_SetPriority( RTC_IRQn, 10 );
TickTock 13:62e0f7f39ff5 21 NVIC_EnableIRQ( RTC_IRQn );
TickTock 13:62e0f7f39ff5 22 }
TickTock 13:62e0f7f39ff5 23
TickTock 93:c2402e8cd0e2 24 void printMsg (char *msg) {
TickTock 13:62e0f7f39ff5 25 strcpy(displayLog[displayLoc],msg);
TickTock 13:62e0f7f39ff5 26 displayLoc=displayLoc>17?0:displayLoc+1;
TickTock 13:62e0f7f39ff5 27 }
TickTock 13:62e0f7f39ff5 28
TickTock 13:62e0f7f39ff5 29 void touch_ISR(){
TickTock 37:fea2c1d52c5f 30 //LPC_GPIOINT->IO2IntClr = (LPC_GPIOINT->IO2IntStatR | LPC_GPIOINT->IO2IntStatF); // seems to work without so maybe not necessary (performed inInterruptIn handler?)
TickTock 35:5acbd8a64a89 31 touched=true; // just set flag - touch screen algorythm is long and we don't want to block other interrupts
TickTock 13:62e0f7f39ff5 32 }
TickTock 13:62e0f7f39ff5 33
TickTock 13:62e0f7f39ff5 34 unsigned short getTimeStamp() {
TickTock 13:62e0f7f39ff5 35 unsigned short msec = timer.read_ms() ; // read ms from the timer
TickTock 13:62e0f7f39ff5 36 unsigned long secs = time(NULL); // seconds past 12:00:00 AM 1 Jan 1900
TickTock 13:62e0f7f39ff5 37 unsigned short isecs = secs%60 ; // modulo 60 for 0-59 seconds from RTC
TickTock 13:62e0f7f39ff5 38 return ((isecs<<10)+msec) ; // return the two byte time stamp
TickTock 13:62e0f7f39ff5 39 }
TickTock 13:62e0f7f39ff5 40
TickTock 13:62e0f7f39ff5 41 void logCan (char mType, CANMessage canRXmsg) {
TickTock 85:5c27e88b3fbe 42
TickTock 85:5c27e88b3fbe 43 // re-arranged to put static first
TickTock 85:5c27e88b3fbe 44 static unsigned char ii = 0;
TickTock 85:5c27e88b3fbe 45 static unsigned char lasti = 0; // indexindex
TickTock 85:5c27e88b3fbe 46 static unsigned char bdi=0;
TickTock 85:5c27e88b3fbe 47 static signed short imotorRPM = 0;
TickTock 85:5c27e88b3fbe 48 static unsigned short nLost = 0; // gg - overrun
TickTock 85:5c27e88b3fbe 49
TickTock 83:52b1f330a62d 50 char sTemp[40];
TickTock 92:935adef49ea4 51 unsigned char changed;
TickTock 108:29b5a760adc2 52 unsigned short i,j,k;
TickTock 92:935adef49ea4 53 signed short packV;
TickTock 92:935adef49ea4 54 signed short packA;
TickTock 40:0e6e71a7323f 55 signed long imWs_x4;
garygid 87:46ac3f2519d6 56 unsigned short ts;
TickTock 85:5c27e88b3fbe 57
TickTock 36:dbd39c315258 58 secsNoMsg=0; // reset deadman switch
garygid 87:46ac3f2519d6 59 if(debugMode||(skin==ggSkin)){
garygid 87:46ac3f2519d6 60 // code to insert actual number of dropped frames for overrun debug - skiped in normal mode to keep logcan short
TickTock 85:5c27e88b3fbe 61 if(logOpen){
TickTock 106:f016912a03db 62 // check to see if buffer is already full (read - write) = 1
TickTock 106:f016912a03db 63 // actually the last buffer location cannot be used because then
TickTock 106:f016912a03db 64 // the buffer would look empty after writePointer++
TickTock 106:f016912a03db 65
TickTock 106:f016912a03db 66 //if (((writePointer+maxBufLen-readPointer)%maxBufLen)>(maxBufLen/16)) // modulo is slow?
TickTock 106:f016912a03db 67
TickTock 106:f016912a03db 68 // pointers are 0 through maxBufLen-1
TickTock 106:f016912a03db 69 if( (readPointer - writePointer) == 1 || (writePointer - readPointer) == (maxBufLen - 1)) {
TickTock 106:f016912a03db 70 // the buffer is "full", so Lose this message
TickTock 85:5c27e88b3fbe 71
TickTock 106:f016912a03db 72 // point to the last-stored message
TickTock 106:f016912a03db 73 int tempWritePointer = writePointer - 1 ;
TickTock 106:f016912a03db 74 if( tempWritePointer < 0 ) tempWritePointer = maxBufLen - 1;
TickTock 106:f016912a03db 75 char strLost[9] ;
TickTock 106:f016912a03db 76
TickTock 106:f016912a03db 77 if( nLost == 0 ) {
TickTock 106:f016912a03db 78 // this is the first message lost
TickTock 106:f016912a03db 79 // and we must overwrite the last message with an FFE comment message
TickTock 106:f016912a03db 80 // So, there will be two messages lost as the comment message is laid in.
TickTock 106:f016912a03db 81 nLost = 2;
TickTock 106:f016912a03db 82 sprintf(strLost,"%s","Lost0002"); // indicate two messages lost
TickTock 85:5c27e88b3fbe 83
TickTock 106:f016912a03db 84 // overlay the last message with a "Lost0002" comment
TickTock 106:f016912a03db 85 writeBuffer[tempWritePointer][0]=0;
TickTock 106:f016912a03db 86 // leave the ts of the overlaid message
TickTock 106:f016912a03db 87 //writeBuffer[tempWritePointer][1]=(ts&0xff00)>>8; // Time Stamp (2 bytes_
TickTock 106:f016912a03db 88 //writeBuffer[tempWritePointer][2]=(ts&0x00ff);
TickTock 106:f016912a03db 89 // force the MsgID to an Event Message
TickTock 106:f016912a03db 90 writeBuffer[tempWritePointer][3]=0xfe; // MsgID, low byte
TickTock 106:f016912a03db 91 writeBuffer[tempWritePointer][4]=0xff; // Len nibble, and MsgID high nibble
TickTock 106:f016912a03db 92 // lay in the "Lost0002" text
TickTock 106:f016912a03db 93 for(i=5;i<13;i++){
TickTock 106:f016912a03db 94 writeBuffer[tempWritePointer][i]= strLost[i-5];
TickTock 85:5c27e88b3fbe 95 }
TickTock 85:5c27e88b3fbe 96 } else {
TickTock 106:f016912a03db 97 // at least one message was previously lost
TickTock 106:f016912a03db 98 // increment the loat counter
TickTock 106:f016912a03db 99 nLost += 1;
garygid 87:46ac3f2519d6 100
TickTock 106:f016912a03db 101 // lay the new count into the comment
TickTock 106:f016912a03db 102 sprintf(strLost,"%04d",nLost);
TickTock 106:f016912a03db 103 for(i=9;i<13;i++){
TickTock 106:f016912a03db 104 writeBuffer[tempWritePointer][i]= strLost[i-9];
TickTock 85:5c27e88b3fbe 105 }
TickTock 106:f016912a03db 106 }
TickTock 106:f016912a03db 107 } else {
TickTock 106:f016912a03db 108 // there is room to insert the message
TickTock 106:f016912a03db 109 // get it inserted quickly
TickTock 106:f016912a03db 110 ts=getTimeStamp();
TickTock 106:f016912a03db 111 writeBuffer[writePointer][0]=mType;
TickTock 106:f016912a03db 112 writeBuffer[writePointer][1]=(ts&0xff00)>>8; // Time Stamp (2 bytes_
TickTock 106:f016912a03db 113 writeBuffer[writePointer][2]=(ts&0x00ff);
TickTock 106:f016912a03db 114 writeBuffer[writePointer][3]=canRXmsg.id&0xff; // MsgID, low byte
TickTock 106:f016912a03db 115 char sLen = canRXmsg.len ;
TickTock 106:f016912a03db 116 writeBuffer[writePointer][4]=(canRXmsg.id>>8)+(sLen<<4); // Len nibble, and MsgID high nibble
TickTock 106:f016912a03db 117 for(i=0;i<8;i++){ // Is there a better way to do this? (writeBuffer[writePointer][i]=canRXmsg.data?)
TickTock 106:f016912a03db 118 if(i<sLen)
TickTock 106:f016912a03db 119 writeBuffer[writePointer][i+5]=canRXmsg.data[i];
TickTock 106:f016912a03db 120 else // i>=sLen
TickTock 106:f016912a03db 121 // force unused data bytes to FF for CAN-Do compatibility
TickTock 106:f016912a03db 122 writeBuffer[writePointer][i+5]=0xFF;
TickTock 85:5c27e88b3fbe 123 }
TickTock 106:f016912a03db 124
TickTock 106:f016912a03db 125 //--------------
TickTock 106:f016912a03db 126 // Note, this is not protected from the interrupt.
TickTock 106:f016912a03db 127 // Due to the nLost code above, this no longer
TickTock 106:f016912a03db 128 // overflows to writePointer = readPointer
TickTock 106:f016912a03db 129 // which would make the buffer look empty
TickTock 106:f016912a03db 130 if (++writePointer >= maxBufLen) {
TickTock 106:f016912a03db 131 writePointer = 0;
TickTock 106:f016912a03db 132 led3 = !led3;
TickTock 106:f016912a03db 133 }
TickTock 106:f016912a03db 134 //--------------
TickTock 106:f016912a03db 135 // log a local message if we had lost messages. gg - logcan
TickTock 106:f016912a03db 136 if( nLost > 0 ) {
TickTock 106:f016912a03db 137 // We previously lost messages that did not get into the buffer
TickTock 106:f016912a03db 138 sprintf(sTemp,"-- Lost %d Messages.\n", nLost);
TickTock 106:f016912a03db 139 printMsg(sTemp); // write buffer overrun
TickTock 106:f016912a03db 140 //spkr.beep(500,0.25);
TickTock 106:f016912a03db 141
TickTock 106:f016912a03db 142 nLost = 0 ;
TickTock 106:f016912a03db 143 }
TickTock 106:f016912a03db 144 //--------------
TickTock 83:52b1f330a62d 145 }
TickTock 85:5c27e88b3fbe 146 }
TickTock 92:935adef49ea4 147 }else{ // not debugMode - keep code short
TickTock 85:5c27e88b3fbe 148 if(logOpen){
TickTock 106:f016912a03db 149 NVIC_DisableIRQ(CAN_IRQn); // Block interrupts until write pointer assigned
TickTock 106:f016912a03db 150 int localWritePointer = writePointer++; // create local copy to make logCan reentrant
TickTock 106:f016912a03db 151 // note that the static variables do not prevent safe reentry
TickTock 106:f016912a03db 152 // since they are only used for msgId<0x800 which will never interrupt
TickTock 106:f016912a03db 153 // another msgId<0x800 (both CANbusses are same priority)
TickTock 106:f016912a03db 154 if (writePointer >= maxBufLen) {
TickTock 106:f016912a03db 155 writePointer = 0;
TickTock 106:f016912a03db 156 led3 = !led3;
TickTock 106:f016912a03db 157 }
TickTock 106:f016912a03db 158 NVIC_EnableIRQ(CAN_IRQn); // Unblock interrupts once local pointer set and global pointer incremented
TickTock 106:f016912a03db 159 ts=getTimeStamp();
TickTock 106:f016912a03db 160 writeBuffer[localWritePointer][0]=mType;
TickTock 106:f016912a03db 161 writeBuffer[localWritePointer][1]=(ts&0xff00)>>8;
TickTock 106:f016912a03db 162 writeBuffer[localWritePointer][2]=(ts&0x00ff);
TickTock 106:f016912a03db 163 writeBuffer[localWritePointer][3]=canRXmsg.id&0xff;
TickTock 106:f016912a03db 164 writeBuffer[localWritePointer][4]=(canRXmsg.id>>8)+(canRXmsg.len<<4);
TickTock 106:f016912a03db 165 for(i=5;i<13;i++){ // Is there a better way to do this? (writeBuffer[localWritePointer][5]=canRXmsg.data?)
TickTock 106:f016912a03db 166 writeBuffer[localWritePointer][i]=canRXmsg.data[i-5];
TickTock 106:f016912a03db 167 }
TickTock 106:f016912a03db 168 if (writePointer==readPointer) {
TickTock 106:f016912a03db 169 // Just caught up to read pointer
TickTock 106:f016912a03db 170 sprintf(sTemp,"Write buffer overrun.\n");
TickTock 106:f016912a03db 171 printMsg(sTemp); // write buffer overrun
TickTock 106:f016912a03db 172 spkr.beep(500,0.25);
TickTock 13:62e0f7f39ff5 173 }
TickTock 13:62e0f7f39ff5 174 }
TickTock 37:fea2c1d52c5f 175 }
TickTock 40:0e6e71a7323f 176
TickTock 83:52b1f330a62d 177 if(canRXmsg.id<0x800){ // Block FFE and FFF messages
TickTock 83:52b1f330a62d 178 if(indexLastMsg[canRXmsg.id]==0) { //Check if no entry
TickTock 92:935adef49ea4 179 //ii=ii<99?ii+1:0; // Should never wrap - less than 100 different messages ever used
garygid 87:46ac3f2519d6 180 if(ii<99) {
TickTock 92:935adef49ea4 181 //indexLastMsg[canRXmsg.id]=ii; //Create entry if first message
garygid 87:46ac3f2519d6 182 indexLastMsg[canRXmsg.id]=++ii; //Create entry for first MsgID occurance
garygid 87:46ac3f2519d6 183 // ii max is 99 here
garygid 87:46ac3f2519d6 184 } else {
garygid 87:46ac3f2519d6 185 // the ii array is full, more than 100 MsgIDs found
garygid 87:46ac3f2519d6 186 if(ii==99) {
TickTock 92:935adef49ea4 187 ii++; // step to 100 to log only one error
garygid 87:46ac3f2519d6 188 sprintf(sTemp,"MsgID buffer overrun.\n");
TickTock 93:c2402e8cd0e2 189 printMsg(sTemp); // write buffer overrun
garygid 87:46ac3f2519d6 190 }
garygid 87:46ac3f2519d6 191 }
TickTock 83:52b1f330a62d 192 }
garygid 87:46ac3f2519d6 193
garygid 87:46ac3f2519d6 194 //----------------
TickTock 85:5c27e88b3fbe 195 if(dMode[0]==changedScreen||dMode[1]==changedScreen){// Skip if not using (for execution speed)
TickTock 83:52b1f330a62d 196 changed=msgChanged[indexLastMsg[canRXmsg.id]];
TickTock 85:5c27e88b3fbe 197 // This is cleared in the main loop when reset button is touched
TickTock 92:935adef49ea4 198 for(i=0;i<8;i++){
TickTock 83:52b1f330a62d 199 if(lastMsg[indexLastMsg[canRXmsg.id]].data[i]!=canRXmsg.data[i]){
TickTock 83:52b1f330a62d 200 changed |= 1<<i;
garygid 80:24f1793171e7 201 }
TickTock 13:62e0f7f39ff5 202 }
TickTock 83:52b1f330a62d 203 msgChanged[indexLastMsg[canRXmsg.id]]=changed;
TickTock 13:62e0f7f39ff5 204 }
garygid 80:24f1793171e7 205
TickTock 83:52b1f330a62d 206 lastMsg[indexLastMsg[canRXmsg.id]]=canRXmsg; //Store in table
garygid 87:46ac3f2519d6 207
garygid 87:46ac3f2519d6 208 //-------------------
TickTock 83:52b1f330a62d 209 //Miscellaneous on-recieve operations below
TickTock 93:c2402e8cd0e2 210 if((mType==1)&&(canRXmsg.id==0x7bb)){ // is battery data? Need to store all responses
TickTock 83:52b1f330a62d 211 if(canRXmsg.data[0]<0x20){
garygid 87:46ac3f2519d6 212 if(canRXmsg.data[3]==2){//Group 2 = cellpair data
garygid 87:46ac3f2519d6 213 bdi=BatDataBaseG2; // index offset for CP data (uses 00 - 1C)
TickTock 97:a25940fd7b5b 214 if(debugMode){
TickTock 97:a25940fd7b5b 215 sprintf(sTemp," Getting cell pair data\n");
TickTock 97:a25940fd7b5b 216 printMsg(sTemp);
TickTock 97:a25940fd7b5b 217 }
garygid 87:46ac3f2519d6 218
garygid 87:46ac3f2519d6 219 }else if(canRXmsg.data[3]==4){//Group 4 = temperature data
garygid 87:46ac3f2519d6 220 bdi=BatDataBaseG4; // index offset for Temperature data (uses 20 - 22)
TickTock 97:a25940fd7b5b 221 if(debugMode){
TickTock 97:a25940fd7b5b 222 sprintf(sTemp," Getting temperature data\n");
TickTock 97:a25940fd7b5b 223 printMsg(sTemp);
TickTock 97:a25940fd7b5b 224 }
garygid 87:46ac3f2519d6 225
garygid 87:46ac3f2519d6 226 }else if(canRXmsg.data[3]==1){//Group 1 data
garygid 87:46ac3f2519d6 227 bdi=BatDataBaseG1; // index offset for Group 1 data (uses 20 - 22)
TickTock 97:a25940fd7b5b 228 if(debugMode){
TickTock 97:a25940fd7b5b 229 sprintf(sTemp," Getting Group 1 data\n");
TickTock 97:a25940fd7b5b 230 printMsg(sTemp);
TickTock 97:a25940fd7b5b 231 }
garygid 87:46ac3f2519d6 232
garygid 87:46ac3f2519d6 233 }else if(canRXmsg.data[3]==3){//Group 3 data
garygid 87:46ac3f2519d6 234 bdi=BatDataBaseG3; // index offset for Group 3 data (uses 20 - 22)
TickTock 97:a25940fd7b5b 235 if(debugMode){
TickTock 97:a25940fd7b5b 236 sprintf(sTemp," Getting Group 3 data\n");
TickTock 97:a25940fd7b5b 237 printMsg(sTemp);
TickTock 97:a25940fd7b5b 238 }
garygid 87:46ac3f2519d6 239
garygid 87:46ac3f2519d6 240 }else if(canRXmsg.data[3]==5){//Group 5 data
garygid 87:46ac3f2519d6 241 bdi=BatDataBaseG5; // index offset for Group 5 data (uses 20 - 22)
TickTock 97:a25940fd7b5b 242 if(debugMode){
TickTock 97:a25940fd7b5b 243 sprintf(sTemp," Getting Group 5 data\n");
TickTock 97:a25940fd7b5b 244 printMsg(sTemp);
TickTock 97:a25940fd7b5b 245 }
garygid 87:46ac3f2519d6 246
TickTock 83:52b1f330a62d 247 }else bdi=0xff; // ignore other messages (for now)
TickTock 83:52b1f330a62d 248 lasti=0;
TickTock 83:52b1f330a62d 249 }
garygid 87:46ac3f2519d6 250
TickTock 83:52b1f330a62d 251 if(bdi<0xff){
TickTock 83:52b1f330a62d 252 i=canRXmsg.data[0]&0x0f; //lower nibble of D0 is index
TickTock 83:52b1f330a62d 253 if(lasti>i){ //detect rollover and offset index appropriately
garygid 87:46ac3f2519d6 254 bdi=BatDataBaseG2 + 0x10; // only for CP data
TickTock 83:52b1f330a62d 255 }
TickTock 83:52b1f330a62d 256 lasti=i; //remember the msb to detect rollover next time around
TickTock 83:52b1f330a62d 257 i+=bdi;
garygid 87:46ac3f2519d6 258 //-------
TickTock 102:fd19f777a0b4 259 if(i==BatDataBaseG5){ // Last of Temperature data was loaded last time
TickTock 83:52b1f330a62d 260 logCP=yesBattLog; // Only log if logging enabled
TickTock 83:52b1f330a62d 261 showCP=true; // Always show
TickTock 102:fd19f777a0b4 262 // 2013 models only have three sensors
TickTock 102:fd19f777a0b4 263 // Or =25+(467-ADC)/9.33 (C)
TickTock 108:29b5a760adc2 264 // Find hottest temperature by finding smallest ADC value
TickTock 108:29b5a760adc2 265 k=battData[(BatDataBaseG4*7)+3]*0x100+battData[(BatDataBaseG4*7)+4];
TickTock 107:e9be732c1ad4 266 j=battData[(BatDataBaseG4*7)+6]*0x100+battData[(BatDataBaseG4*7)+7];
TickTock 108:29b5a760adc2 267 if(j<k){
TickTock 108:29b5a760adc2 268 k=j;
TickTock 107:e9be732c1ad4 269 }
TickTock 107:e9be732c1ad4 270 j=battData[(BatDataBaseG4*7)+9]*0x100+battData[(BatDataBaseG4*7)+10];
TickTock 108:29b5a760adc2 271 if(j<k){
TickTock 108:29b5a760adc2 272 k=j;
TickTock 102:fd19f777a0b4 273 }
TickTock 107:e9be732c1ad4 274 j=battData[(BatDataBaseG4*7)+12]*0x100+battData[(BatDataBaseG4*7)+13];
TickTock 108:29b5a760adc2 275 if(j<k){
TickTock 108:29b5a760adc2 276 k=j;
TickTock 102:fd19f777a0b4 277 }
TickTock 108:29b5a760adc2 278 //interpolate from lookup table
TickTock 108:29b5a760adc2 279 unsigned short temp_adc[6] = { 1000, 589, 487, 401, 365, 000};
TickTock 108:29b5a760adc2 280 float temp_C[6] = {-27.0, 13.0, 23.0, 32.0, 36.0, 76.0};
TickTock 108:29b5a760adc2 281 char ii=0;
TickTock 108:29b5a760adc2 282 while(k<=temp_adc[++ii]) { } // Find section in table
TickTock 108:29b5a760adc2 283 maxTemp=(float)(k-temp_adc[ii]);
TickTock 108:29b5a760adc2 284 maxTemp/=(float)(temp_adc[ii-1]-temp_adc[ii]);
TickTock 108:29b5a760adc2 285 maxTemp*=(temp_C[ii-1]-temp_C[ii]);
TickTock 108:29b5a760adc2 286 maxTemp+=temp_C[ii];
TickTock 108:29b5a760adc2 287
TickTock 102:fd19f777a0b4 288 SOH_x100=battData[(BatDataBaseG1*7)+29]*0x100+battData[(BatDataBaseG1*7)+30];
TickTock 102:fd19f777a0b4 289 Ah_x10000=battData[(BatDataBaseG1*7)+36]*0x10000+battData[(BatDataBaseG1*7)+37]*0x100+battData[(BatDataBaseG1*7)+38];
TickTock 102:fd19f777a0b4 290 SOC_x10000=battData[(BatDataBaseG1*7)+32]*0x10000+battData[(BatDataBaseG1*7)+33]*0x100+battData[(BatDataBaseG1*7)+34];
TickTock 83:52b1f330a62d 291 }
garygid 87:46ac3f2519d6 292 //-------
TickTock 83:52b1f330a62d 293 i*=7;
garygid 87:46ac3f2519d6 294 if(i+6 < BatDataBufMax) {
TickTock 83:52b1f330a62d 295 battData[i+0]=canRXmsg.data[1];
TickTock 83:52b1f330a62d 296 battData[i+1]=canRXmsg.data[2];
TickTock 83:52b1f330a62d 297 battData[i+2]=canRXmsg.data[3];
TickTock 83:52b1f330a62d 298 battData[i+3]=canRXmsg.data[4];
TickTock 83:52b1f330a62d 299 battData[i+4]=canRXmsg.data[5];
TickTock 83:52b1f330a62d 300 battData[i+5]=canRXmsg.data[6];
TickTock 83:52b1f330a62d 301 battData[i+6]=canRXmsg.data[7];
TickTock 83:52b1f330a62d 302 }
TickTock 83:52b1f330a62d 303 }
TickTock 83:52b1f330a62d 304 }else if((mType==1)&&(canRXmsg.id==0x1db)){ //Battery Volts and Amps
TickTock 83:52b1f330a62d 305 packV=((canRXmsg.data[2]<<2)|(canRXmsg.data[3]>>6)); // 1 LSB = 0.5V
TickTock 83:52b1f330a62d 306 packA=((canRXmsg.data[0]<<3)|(canRXmsg.data[1]>>5)); // 1 LSB = 0.5A
TickTock 83:52b1f330a62d 307 if(packA>0x03ff){
TickTock 83:52b1f330a62d 308 packA|=0xf800;//extend sign;
TickTock 83:52b1f330a62d 309 }
TickTock 83:52b1f330a62d 310 packA -= 1; //Slight correction to value required (unique to my Leaf?)
TickTock 83:52b1f330a62d 311 imWs_x4 = packV; // Volts*milliSeconds*2
TickTock 83:52b1f330a62d 312 imWs_x4 *= -packA; // milliWattseconds*4
TickTock 97:a25940fd7b5b 313 //if (!((imotorRPM<2)&&(imWs_x4<0))){ //Ignore if charging from wall
TickTock 83:52b1f330a62d 314 mWs_x4 += imWs_x4; // total mWs_x4
TickTock 92:935adef49ea4 315 numWsamples++;
TickTock 97:a25940fd7b5b 316 //}
TickTock 83:52b1f330a62d 317 }else if((mType==1)&&(canRXmsg.id==0x1da)){ //Motor Speed
TickTock 83:52b1f330a62d 318 imotorRPM=((canRXmsg.data[4]<<8)|(canRXmsg.data[5]));
TickTock 83:52b1f330a62d 319 if(imotorRPM<0){ // take absolute value
TickTock 83:52b1f330a62d 320 imotorRPM=-imotorRPM;
TickTock 83:52b1f330a62d 321 }
TickTock 83:52b1f330a62d 322 motorRPM+=imotorRPM;
TickTock 92:935adef49ea4 323 numSsamples++;
TickTock 37:fea2c1d52c5f 324 }
TickTock 37:fea2c1d52c5f 325 }
TickTock 13:62e0f7f39ff5 326 }
TickTock 13:62e0f7f39ff5 327
garygid 87:46ac3f2519d6 328 //-----------------------------
TickTock 13:62e0f7f39ff5 329 void logTS () {
TickTock 13:62e0f7f39ff5 330 CANMessage tsMsg;
TickTock 13:62e0f7f39ff5 331 unsigned long secs = time(NULL); // seconds past 12:00:00 AM 1 Jan 1900
garygid 69:6bfdfc002036 332 // NOTE: In Mbed, I believe that this is seconds past start of 1970, not 1900
garygid 69:6bfdfc002036 333 // but this is good, since seconds past 1970 is what CAN-Do expects. GG - Date Time
TickTock 13:62e0f7f39ff5 334 tsMsg.id=0xfff;
TickTock 13:62e0f7f39ff5 335 tsMsg.len=0xf;
garygid 69:6bfdfc002036 336 tsMsg.data[0]=secs&0xff;
TickTock 13:62e0f7f39ff5 337 tsMsg.data[1]=(secs>>8)&0xff;
TickTock 13:62e0f7f39ff5 338 tsMsg.data[2]=(secs>>16)&0xff;
garygid 69:6bfdfc002036 339 tsMsg.data[3]=(secs>>24)&0xff;
garygid 69:6bfdfc002036 340 tsMsg.data[4]=0; // 0xff; gg - Date Time
garygid 69:6bfdfc002036 341 tsMsg.data[5]=0; // 0xff; for CAN-Do
garygid 69:6bfdfc002036 342 tsMsg.data[6]=0; // 0xff;
TickTock 13:62e0f7f39ff5 343 tsMsg.data[7]=0xff;
garygid 69:6bfdfc002036 344 logCan(0,tsMsg); // Date-Time
garygid 69:6bfdfc002036 345 }
garygid 69:6bfdfc002036 346
TickTock 93:c2402e8cd0e2 347 void logEvent (char * errMsg) {
garygid 69:6bfdfc002036 348 // log CAN-Do 8-character Pseudo Message
garygid 69:6bfdfc002036 349 CANMessage tsMsg;
garygid 69:6bfdfc002036 350 tsMsg.id=0xffe; // pseudo Message to CAN-Do log
garygid 69:6bfdfc002036 351 tsMsg.len=0xf;
TickTock 92:935adef49ea4 352 int iMsgLen = strlen(errMsg);
garygid 69:6bfdfc002036 353 // 8 character message compatible with CAN-Do
TickTock 92:935adef49ea4 354 for(int i=0; i<8; i++){
garygid 69:6bfdfc002036 355 tsMsg.data[i]=' ';
TickTock 92:935adef49ea4 356 if( i < iMsgLen ) tsMsg.data[i]=errMsg[i];
garygid 69:6bfdfc002036 357 }
garygid 69:6bfdfc002036 358 logCan(0,tsMsg); // FFE Comment Message
TickTock 13:62e0f7f39ff5 359 }
TickTock 13:62e0f7f39ff5 360
TickTock 78:a383971fe02f 361 void sendReq() {
TickTock 78:a383971fe02f 362 static char data[8] = {0x02, 0x21, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff};
TickTock 78:a383971fe02f 363 if(reqMsgCnt<99){
TickTock 92:935adef49ea4 364 switch (reqMsgCnt){
TickTock 102:fd19f777a0b4 365 case BatDataBaseG1:
TickTock 78:a383971fe02f 366 can1.monitor(false); // set to active mode
TickTock 78:a383971fe02f 367 can1SleepMode = 0; // enable TX
TickTock 83:52b1f330a62d 368 data[0]=0x02; //change to request group 1
TickTock 78:a383971fe02f 369 data[1]=0x21;
TickTock 78:a383971fe02f 370 data[2]=0x01;
TickTock 78:a383971fe02f 371 break;
TickTock 102:fd19f777a0b4 372 case BatDataBaseG2: // group 1 has 6 frames
TickTock 78:a383971fe02f 373 can1.monitor(false); // set to active mode
TickTock 78:a383971fe02f 374 can1SleepMode = 0; // enable TX
TickTock 83:52b1f330a62d 375 data[0]=0x02; //change to request group 2 (cp data)
TickTock 78:a383971fe02f 376 data[1]=0x21;
TickTock 78:a383971fe02f 377 data[2]=0x02;
TickTock 78:a383971fe02f 378 break;
TickTock 102:fd19f777a0b4 379 case BatDataBaseG3: // group 2 has 29 frames
TickTock 83:52b1f330a62d 380 data[0]=0x02; //change to request group 3
TickTock 78:a383971fe02f 381 data[1]=0x21;
TickTock 78:a383971fe02f 382 data[2]=0x03;
TickTock 78:a383971fe02f 383 break;
TickTock 102:fd19f777a0b4 384 case BatDataBaseG4: // group 3 has 5 frames
TickTock 83:52b1f330a62d 385 data[0]=0x02; //change to request group 4 (temperature)
TickTock 78:a383971fe02f 386 data[1]=0x21;
TickTock 78:a383971fe02f 387 data[2]=0x04;
TickTock 78:a383971fe02f 388 break;
TickTock 102:fd19f777a0b4 389 case BatDataBaseG5: // group 4 has 3 frames
TickTock 83:52b1f330a62d 390 data[0]=0x02; //change to request group 5
TickTock 78:a383971fe02f 391 data[1]=0x21;
TickTock 78:a383971fe02f 392 data[2]=0x05;
TickTock 78:a383971fe02f 393 break;
TickTock 102:fd19f777a0b4 394 case BatDataBaseG6: // group 5 has 11 frames
TickTock 78:a383971fe02f 395 reqMsgCnt = 99;
TickTock 78:a383971fe02f 396 can1SleepMode = 1; // disable TX
TickTock 78:a383971fe02f 397 can1.monitor(true); // set to snoop mode
TickTock 83:52b1f330a62d 398 msgReq.detach(); // stop ticker
TickTock 78:a383971fe02f 399 default:
TickTock 78:a383971fe02f 400 data[0]=0x30; //change to request next line message
TickTock 78:a383971fe02f 401 data[1]=0x01;
TickTock 78:a383971fe02f 402 data[2]=0x00;
TickTock 78:a383971fe02f 403 }
TickTock 78:a383971fe02f 404 can1.write(CANMessage(0x79b, data, 8));
TickTock 92:935adef49ea4 405 reqMsgCnt++;
TickTock 78:a383971fe02f 406 }
TickTock 78:a383971fe02f 407 }
TickTock 78:a383971fe02f 408
TickTock 78:a383971fe02f 409 void autoPollISR(){
TickTock 97:a25940fd7b5b 410 //char sTemp[40]; // just for debug
TickTock 97:a25940fd7b5b 411 //sprintf(sTemp,"Requesting cp data\n"); // just for debug
TickTock 97:a25940fd7b5b 412 //printMsg(sTemp); // just for debug
TickTock 78:a383971fe02f 413 reqMsgCnt = 0; //reset message counter
TickTock 94:c3a14b3975d6 414 msgReq.attach(&sendReq,0.015);
TickTock 78:a383971fe02f 415 }
garygid 87:46ac3f2519d6 416
TickTock 36:dbd39c315258 417 void playbackISR() { //Used for autoplayback
TickTock 36:dbd39c315258 418 step=true;
TickTock 36:dbd39c315258 419 }
TickTock 36:dbd39c315258 420
TickTock 36:dbd39c315258 421 void doNothing(){ //CAN deattach work-around
TickTock 36:dbd39c315258 422 }
TickTock 36:dbd39c315258 423
TickTock 13:62e0f7f39ff5 424 void recieve1() {
TickTock 13:62e0f7f39ff5 425 CANMessage msg1;
TickTock 13:62e0f7f39ff5 426 can1.read(msg1);
garygid 69:6bfdfc002036 427
garygid 69:6bfdfc002036 428 if( ZeroSecTick ) { ZeroSecTick = false; logTS(); } // gg - 0-second EV bus
TickTock 106:f016912a03db 429 if(msg1.id>0) {
TickTock 106:f016912a03db 430 logCan(1, msg1); // EVcan Message Received
TickTock 106:f016912a03db 431 led1 = !led1;
TickTock 106:f016912a03db 432 }
TickTock 13:62e0f7f39ff5 433 }
TickTock 13:62e0f7f39ff5 434
TickTock 13:62e0f7f39ff5 435 void recieve2() {
TickTock 13:62e0f7f39ff5 436 CANMessage msg2;
TickTock 13:62e0f7f39ff5 437 can2.read(msg2);
garygid 69:6bfdfc002036 438
garygid 69:6bfdfc002036 439 if( ZeroSecTick ) { ZeroSecTick = false; logTS(); } // gg - 0-second EV bus
garygid 69:6bfdfc002036 440
TickTock 106:f016912a03db 441 if(msg2.id>0) {
TickTock 106:f016912a03db 442 logCan(2, msg2); // CARcan Message Received
TickTock 106:f016912a03db 443 led2 = !led2;
TickTock 106:f016912a03db 444 }
TickTock 13:62e0f7f39ff5 445 }
TickTock 13:62e0f7f39ff5 446
TickTock 22:a43df3905863 447 unsigned char buttonX(unsigned short X, unsigned char columns) {
TickTock 22:a43df3905863 448 unsigned char val = X*columns/320;
TickTock 22:a43df3905863 449 return val;
TickTock 22:a43df3905863 450 }
TickTock 22:a43df3905863 451
TickTock 22:a43df3905863 452 unsigned char buttonY(unsigned short Y, unsigned char rows) {
TickTock 22:a43df3905863 453 unsigned short val = Y*rows/240;
TickTock 22:a43df3905863 454 return val;
TickTock 22:a43df3905863 455 }
TickTock 23:cd03f9c3395e 456
TickTock 23:cd03f9c3395e 457 void saveConfig(){
TickTock 23:cd03f9c3395e 458 FILE *cfile;
TickTock 99:c05abf8e1cdc 459 cfile = fopen("/local/config.txt", "w");
leafman 98:9f8bab96edff 460 fprintf(cfile,"format 5\r\n");
TickTock 23:cd03f9c3395e 461 fprintf(cfile,"x0_off %d\r\n",tt.x0_off);
TickTock 23:cd03f9c3395e 462 fprintf(cfile,"y0_off %d\r\n",tt.y0_off);
TickTock 23:cd03f9c3395e 463 fprintf(cfile,"x0_pp %d\r\n",tt.x0_pp);
TickTock 23:cd03f9c3395e 464 fprintf(cfile,"y0_pp %d\r\n",tt.y0_pp);
TickTock 23:cd03f9c3395e 465 fprintf(cfile,"x1_off %d\r\n",tt.x1_off);
TickTock 23:cd03f9c3395e 466 fprintf(cfile,"y1_off %d\r\n",tt.y1_off);
TickTock 23:cd03f9c3395e 467 fprintf(cfile,"x1_pp %d\r\n",tt.x1_pp);
TickTock 23:cd03f9c3395e 468 fprintf(cfile,"y1_pp %d\r\n",tt.y1_pp);
TickTock 23:cd03f9c3395e 469 fprintf(cfile,"x_mid %d\r\n",tt.x_mid);
leafman 98:9f8bab96edff 470 if (dMode[0]==configScreen)
TickTock 41:8d4609ea7259 471 fprintf(cfile,"dMode0 %d\r\n",mainScreen);
TickTock 26:462ccb580472 472 else
TickTock 26:462ccb580472 473 fprintf(cfile,"dMode0 %d\r\n",dMode[0]);
leafman 98:9f8bab96edff 474 if (dMode[1]==configScreen)
TickTock 41:8d4609ea7259 475 fprintf(cfile,"dMode1 %d\r\n",mainScreen);
TickTock 26:462ccb580472 476 else
TickTock 26:462ccb580472 477 fprintf(cfile,"dMode1 %d\r\n",dMode[1]);
TickTock 35:5acbd8a64a89 478 fprintf(cfile,"ledHi %4.3f\r\n",ledHi);
TickTock 35:5acbd8a64a89 479 fprintf(cfile,"ledLo %4.3f\r\n",ledLo);
TickTock 35:5acbd8a64a89 480 fprintf(cfile,"pollInt %d\r\n",pollInt);
TickTock 35:5acbd8a64a89 481 fprintf(cfile,"scale12V %4.2f\r\n",scale12V);
TickTock 48:d1ce92104a1f 482 fprintf(cfile,"skin %d\r\n",skin);
TickTock 50:83d5864c64a0 483 fprintf(cfile,"dtePeriod %d\r\n",dtePeriod);
garygid 87:46ac3f2519d6 484 fprintf(cfile,"DebugMode %d\r\n",(debugMode?1:0));
leafman 98:9f8bab96edff 485 fprintf(cfile,"metric %d\r\n",(metric?1:0));
leafman 98:9f8bab96edff 486 fprintf(cfile, "firmware %d\r\n", fwCount );
TickTock 23:cd03f9c3395e 487 fclose(cfile);
TickTock 23:cd03f9c3395e 488 }
TickTock 23:cd03f9c3395e 489
TickTock 23:cd03f9c3395e 490 void readConfig(){
TickTock 23:cd03f9c3395e 491 FILE *cfile;
TickTock 23:cd03f9c3395e 492 int ff;
TickTock 23:cd03f9c3395e 493 char sTemp[40];
TickTock 23:cd03f9c3395e 494 cfile = fopen("/local/config.txt", "r");
TickTock 23:cd03f9c3395e 495 if (cfile==NULL){ // if doesn't exist --> create
TickTock 23:cd03f9c3395e 496 sprintf(sTemp,"No config file found.\n");
TickTock 93:c2402e8cd0e2 497 printMsg(sTemp); // no config file
TickTock 23:cd03f9c3395e 498 sprintf(sTemp,"Calibrating touch screen.\n");
TickTock 93:c2402e8cd0e2 499 printMsg(sTemp); // calibrating
TickTock 23:cd03f9c3395e 500 //tt.setcal(5570, 34030, 80, 108, 33700, 5780, 82, 108, 32500);// bypass calibration using my values
TickTock 23:cd03f9c3395e 501 tt.calibrate(); // run touchscreen calibration routine
garygid 58:4d06288d75a2 502 // NOTE: calibrates screen 1 first, then screen 0.
TickTock 23:cd03f9c3395e 503 saveConfig();
TickTock 23:cd03f9c3395e 504 } else {
TickTock 102:fd19f777a0b4 505 ledHi = 0.8;
TickTock 48:d1ce92104a1f 506 ledLo = 0.1;
TickTock 102:fd19f777a0b4 507 pollInt = 60;
TickTock 48:d1ce92104a1f 508 scale12V = 16.2;
TickTock 48:d1ce92104a1f 509 skin = ttSkin;
leafman 98:9f8bab96edff 510 fscanf(cfile, "format %d\r\n", &ff );
leafman 98:9f8bab96edff 511 fscanf(cfile, "x0_off %d\r\n", &tt.x0_off );
leafman 98:9f8bab96edff 512 fscanf(cfile, "y0_off %d\r\n", &tt.y0_off );
leafman 98:9f8bab96edff 513 fscanf(cfile, "x0_pp %d\r\n", &tt.x0_pp );
leafman 98:9f8bab96edff 514 fscanf(cfile, "y0_pp %d\r\n", &tt.y0_pp );
leafman 98:9f8bab96edff 515 fscanf(cfile, "x1_off %d\r\n", &tt.x1_off );
leafman 98:9f8bab96edff 516 fscanf(cfile, "y1_off %d\r\n", &tt.y1_off );
leafman 98:9f8bab96edff 517 fscanf(cfile, "x1_pp %d\r\n", &tt.x1_pp );
leafman 98:9f8bab96edff 518 fscanf(cfile, "y1_pp %d\r\n", &tt.y1_pp );
leafman 98:9f8bab96edff 519 fscanf(cfile, "x_mid %d\r\n", &tt.x_mid );
leafman 98:9f8bab96edff 520 fscanf(cfile, "dMode0 %d\r\n", &dMode[0] );
leafman 98:9f8bab96edff 521 fscanf(cfile, "dMode1 %d\r\n", &dMode[1] );
TickTock 35:5acbd8a64a89 522 if(ff>1){
leafman 98:9f8bab96edff 523 fscanf(cfile, "ledHi %f\r\n", &ledHi );
leafman 98:9f8bab96edff 524 fscanf(cfile, "ledLo %f\r\n", &ledLo );
leafman 98:9f8bab96edff 525 fscanf(cfile, "pollInt %d\r\n", &pollInt );
leafman 98:9f8bab96edff 526 fscanf(cfile, "scale12V %f\r\n", &scale12V );
TickTock 48:d1ce92104a1f 527 }
TickTock 48:d1ce92104a1f 528 if(ff>2){
leafman 98:9f8bab96edff 529 fscanf(cfile, "skin %d\r\n", &skin );
leafman 98:9f8bab96edff 530 fscanf(cfile, "dtePeriod %d\r\n", &dtePeriod );
TickTock 35:5acbd8a64a89 531 }
garygid 87:46ac3f2519d6 532 if(ff>3){
leafman 98:9f8bab96edff 533 int iDebug;
leafman 98:9f8bab96edff 534 fscanf(cfile, "DebugMode %d\r\n", &iDebug );
leafman 98:9f8bab96edff 535 debugMode = (bool)iDebug;
leafman 98:9f8bab96edff 536 }
leafman 98:9f8bab96edff 537 if(ff>4) {
leafman 98:9f8bab96edff 538 int iMetric;
leafman 98:9f8bab96edff 539 fscanf(cfile, "metric %d\r\n", &iMetric );
leafman 98:9f8bab96edff 540 metric = (bool)iMetric;
leafman 98:9f8bab96edff 541 fscanf(cfile, "firmware %d\r\n", &iMetric );
leafman 98:9f8bab96edff 542 fwCount = iMetric;
garygid 87:46ac3f2519d6 543 }
TickTock 23:cd03f9c3395e 544 fclose(cfile);
garygid 87:46ac3f2519d6 545 if(ff<4){//If not latest format, save as latest format
TickTock 35:5acbd8a64a89 546 saveConfig();
TickTock 48:d1ce92104a1f 547 sprintf(sTemp,"Config file format updated.\n");
TickTock 93:c2402e8cd0e2 548 printMsg(sTemp); // config forat updates
TickTock 48:d1ce92104a1f 549 }
TickTock 43:e7f6f80590e3 550 sprintf(sTemp,"Config file loaded.\n");
TickTock 93:c2402e8cd0e2 551 printMsg(sTemp); // config file loaded
TickTock 23:cd03f9c3395e 552 }
TickTock 23:cd03f9c3395e 553 }
TickTock 25:ddf0ec209f03 554
TickTock 25:ddf0ec209f03 555 void upDate(unsigned char field, bool upDownBar){
TickTock 25:ddf0ec209f03 556 struct tm t; // pointer to a static tm structure
TickTock 25:ddf0ec209f03 557 time_t seconds ;
TickTock 25:ddf0ec209f03 558 seconds = time(NULL);
TickTock 25:ddf0ec209f03 559 t = *localtime(&seconds) ;
TickTock 25:ddf0ec209f03 560 switch(field){
TickTock 25:ddf0ec209f03 561 case 0: // year
TickTock 25:ddf0ec209f03 562 if (upDownBar) {
TickTock 25:ddf0ec209f03 563 t.tm_year = t.tm_year+1;
TickTock 25:ddf0ec209f03 564 } else {
TickTock 25:ddf0ec209f03 565 t.tm_year = t.tm_year-1;
TickTock 25:ddf0ec209f03 566 }
TickTock 25:ddf0ec209f03 567 break;
TickTock 25:ddf0ec209f03 568 case 1: // month
TickTock 25:ddf0ec209f03 569 if (upDownBar) {
TickTock 25:ddf0ec209f03 570 t.tm_mon = (t.tm_mon<12)?t.tm_mon+1:1;
TickTock 25:ddf0ec209f03 571 } else {
TickTock 25:ddf0ec209f03 572 t.tm_mon = (t.tm_mon>2)?t.tm_mon-1:12;
TickTock 25:ddf0ec209f03 573 }
TickTock 25:ddf0ec209f03 574 break;
TickTock 25:ddf0ec209f03 575 case 2: // day
TickTock 25:ddf0ec209f03 576 if (upDownBar) {
TickTock 25:ddf0ec209f03 577 t.tm_mday = (t.tm_mday<31)?t.tm_mday+1:1;
TickTock 25:ddf0ec209f03 578 } else {
TickTock 25:ddf0ec209f03 579 t.tm_mday = (t.tm_mday>2)?t.tm_mday-1:31;
TickTock 25:ddf0ec209f03 580 }
TickTock 25:ddf0ec209f03 581 break;
TickTock 25:ddf0ec209f03 582 case 3: // hour
TickTock 25:ddf0ec209f03 583 if (upDownBar) {
TickTock 25:ddf0ec209f03 584 t.tm_hour = (t.tm_hour<23)?t.tm_hour+1:0;
TickTock 25:ddf0ec209f03 585 } else {
TickTock 25:ddf0ec209f03 586 t.tm_hour = (t.tm_hour>1)?t.tm_hour-1:23;
TickTock 25:ddf0ec209f03 587 }
TickTock 25:ddf0ec209f03 588 break;
TickTock 25:ddf0ec209f03 589 case 4: // minute
TickTock 25:ddf0ec209f03 590 if (upDownBar) {
TickTock 25:ddf0ec209f03 591 t.tm_min = (t.tm_min<59)?t.tm_min+1:0;
TickTock 25:ddf0ec209f03 592 } else {
TickTock 25:ddf0ec209f03 593 t.tm_min = (t.tm_min>1)?t.tm_min-1:59;
TickTock 25:ddf0ec209f03 594 }
TickTock 25:ddf0ec209f03 595 break;
TickTock 25:ddf0ec209f03 596 case 5: // second
TickTock 25:ddf0ec209f03 597 if (upDownBar) {
TickTock 25:ddf0ec209f03 598 t.tm_sec = (t.tm_sec<59)?t.tm_sec+1:0;
TickTock 25:ddf0ec209f03 599 } else {
TickTock 25:ddf0ec209f03 600 t.tm_sec = (t.tm_sec>1)?t.tm_sec-1:59;
TickTock 25:ddf0ec209f03 601 }
TickTock 25:ddf0ec209f03 602 break;
TickTock 25:ddf0ec209f03 603 default:
TickTock 25:ddf0ec209f03 604 break;
TickTock 25:ddf0ec209f03 605 }
TickTock 25:ddf0ec209f03 606 set_time(mktime(&t));
TickTock 25:ddf0ec209f03 607 }
TickTock 25:ddf0ec209f03 608
TickTock 39:eef8beac7411 609 void logPackVoltages() { // Turbo3 - routine to dump CP values to text file
TickTock 109:3e6f0e8fca0d 610 /*char sTemp[40];
TickTock 39:eef8beac7411 611 struct tm t; // pointer to a static tm structure
TickTock 39:eef8beac7411 612 short unsigned max, min, jv, i, bd;
TickTock 39:eef8beac7411 613 unsigned avg;
TickTock 39:eef8beac7411 614 unsigned short gids, SOC, packV;
TickTock 39:eef8beac7411 615 signed short packA;
TickTock 39:eef8beac7411 616 time_t seconds ;
TickTock 39:eef8beac7411 617
TickTock 39:eef8beac7411 618 CANMessage msg;
TickTock 39:eef8beac7411 619
TickTock 39:eef8beac7411 620 seconds = time(NULL); // Turbo3
TickTock 39:eef8beac7411 621 t = *localtime(&seconds) ; // Turbo3
TickTock 39:eef8beac7411 622
TickTock 39:eef8beac7411 623 msg = lastMsg[indexLastMsg[0x5bc]]; //Get gids
TickTock 39:eef8beac7411 624 gids = (msg.data[0]<<2)+(msg.data[1]>>6);
TickTock 39:eef8beac7411 625 msg = lastMsg[indexLastMsg[0x55b]]; //Get SOC
TickTock 39:eef8beac7411 626 SOC = (msg.data[0]<<2)+(msg.data[1]>>6);
TickTock 39:eef8beac7411 627 msg = lastMsg[indexLastMsg[0x1db]]; //Get pack volts
TickTock 39:eef8beac7411 628 packV = (msg.data[2]<<2)+(msg.data[3]>>6);
TickTock 39:eef8beac7411 629 packA = (msg.data[0]<<3)+(msg.data[1]>>5);
TickTock 39:eef8beac7411 630 if (packA & 0x400) packA |= 0xf800;
TickTock 39:eef8beac7411 631
TickTock 39:eef8beac7411 632 max=0;
TickTock 39:eef8beac7411 633 min=9999;
TickTock 39:eef8beac7411 634 avg=0;
TickTock 92:935adef49ea4 635 for(i=0; i<96; i++) {
TickTock 39:eef8beac7411 636 bd=(battData[i*2+3]<<8)+battData[i*2+4];
TickTock 39:eef8beac7411 637 avg+=bd;
TickTock 39:eef8beac7411 638 if(bd>max) max=bd;
TickTock 39:eef8beac7411 639 if(bd<min) min=bd;
TickTock 39:eef8beac7411 640 }
TickTock 39:eef8beac7411 641 avg /= 96;
TickTock 39:eef8beac7411 642 if(min<3713) {
TickTock 39:eef8beac7411 643 jv=avg-(max-avg)*1.5;
TickTock 39:eef8beac7411 644 } else { // Only compute judgement value if min cellpair meets <= 3712mV requirement
TickTock 39:eef8beac7411 645 jv=0;
TickTock 39:eef8beac7411 646 }
TickTock 39:eef8beac7411 647
TickTock 39:eef8beac7411 648 FILE *bfile;
TickTock 39:eef8beac7411 649 bfile = fopen("/usb/batvolt.txt", "a");
TickTock 39:eef8beac7411 650 if(bfile!=NULL) {
TickTock 39:eef8beac7411 651 strftime(sTemp, 40, "%a %m/%d/%Y %X", &t);
TickTock 108:29b5a760adc2 652 fprintf(bfile,"%s,%d,%5.1f%%,%5.1f,%5.1f,%d,%d,%d,%d,%d",sTemp,gids,(float)SOC/10,(float)packV/2,(float)packA/2,max,min,avg,max-min,jv);
TickTock 108:29b5a760adc2 653 fprintf(bfile,"%d,%d,%d,%d,",(battData[(BatDataBaseG4*7)+ 3]<<8)+battData[(BatDataBaseG4*7)+ 4],battData[(BatDataBaseG4*7)+ 5],(battData[(BatDataBaseG4*7)+ 6]<<8)+battData[(BatDataBaseG4*7)+ 7],battData[(BatDataBaseG4*7)+ 8]);
TickTock 108:29b5a760adc2 654 fprintf(bfile,"%d,%d,%d,%d", (battData[(BatDataBaseG4*7)+ 9]<<8)+battData[(BatDataBaseG4*7)+10],battData[(BatDataBaseG4*7)+11],(battData[(BatDataBaseG4*7)+12]<<8)+battData[(BatDataBaseG4*7)+13],battData[(BatDataBaseG4*7)+14]);
TickTock 108:29b5a760adc2 655 for(i=0; i<96; i++) {
TickTock 108:29b5a760adc2 656 bd=(battData[i*2+3]<<8)+battData[i*2+4];
TickTock 108:29b5a760adc2 657 fprintf(bfile,",%d",bd);
TickTock 108:29b5a760adc2 658 }
TickTock 108:29b5a760adc2 659 fprintf(bfile,"\r\n");
TickTock 108:29b5a760adc2 660 fclose(bfile);
TickTock 109:3e6f0e8fca0d 661 }*/
TickTock 108:29b5a760adc2 662 logCP=false;
TickTock 108:29b5a760adc2 663 showCP=true;
TickTock 108:29b5a760adc2 664 }
TickTock 108:29b5a760adc2 665
TickTock 108:29b5a760adc2 666 void tripLog() { // Daily log
TickTock 109:3e6f0e8fca0d 667 /*char sTemp[40];
TickTock 108:29b5a760adc2 668 struct tm t; // pointer to a static tm structure
TickTock 108:29b5a760adc2 669 short unsigned max, min, jv, i, bd;
TickTock 108:29b5a760adc2 670 unsigned avg;
TickTock 108:29b5a760adc2 671 unsigned short gids, SOC, packV;
TickTock 108:29b5a760adc2 672 signed short packA;
TickTock 108:29b5a760adc2 673 time_t seconds ;
TickTock 108:29b5a760adc2 674
TickTock 108:29b5a760adc2 675 CANMessage msg;
TickTock 108:29b5a760adc2 676
TickTock 108:29b5a760adc2 677 seconds = time(NULL); // Turbo3
TickTock 108:29b5a760adc2 678 t = *localtime(&seconds) ; // Turbo3
TickTock 108:29b5a760adc2 679
TickTock 108:29b5a760adc2 680 msg = lastMsg[indexLastMsg[0x5bc]]; //Get gids
TickTock 108:29b5a760adc2 681 gids = (msg.data[0]<<2)+(msg.data[1]>>6);
TickTock 108:29b5a760adc2 682 msg = lastMsg[indexLastMsg[0x55b]]; //Get SOC
TickTock 108:29b5a760adc2 683 SOC = (msg.data[0]<<2)+(msg.data[1]>>6);
TickTock 108:29b5a760adc2 684 msg = lastMsg[indexLastMsg[0x1db]]; //Get pack volts
TickTock 108:29b5a760adc2 685 packV = (msg.data[2]<<2)+(msg.data[3]>>6);
TickTock 108:29b5a760adc2 686 packA = (msg.data[0]<<3)+(msg.data[1]>>5);
TickTock 108:29b5a760adc2 687 if (packA & 0x400) packA |= 0xf800;
TickTock 108:29b5a760adc2 688
TickTock 108:29b5a760adc2 689 max=0;
TickTock 108:29b5a760adc2 690 min=9999;
TickTock 108:29b5a760adc2 691 avg=0;
TickTock 108:29b5a760adc2 692 for(i=0; i<96; i++) {
TickTock 108:29b5a760adc2 693 bd=(battData[i*2+3]<<8)+battData[i*2+4];
TickTock 108:29b5a760adc2 694 avg+=bd;
TickTock 108:29b5a760adc2 695 if(bd>max) max=bd;
TickTock 108:29b5a760adc2 696 if(bd<min) min=bd;
TickTock 108:29b5a760adc2 697 }
TickTock 108:29b5a760adc2 698 avg /= 96;
TickTock 108:29b5a760adc2 699 if(min<3713) {
TickTock 108:29b5a760adc2 700 jv=avg-(max-avg)*1.5;
TickTock 108:29b5a760adc2 701 } else { // Only compute judgement value if min cellpair meets <= 3712mV requirement
TickTock 108:29b5a760adc2 702 jv=0;
TickTock 108:29b5a760adc2 703 }
TickTock 108:29b5a760adc2 704
TickTock 108:29b5a760adc2 705 FILE *bfile;
TickTock 108:29b5a760adc2 706 bfile = fopen("/usb/triplog.txt", "a");
TickTock 108:29b5a760adc2 707 if(bfile!=NULL) {
TickTock 108:29b5a760adc2 708 strftime(sTemp, 40, "%a %m/%d/%Y %X", &t);
TickTock 108:29b5a760adc2 709 fprintf(bfile,"%s,%d,%5.1f%%,%5.1f%%, %4.2f, %5.1f,%5.1f,%d,%d,%d,%d,%d",sTemp,gids,(float)SOC/10, (float)SOH_x100/100,(float)Ah_x10000/10000,(float)packV/2,(float)packA/2,max,min,avg,max-min,jv);
TickTock 102:fd19f777a0b4 710 fprintf(bfile,"%d,%d,%d,%d,",(battData[(BatDataBaseG4*7)+ 3]<<8)+battData[(BatDataBaseG4*7)+ 4],battData[(BatDataBaseG4*7)+ 5],(battData[(BatDataBaseG4*7)+ 6]<<8)+battData[(BatDataBaseG4*7)+ 7],battData[(BatDataBaseG4*7)+ 8]);
TickTock 102:fd19f777a0b4 711 fprintf(bfile,"%d,%d,%d,%d", (battData[(BatDataBaseG4*7)+ 9]<<8)+battData[(BatDataBaseG4*7)+10],battData[(BatDataBaseG4*7)+11],(battData[(BatDataBaseG4*7)+12]<<8)+battData[(BatDataBaseG4*7)+13],battData[(BatDataBaseG4*7)+14]);
TickTock 92:935adef49ea4 712 for(i=0; i<96; i++) {
TickTock 39:eef8beac7411 713 bd=(battData[i*2+3]<<8)+battData[i*2+4];
TickTock 39:eef8beac7411 714 fprintf(bfile,",%d",bd);
TickTock 39:eef8beac7411 715 }
TickTock 39:eef8beac7411 716 fprintf(bfile,"\r\n");
TickTock 39:eef8beac7411 717 fclose(bfile);
TickTock 109:3e6f0e8fca0d 718 }*/
TickTock 39:eef8beac7411 719 logCP=false;
TickTock 40:0e6e71a7323f 720 showCP=true;
TickTock 39:eef8beac7411 721 }
TickTock 25:ddf0ec209f03 722
leafman 98:9f8bab96edff 723 //LM - updates firmware off a usb key, eliminating the need to plug
leafman 98:9f8bab96edff 724 //the CANary into a computer for updates.
leafman 98:9f8bab96edff 725 void updateFirmware()
leafman 98:9f8bab96edff 726 {
TickTock 109:3e6f0e8fca0d 727 /*char sTemp[40];
TickTock 99:c05abf8e1cdc 728 FILE *srcFile;
TickTock 99:c05abf8e1cdc 729 srcFile = fopen("/usb/firmware.bin", "rb");
TickTock 99:c05abf8e1cdc 730 if(srcFile ==NULL)
TickTock 99:c05abf8e1cdc 731 {
TickTock 99:c05abf8e1cdc 732 sprintf(sTemp,"Couldn't find firmware.bin\n");
TickTock 99:c05abf8e1cdc 733 printf(sTemp);
TickTock 108:29b5a760adc2 734 wait(3);
TickTock 100:63a7456fc972 735 lastDMode[whichTouched]=99;//force refresh
TickTock 99:c05abf8e1cdc 736 return;
TickTock 99:c05abf8e1cdc 737 }
leafman 98:9f8bab96edff 738 fwCount ++;
leafman 98:9f8bab96edff 739 saveConfig();
leafman 98:9f8bab96edff 740 tt.cls();
leafman 98:9f8bab96edff 741 printf("Saved Configuration\n");
leafman 98:9f8bab96edff 742 //delete all bin files in /local
leafman 98:9f8bab96edff 743 DIR *dir;
leafman 98:9f8bab96edff 744 struct dirent *ent;
leafman 98:9f8bab96edff 745 printf("Starting update\n");
leafman 98:9f8bab96edff 746 printf("deleting old firmware files\n");
leafman 98:9f8bab96edff 747 if ((dir = opendir ("/local/")) != NULL) {
TickTock 109:3e6f0e8fca0d 748 // print all the files and directories within directory
leafman 98:9f8bab96edff 749 while ((ent = readdir (dir)) != NULL) {
leafman 98:9f8bab96edff 750 //printf("FILE: %s\n",ent->d_name);
leafman 98:9f8bab96edff 751 char dest[4] = "";
leafman 98:9f8bab96edff 752 strncat(dest, &ent->d_name[strlen(ent->d_name)-3],3);
leafman 98:9f8bab96edff 753 dest[0] = tolower(dest[0]);
leafman 98:9f8bab96edff 754 dest[1] = tolower(dest[1]);
leafman 98:9f8bab96edff 755 dest[2] = tolower(dest[2]);
leafman 98:9f8bab96edff 756 if(strcmp(dest,"bin")==0)
leafman 98:9f8bab96edff 757 {
leafman 98:9f8bab96edff 758 sprintf(sTemp,"/local/%s",ent->d_name);
leafman 98:9f8bab96edff 759 int result = remove(sTemp);
leafman 98:9f8bab96edff 760 printf("REMOVED: %s",ent->d_name);
leafman 98:9f8bab96edff 761 }
leafman 98:9f8bab96edff 762 }
leafman 98:9f8bab96edff 763 closedir (dir);
leafman 98:9f8bab96edff 764 } else {
TickTock 109:3e6f0e8fca0d 765 //could not open directory
leafman 98:9f8bab96edff 766 printf("Couldnt open folder");
TickTock 108:29b5a760adc2 767 wait(3);
leafman 98:9f8bab96edff 768 return;
leafman 98:9f8bab96edff 769 }
leafman 98:9f8bab96edff 770 printf("copying new firmware\n");
leafman 98:9f8bab96edff 771 tt.cls();
leafman 98:9f8bab96edff 772 //Copy the new firmware from usb->local
leafman 98:9f8bab96edff 773 //The newest bin file is the one that is used by the mbed
leafman 98:9f8bab96edff 774 const int bufSize = 2048;
leafman 98:9f8bab96edff 775 FILE *destFile;
leafman 98:9f8bab96edff 776 sprintf(sTemp,"/local/fw%d.bin",fwCount);
leafman 98:9f8bab96edff 777 printf("Writing %s\n",sTemp);
leafman 98:9f8bab96edff 778 wait(2);
leafman 98:9f8bab96edff 779 destFile = fopen(sTemp, "wb");
leafman 98:9f8bab96edff 780 if(destFile == NULL)
leafman 98:9f8bab96edff 781 {
leafman 98:9f8bab96edff 782 sprintf(sTemp,"Couldn't Open Destination\n");
leafman 98:9f8bab96edff 783 printf(sTemp);
TickTock 108:29b5a760adc2 784 wait(3);
leafman 98:9f8bab96edff 785 return;
leafman 98:9f8bab96edff 786 }
leafman 98:9f8bab96edff 787 char buffer[bufSize];
TickTock 97:a25940fd7b5b 788
leafman 98:9f8bab96edff 789 while (!feof(srcFile))
leafman 98:9f8bab96edff 790 {
leafman 98:9f8bab96edff 791 int n = fread(buffer, 1, bufSize, srcFile);
leafman 98:9f8bab96edff 792 fwrite(buffer, 1, n, destFile);
leafman 98:9f8bab96edff 793 }
leafman 98:9f8bab96edff 794
leafman 98:9f8bab96edff 795 fflush(destFile);
leafman 98:9f8bab96edff 796 fclose(destFile);
leafman 98:9f8bab96edff 797 fclose(srcFile);
leafman 98:9f8bab96edff 798 tt.cls();
leafman 98:9f8bab96edff 799 printf("Succesful\n\n");
TickTock 108:29b5a760adc2 800 printf("Rebooting in 3 seconds\n");
TickTock 108:29b5a760adc2 801 wait(3);
leafman 98:9f8bab96edff 802 //Now run new firmware
TickTock 109:3e6f0e8fca0d 803 mbed_reset();*/
TickTock 99:c05abf8e1cdc 804 }
TickTock 108:29b5a760adc2 805
TickTock 108:29b5a760adc2 806 bool detectUSB(void){
TickTock 109:3e6f0e8fca0d 807 bool usbEn=true; // for now assume presence
TickTock 108:29b5a760adc2 808 /*FILE *tfile = fopen("/usb/presence.det", "w");
TickTock 108:29b5a760adc2 809 usbEn=(tfile==NULL)?false:true;
TickTock 108:29b5a760adc2 810 if(usbEn){
TickTock 109:3e6f0e8fca0d 811 fclose(tfile);
TickTock 108:29b5a760adc2 812 }*/
TickTock 108:29b5a760adc2 813 return(usbEn);
TickTock 108:29b5a760adc2 814 }