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 Jul 28 05:32:17 2013 +0000
Revision:
137:70853cf5a30f
Parent:
136:41a204105511
Child:
138:a2f5af85ed0d
Added update if screen touched on power; Fixed hang on immediate USB access

Who changed what in which revision?

UserRevisionLine numberNew contents of line
TickTock 13:62e0f7f39ff5 1 //displayModes.cpp
TickTock 37:fea2c1d52c5f 2 #include "displayModes.h"
TickTock 13:62e0f7f39ff5 3
TickTock 25:ddf0ec209f03 4 char sTemp1[40];
TickTock 24:6cf76ed8c432 5 char sTemp2[16];
TickTock 13:62e0f7f39ff5 6
TickTock 42:4533b13b297d 7 void mainDisplay (bool force, bool showButtons){
TickTock 124:0d622967b764 8 unsigned short gids, SOC_x10, packV_x2, tireP;
TickTock 136:41a204105511 9 float useable_kWh,dte;
TickTock 131:0d926c080a65 10 static unsigned short lgids=0, lSOC=0, lpackV_x2=0, ltireP=0, maxPS=0;
TickTock 108:29b5a760adc2 11 static float lmaxTemp=0;
TickTock 49:a3d2c5bb3cfa 12 static float lkW=0, laccV=0, lmpkWh=0;
TickTock 131:0d926c080a65 13
TickTock 13:62e0f7f39ff5 14 CANMessage msg;
TickTock 13:62e0f7f39ff5 15
TickTock 13:62e0f7f39ff5 16 msg = lastMsg[indexLastMsg[0x5bc]]; //Get gids
TickTock 13:62e0f7f39ff5 17 gids = (msg.data[0]<<2)+(msg.data[1]>>6);
TickTock 13:62e0f7f39ff5 18 msg = lastMsg[indexLastMsg[0x55b]]; //Get SOC
TickTock 122:138a40892a4c 19 SOC_x10 = (msg.data[0]<<2)+(msg.data[1]>>6);
TickTock 13:62e0f7f39ff5 20 msg = lastMsg[indexLastMsg[0x1db]]; //Get pack volts
TickTock 119:0e2b641e98a2 21 packV_x2 = (msg.data[2]<<2)+(msg.data[3]>>6);
TickTock 124:0d622967b764 22 msg = lastMsg[indexLastMsg[0x385]]; //Get tire pressure
TickTock 124:0d622967b764 23 tireP = msg.data[2]+msg.data[3]+msg.data[4]+msg.data[5];
TickTock 118:02010b18efdc 24
TickTock 13:62e0f7f39ff5 25 tt.background(Navy);
TickTock 38:155ec32c5e91 26 tt.set_font((unsigned char*) Arial28x28);
TickTock 13:62e0f7f39ff5 27 if(force) tt.cls();
TickTock 48:d1ce92104a1f 28 if(skin==ttSkin){
TickTock 50:83d5864c64a0 29 if(force||gids!=lgids||mpkWh[dtePeriod]!=lmpkWh){
TickTock 136:41a204105511 30 tt.locate(16,10);
TickTock 136:41a204105511 31 tt.foreground(White);
TickTock 136:41a204105511 32 printf("%3d gids \n",gids);
TickTock 73:62ee8eae3a84 33 if(debugMode){
TickTock 73:62ee8eae3a84 34 if(pointerSep>maxPS){maxPS=pointerSep;}
TickTock 73:62ee8eae3a84 35 tt.locate(10,70);
TickTock 73:62ee8eae3a84 36 printf("%3d sep %3d max\n",pointerSep,maxPS);
TickTock 73:62ee8eae3a84 37 }
TickTock 49:a3d2c5bb3cfa 38 tt.locate(10,40);
TickTock 136:41a204105511 39 tt.foreground(Cyan);
TickTock 136:41a204105511 40 useable_kWh = (float)(gids-5)*0.075;
TickTock 136:41a204105511 41 if (useable_kWh<0){
TickTock 136:41a204105511 42 useable_kWh=0;
TickTock 136:41a204105511 43 }
TickTock 132:08748a67280a 44 printf("%4.1f kWh \n",useable_kWh);
TickTock 136:41a204105511 45
TickTock 132:08748a67280a 46 // Display DTE
TickTock 136:41a204105511 47 dte=convertDistance(minTripEff*useable_kWh);
TickTock 136:41a204105511 48 tt.foreground(Green);
TickTock 136:41a204105511 49 tt.locate(30,80);
TickTock 136:41a204105511 50 if(dte>=10){
TickTock 136:41a204105511 51 printf("%2.0f \n",dte); //LM - add metric conversion
TickTock 136:41a204105511 52 }else{
TickTock 136:41a204105511 53 printf("%2.1f \n",dte); //LM - add metric conversion
TickTock 136:41a204105511 54 }
TickTock 136:41a204105511 55
TickTock 48:d1ce92104a1f 56 tt.set_font((unsigned char*) SCProSB31x55);
TickTock 136:41a204105511 57 tt.foreground(Yellow);
TickTock 136:41a204105511 58 dte=convertDistance(mpkWh[dtePeriod]*useable_kWh);
TickTock 136:41a204105511 59 if(dte>199){
TickTock 136:41a204105511 60 dte=199;
TickTock 136:41a204105511 61 }
TickTock 136:41a204105511 62 // " "=0x10, "."=0x15, #=0x1D
TickTock 136:41a204105511 63 if(dte>=100){
TickTock 136:41a204105511 64 tt.locate(75,85);
TickTock 136:41a204105511 65 printf(" %2.0f\n",dte); //LM - add metric conversion
TickTock 136:41a204105511 66 }else if(dte>=10){
TickTock 136:41a204105511 67 tt.locate(89,85);
TickTock 136:41a204105511 68 printf(" %2.0f\n",dte); //LM - add metric conversion
TickTock 136:41a204105511 69 }else{
TickTock 136:41a204105511 70 tt.locate(84,85);
TickTock 136:41a204105511 71 printf(" %2.1f\n",dte); //LM - add metric conversion
TickTock 136:41a204105511 72 }
TickTock 136:41a204105511 73 tt.set_font((unsigned char*) Arial28x28);
TickTock 137:70853cf5a30f 74 tt.locate(190,106);
TickTock 137:70853cf5a30f 75 printf("%s\n",distanceUnit()); //LM - add metric conversion
TickTock 136:41a204105511 76
TickTock 136:41a204105511 77 dte=convertDistance(maxTripEff*useable_kWh);
TickTock 136:41a204105511 78 tt.foreground(Orange);
TickTock 136:41a204105511 79 tt.locate(260,80);
TickTock 136:41a204105511 80 if(dte>=10){
TickTock 136:41a204105511 81 printf("%2.0f \n",dte); //LM - add metric conversion
TickTock 136:41a204105511 82 }else{
TickTock 136:41a204105511 83 printf("%2.1f \n",dte); //LM - add metric conversion
TickTock 136:41a204105511 84 }
TickTock 48:d1ce92104a1f 85 lgids=gids;
TickTock 50:83d5864c64a0 86 lmpkWh=mpkWh[dtePeriod];
TickTock 48:d1ce92104a1f 87 }
TickTock 49:a3d2c5bb3cfa 88 if(force||kW[0]!=lkW){
TickTock 136:41a204105511 89 tt.foreground(Cyan);
TickTock 122:138a40892a4c 90 if(kW[0]<-10){ //Right justify
TickTock 122:138a40892a4c 91 tt.locate(171,40);
TickTock 122:138a40892a4c 92 printf("%4.2fkW\n",kW[0]);
TickTock 122:138a40892a4c 93 } else if (kW[0]<0){
TickTock 122:138a40892a4c 94 tt.locate(171,40);
TickTock 122:138a40892a4c 95 printf(" %4.2fkW\n",kW[0]);
TickTock 122:138a40892a4c 96 } else if (kW[0]<10){
TickTock 122:138a40892a4c 97 tt.locate(165,40);
TickTock 122:138a40892a4c 98 printf(" %4.2fkW\n",kW[0]);
TickTock 122:138a40892a4c 99 } else {
TickTock 122:138a40892a4c 100 tt.locate(165,40);
TickTock 122:138a40892a4c 101 printf(" %4.2fkW\n",kW[0]);
TickTock 122:138a40892a4c 102 }
TickTock 49:a3d2c5bb3cfa 103 lkW=kW[0];
TickTock 48:d1ce92104a1f 104 }
TickTock 136:41a204105511 105 if(force||SOC_x10!=lSOC){
TickTock 136:41a204105511 106 tt.locate(215,10);
TickTock 136:41a204105511 107 tt.foreground(White);
TickTock 136:41a204105511 108 printf("%4.1f%s\n",(float)SOC_x10/10,"%");
TickTock 136:41a204105511 109 lSOC=SOC_x10;
TickTock 136:41a204105511 110 }
TickTock 136:41a204105511 111 if(force||packV_x2!=lpackV_x2){
TickTock 136:41a204105511 112 tt.locate(210,176);
TickTock 136:41a204105511 113 tt.foreground(Yellow);
TickTock 136:41a204105511 114 printf("%4.1fV\n",(float)packV_x2/2);
TickTock 136:41a204105511 115 lpackV_x2=packV_x2;
TickTock 136:41a204105511 116 ltireP=0;//Force tire pressure redraw, too
TickTock 136:41a204105511 117 }
TickTock 136:41a204105511 118 if(force||maxTemp!=lmaxTemp){
TickTock 136:41a204105511 119 tt.foreground(Cyan);
TickTock 136:41a204105511 120 if (convertTemperature(maxTemp)<100){
TickTock 136:41a204105511 121 tt.locate(210,146);
TickTock 136:41a204105511 122 printf(" %3.1f%s\n",convertTemperature(maxTemp),temperatureUnit());
TickTock 136:41a204105511 123 }else{
TickTock 136:41a204105511 124 tt.locate(210,146);
TickTock 136:41a204105511 125 printf("%4.1f%s\n",convertTemperature(maxTemp),temperatureUnit());
TickTock 136:41a204105511 126 }
TickTock 136:41a204105511 127 lmaxTemp=maxTemp;
TickTock 136:41a204105511 128 }
TickTock 136:41a204105511 129 if(force||accV!=laccV){
TickTock 136:41a204105511 130 tt.locate(20,176);
TickTock 136:41a204105511 131 tt.foreground(Yellow);
TickTock 136:41a204105511 132 printf("%3.1fV \n",accV);
TickTock 136:41a204105511 133 laccV=accV;
TickTock 136:41a204105511 134 }
TickTock 131:0d926c080a65 135 if(force||tireP!=ltireP){
TickTock 134:ad243e4f1a17 136 if(msg.data[2]<minTirePressure){
TickTock 134:ad243e4f1a17 137 tt.foreground(Orange); // Hi-light if any are low (<35psi)
TickTock 134:ad243e4f1a17 138 }else{
TickTock 134:ad243e4f1a17 139 tt.foreground(LightGrey);
TickTock 134:ad243e4f1a17 140 }
TickTock 131:0d926c080a65 141 if(msg.data[6]&0x80){
TickTock 134:ad243e4f1a17 142 if(msg.data[2]<minTirePressure){
TickTock 134:ad243e4f1a17 143 tt.foreground(Orange); // Hi-light if any are low (<35psi)
TickTock 134:ad243e4f1a17 144 }else{
TickTock 134:ad243e4f1a17 145 tt.foreground(LightGrey);
TickTock 134:ad243e4f1a17 146 }
TickTock 131:0d926c080a65 147 tt.locate(10,206);
TickTock 131:0d926c080a65 148 printf("%3.1f\n",(float)msg.data[2]/4);
TickTock 131:0d926c080a65 149 }
TickTock 131:0d926c080a65 150 if(msg.data[6]&0x40){
TickTock 134:ad243e4f1a17 151 if(msg.data[3]<minTirePressure){
TickTock 134:ad243e4f1a17 152 tt.foreground(Orange); // Hi-light if any are low (<35psi)
TickTock 134:ad243e4f1a17 153 }else{
TickTock 134:ad243e4f1a17 154 tt.foreground(LightGrey);
TickTock 134:ad243e4f1a17 155 }
TickTock 131:0d926c080a65 156 tt.locate(90,206);
TickTock 131:0d926c080a65 157 printf("%3.1f\n",(float)msg.data[3]/4);
TickTock 131:0d926c080a65 158 }
TickTock 131:0d926c080a65 159 if(msg.data[6]&0x20){
TickTock 134:ad243e4f1a17 160 if(msg.data[4]<minTirePressure){
TickTock 134:ad243e4f1a17 161 tt.foreground(Orange); // Hi-light if any are low (<35psi)
TickTock 134:ad243e4f1a17 162 }else{
TickTock 134:ad243e4f1a17 163 tt.foreground(LightGrey);
TickTock 134:ad243e4f1a17 164 }
TickTock 131:0d926c080a65 165 tt.locate(170,206);
TickTock 131:0d926c080a65 166 printf("%3.1f\n",(float)msg.data[4]/4);
TickTock 131:0d926c080a65 167 }
TickTock 131:0d926c080a65 168 if(msg.data[6]&0x10){
TickTock 134:ad243e4f1a17 169 if(msg.data[5]<minTirePressure){
TickTock 134:ad243e4f1a17 170 tt.foreground(Orange); // Hi-light if any are low (<35psi)
TickTock 134:ad243e4f1a17 171 }else{
TickTock 134:ad243e4f1a17 172 tt.foreground(LightGrey);
TickTock 134:ad243e4f1a17 173 }
TickTock 131:0d926c080a65 174 tt.locate(250,206);
TickTock 131:0d926c080a65 175 printf("%3.1f\n",(float)msg.data[5]/4);
TickTock 131:0d926c080a65 176 }
TickTock 131:0d926c080a65 177 ltireP=tireP;
TickTock 102:fd19f777a0b4 178 }
TickTock 48:d1ce92104a1f 179 }else {//if(skin==ggSkin){
TickTock 48:d1ce92104a1f 180 if(force||gids!=lgids){
TickTock 48:d1ce92104a1f 181 tt.locate(10,10);
TickTock 48:d1ce92104a1f 182 printf("%4d GIDs \n",gids);
TickTock 48:d1ce92104a1f 183
TickTock 48:d1ce92104a1f 184 tt.locate(40,40); // gg - add GIDs Percent of 281
TickTock 48:d1ce92104a1f 185 printf("%4.1f%s \n", (float)gids*0.355872, "% ") ;
TickTock 48:d1ce92104a1f 186 tt.locate(20,70);
TickTock 48:d1ce92104a1f 187 printf("%4.1f kwh \n",(float)gids*0.075); // gg - closer to usable
TickTock 48:d1ce92104a1f 188
TickTock 48:d1ce92104a1f 189 tt.set_font((unsigned char*) SCProSB31x55);
TickTock 48:d1ce92104a1f 190 tt.foreground(Green);
TickTock 48:d1ce92104a1f 191 //tt.locate(60,96);
TickTock 48:d1ce92104a1f 192 tt.locate(60,116); // gg - move down a little
leafman 98:9f8bab96edff 193 printf("%4.1f %s \n",convertDistance((float)(gids-5)*0.31),distanceUnit()); // Approx for now - LM added metric
TickTock 48:d1ce92104a1f 194 lgids=gids;
TickTock 48:d1ce92104a1f 195 tt.foreground(Yellow);
TickTock 48:d1ce92104a1f 196 tt.set_font((unsigned char*) Arial28x28);
TickTock 48:d1ce92104a1f 197 }
TickTock 48:d1ce92104a1f 198
TickTock 122:138a40892a4c 199 if(force||SOC_x10!=lSOC){
TickTock 48:d1ce92104a1f 200 tt.locate(200,10);
TickTock 122:138a40892a4c 201 printf("%4.1f%s\n",(float)SOC_x10/10,"% ");
TickTock 122:138a40892a4c 202 lSOC=SOC_x10;
TickTock 48:d1ce92104a1f 203 }
TickTock 119:0e2b641e98a2 204 if(force||packV_x2!=lpackV_x2){
TickTock 48:d1ce92104a1f 205 tt.locate(200,200);
TickTock 119:0e2b641e98a2 206 printf("%4.1fV \n",(float)packV_x2/2);
TickTock 119:0e2b641e98a2 207 lpackV_x2=packV_x2;
TickTock 48:d1ce92104a1f 208 }
TickTock 48:d1ce92104a1f 209 if(force||accV!=laccV){
TickTock 48:d1ce92104a1f 210 tt.locate(20,200);
TickTock 48:d1ce92104a1f 211 printf("%3.1fV \n",accV);
TickTock 48:d1ce92104a1f 212 laccV=accV;
TickTock 48:d1ce92104a1f 213 }
TickTock 49:a3d2c5bb3cfa 214 if(force||kW[0]!=lkW){
TickTock 48:d1ce92104a1f 215 tt.locate(160,40); // gg - move left to keep from wrap
TickTock 49:a3d2c5bb3cfa 216 printf("%3.2fkw \n",kW[0]); // use small w to save space
TickTock 49:a3d2c5bb3cfa 217 lkW=kW[0];
TickTock 48:d1ce92104a1f 218 }
TickTock 35:5acbd8a64a89 219 }
TickTock 108:29b5a760adc2 220 if(led4){
TickTock 106:f016912a03db 221 tt.fillcircle(310,10,6,Red);
TickTock 106:f016912a03db 222 }else{
TickTock 106:f016912a03db 223 tt.fillcircle(310,10,6,Navy);
TickTock 106:f016912a03db 224 }
TickTock 13:62e0f7f39ff5 225 }
TickTock 13:62e0f7f39ff5 226
TickTock 42:4533b13b297d 227 void printLast (bool force, bool showButtons){
TickTock 13:62e0f7f39ff5 228 CANMessage msg;
TickTock 13:62e0f7f39ff5 229 tt.locate(0,6);
TickTock 13:62e0f7f39ff5 230 tt.foreground(Red);
TickTock 13:62e0f7f39ff5 231 tt.background(Yellow);
TickTock 13:62e0f7f39ff5 232 if(force) tt.cls(); // Just clear screen if forced - always update display
TickTock 13:62e0f7f39ff5 233 tt.set_font((unsigned char*) Arial12x12_prop); // select the font
TickTock 13:62e0f7f39ff5 234 for(int i=0; i<19; i++){
TickTock 13:62e0f7f39ff5 235 msg = lastMsg[i+indexOffset];
TickTock 13:62e0f7f39ff5 236 printf("%03x : %02x %02x %02x %02x %02x %02x %02x %02x \n",msg.id,msg.data[0],msg.data[1],msg.data[2],msg.data[3],msg.data[4],msg.data[5],msg.data[6],msg.data[7]);
TickTock 13:62e0f7f39ff5 237 }
TickTock 122:138a40892a4c 238 if(showButtons){
TickTock 25:ddf0ec209f03 239 tt.foreground(Yellow);
TickTock 25:ddf0ec209f03 240 tt.background(DarkCyan);
TickTock 25:ddf0ec209f03 241 tt.set_font((unsigned char*) Arial12x12);
garygid 54:6ce808d0995e 242
garygid 54:6ce808d0995e 243 showButton(0,0," <up>","",4,4);
garygid 54:6ce808d0995e 244 showButton(2,0,"<down>","",4,4);
TickTock 25:ddf0ec209f03 245 }
TickTock 13:62e0f7f39ff5 246 }
TickTock 13:62e0f7f39ff5 247
TickTock 42:4533b13b297d 248 void printChanged (bool force, bool showButtons){
TickTock 13:62e0f7f39ff5 249 CANMessage msg;
TickTock 13:62e0f7f39ff5 250 unsigned char i,j;
TickTock 13:62e0f7f39ff5 251 tt.locate(0,6);
TickTock 13:62e0f7f39ff5 252 tt.foreground(Red);
TickTock 13:62e0f7f39ff5 253 tt.background(Yellow);
TickTock 13:62e0f7f39ff5 254 if(force) tt.cls(); // Just clear screen if forced - always update display
TickTock 13:62e0f7f39ff5 255 tt.set_font((unsigned char*) Arial12x12_prop); // select the font
TickTock 13:62e0f7f39ff5 256 i=0;
TickTock 13:62e0f7f39ff5 257 j=indexOffset;
TickTock 13:62e0f7f39ff5 258 do{
TickTock 13:62e0f7f39ff5 259 j=j<99?j+1:j;
TickTock 13:62e0f7f39ff5 260 if(msgChanged[j]>0){
TickTock 13:62e0f7f39ff5 261 msg = lastMsg[j];
TickTock 13:62e0f7f39ff5 262 printf("%03x : %02x %02x %02x %02x %02x %02x %02x %02x \n",msg.id,msg.data[0],msg.data[1],msg.data[2],msg.data[3],msg.data[4],msg.data[5],msg.data[6],msg.data[7]);
TickTock 13:62e0f7f39ff5 263 i++;
TickTock 13:62e0f7f39ff5 264 }// if changed
TickTock 13:62e0f7f39ff5 265 }while(i<19&&j<99);
TickTock 122:138a40892a4c 266 if(showButtons){
TickTock 40:0e6e71a7323f 267 tt.foreground(Yellow);
TickTock 40:0e6e71a7323f 268 tt.background(DarkCyan);
TickTock 40:0e6e71a7323f 269 tt.set_font((unsigned char*) Arial12x12);
garygid 54:6ce808d0995e 270 showButton(0,0," <up>","",4,4);
garygid 54:6ce808d0995e 271 showButton(2,0," <down>","",4,4);
garygid 54:6ce808d0995e 272 showButton(1,0," Reset","Baseline",4,4);
TickTock 40:0e6e71a7323f 273 }
TickTock 13:62e0f7f39ff5 274 }
TickTock 13:62e0f7f39ff5 275
TickTock 42:4533b13b297d 276 void printLog (bool force, bool showButtons){
TickTock 118:02010b18efdc 277 static unsigned char lastldl = 0;
TickTock 118:02010b18efdc 278 unsigned char ldl=displayLoc;
TickTock 118:02010b18efdc 279 if(force||ldl!=lastldl){ //only update if changed
TickTock 13:62e0f7f39ff5 280 tt.foreground(Amber);
TickTock 13:62e0f7f39ff5 281 tt.background(Black);
TickTock 13:62e0f7f39ff5 282 tt.cls();
TickTock 13:62e0f7f39ff5 283 tt.locate(0,6);
TickTock 13:62e0f7f39ff5 284 tt.set_font((unsigned char*) Arial12x12);
TickTock 13:62e0f7f39ff5 285 for(int i=0; i<19; i++){
TickTock 118:02010b18efdc 286 printf("%s",displayLog[ldl]);
TickTock 118:02010b18efdc 287 ldl=ldl>17?0:ldl+1;
TickTock 13:62e0f7f39ff5 288 }
TickTock 13:62e0f7f39ff5 289 }
TickTock 118:02010b18efdc 290 lastldl=ldl;
TickTock 13:62e0f7f39ff5 291 }
TickTock 13:62e0f7f39ff5 292
TickTock 118:02010b18efdc 293 void tripDisplay (bool force, bool showButtons){
TickTock 118:02010b18efdc 294 static float lkWh=0;
TickTock 118:02010b18efdc 295 tt.background(White);
TickTock 118:02010b18efdc 296 if(force){
TickTock 118:02010b18efdc 297 tt.cls();
TickTock 118:02010b18efdc 298 }
TickTock 118:02010b18efdc 299 if(force||(int)(lkWh*100)!=(int)(kWh_trip[0]*100)){ //only update if changed
TickTock 118:02010b18efdc 300 tt.foreground(Navy);
TickTock 118:02010b18efdc 301 tt.set_font((unsigned char*) Arial28x28);
TickTock 118:02010b18efdc 302 tt.locate(6,210);
TickTock 118:02010b18efdc 303 printf("kWh : %s : Eff\n",distanceUnit());
TickTock 118:02010b18efdc 304 for(int i=0; i<3; i++){
TickTock 118:02010b18efdc 305 tt.locate(6,20+i*60);
TickTock 118:02010b18efdc 306 printf("%3.2f : %3.1f : %2.1f\n",kWh_trip[i],convertDistance(miles_trip[i]),convertDistance(miles_trip[i])/kWh_trip[i]);
TickTock 118:02010b18efdc 307 }
TickTock 122:138a40892a4c 308 }
TickTock 122:138a40892a4c 309 if(showButtons){
TickTock 118:02010b18efdc 310 tt.set_font((unsigned char*) Arial12x12);
TickTock 118:02010b18efdc 311 tt.background(DarkCyan);
TickTock 118:02010b18efdc 312 tt.foreground(Yellow);
TickTock 118:02010b18efdc 313 showButton(3,1," Reset"," A",4,4);
TickTock 118:02010b18efdc 314 showButton(3,2," Reset"," B",4,4);
TickTock 118:02010b18efdc 315 lkWh=kWh_trip[0];
TickTock 118:02010b18efdc 316 }
TickTock 118:02010b18efdc 317 }
TickTock 118:02010b18efdc 318
TickTock 118:02010b18efdc 319 void healthDisplay (bool force, bool showButtons){
TickTock 131:0d926c080a65 320 unsigned short gids, SOC_x10, SOH_x2;
TickTock 118:02010b18efdc 321 static unsigned short lgids=0, lSOC=0, lSOH=0;
TickTock 124:0d622967b764 322 static float lmaxTemp=0, lresr=0, lunlV=0;
TickTock 118:02010b18efdc 323 static unsigned long lAh=0;
TickTock 13:62e0f7f39ff5 324 CANMessage msg;
TickTock 13:62e0f7f39ff5 325
TickTock 13:62e0f7f39ff5 326 msg = lastMsg[indexLastMsg[0x5bc]]; //Get gids
TickTock 13:62e0f7f39ff5 327 gids = (msg.data[0]<<2)+(msg.data[1]>>6);
TickTock 13:62e0f7f39ff5 328 msg = lastMsg[indexLastMsg[0x55b]]; //Get SOC
TickTock 122:138a40892a4c 329 SOC_x10 = (msg.data[0]<<2)+(msg.data[1]>>6);
TickTock 131:0d926c080a65 330 msg = lastMsg[indexLastMsg[0x5b3]]; //Get SOH
TickTock 131:0d926c080a65 331 SOH_x2 = msg.data[1];
TickTock 13:62e0f7f39ff5 332
TickTock 118:02010b18efdc 333 tt.background(Blue);
TickTock 38:155ec32c5e91 334 tt.foreground(Yellow);
TickTock 38:155ec32c5e91 335 tt.set_font((unsigned char*) Arial28x28);
TickTock 13:62e0f7f39ff5 336 if(force) tt.cls();
TickTock 121:553faf139a20 337
TickTock 121:553faf139a20 338 /*if(force||tock){ // for esr debug
TickTock 121:553faf139a20 339 tt.locate(10,10);
TickTock 121:553faf139a20 340 printf("%d %d amps\n",Imax,Imin);
TickTock 121:553faf139a20 341 tt.locate(10,40);
TickTock 121:553faf139a20 342 printf(" %4.1f %4.1f\n",incRmax/2,incRmin/2);
TickTock 121:553faf139a20 343 tt.locate(10,70);
TickTock 121:553faf139a20 344 printf(" %4.1f %4.1f\n",redRmax/2,redRmin/2);
TickTock 121:553faf139a20 345 tt.locate(10,100);
TickTock 121:553faf139a20 346 printf(" %4.1f %4.1f\n",curRmax/2,curRmin/2);
TickTock 121:553faf139a20 347 //tt.locate(10,130);
TickTock 121:553faf139a20 348 curRmin=1000;
TickTock 121:553faf139a20 349 curRmax=0;
TickTock 121:553faf139a20 350 incRmin=1000;
TickTock 121:553faf139a20 351 incRmax=0;
TickTock 121:553faf139a20 352 redRmin=1000;
TickTock 121:553faf139a20 353 redRmax=0;
TickTock 121:553faf139a20 354 Imax=-1000;
TickTock 121:553faf139a20 355 Imin=1000;
TickTock 121:553faf139a20 356 }*/
TickTock 118:02010b18efdc 357 if(force||gids!=lgids){
TickTock 118:02010b18efdc 358 tt.locate(10,10);
TickTock 118:02010b18efdc 359 printf("%4d gids \n",gids);
TickTock 119:0e2b641e98a2 360 lgids=gids;
TickTock 118:02010b18efdc 361 }
TickTock 122:138a40892a4c 362 if(force||SOC_x10!=lSOC){
TickTock 119:0e2b641e98a2 363 tt.locate(10,40);
TickTock 122:138a40892a4c 364 printf(" %4.1f%s \n",(float)SOC_x10/10,"% SOC");
TickTock 122:138a40892a4c 365 lSOC=SOC_x10;
TickTock 118:02010b18efdc 366 }
TickTock 118:02010b18efdc 367 if(force||SOH_x100!=lSOH){
TickTock 118:02010b18efdc 368 tt.locate(10,70);
TickTock 132:08748a67280a 369 printf(" %4.1f%s,%4.1f%s \n",(float)SOH_x2/2,"%",(float)SOH_x100/100,"% SOH");
TickTock 118:02010b18efdc 370 lSOH=SOH_x100;
TickTock 118:02010b18efdc 371 }
TickTock 118:02010b18efdc 372 if(force||Ah_x10000!=lAh){
TickTock 118:02010b18efdc 373 tt.locate(10,100);
TickTock 120:041edeec08f5 374 printf(" %4.2f Ah cap \n",(float)Ah_x10000/10000);
TickTock 118:02010b18efdc 375 lAh=Ah_x10000;
TickTock 118:02010b18efdc 376 }
TickTock 124:0d622967b764 377 if(force||maxTemp!=lmaxTemp){
TickTock 124:0d622967b764 378 tt.locate(10,130);
TickTock 124:0d622967b764 379 printf(" %4.1f %s (max) \n",convertTemperature(maxTemp),temperatureUnit());
TickTock 124:0d622967b764 380 lmaxTemp=maxTemp;
TickTock 124:0d622967b764 381 }
TickTock 123:a8c0042df617 382 if(force||unloadedV_x2!=lunlV){
TickTock 124:0d622967b764 383 tt.locate(10,160);
TickTock 120:041edeec08f5 384 printf(" %4.1f V \n",unloadedV_x2/2);
TickTock 119:0e2b641e98a2 385 lunlV=unloadedV_x2;
TickTock 118:02010b18efdc 386 }
TickTock 118:02010b18efdc 387 if(force||Resr!=lresr){
TickTock 124:0d622967b764 388 tt.locate(10,190);
TickTock 120:041edeec08f5 389 printf(" %3.0f mOhms \n",Resr*1000);
TickTock 118:02010b18efdc 390 lresr=Resr;
TickTock 35:5acbd8a64a89 391 }
TickTock 13:62e0f7f39ff5 392 }
TickTock 13:62e0f7f39ff5 393
TickTock 42:4533b13b297d 394 void braking (bool force, bool showButtons, bool prdata=false){
TickTock 28:f24ac05645d9 395 unsigned long targetBraking, regenBraking;
TickTock 73:62ee8eae3a84 396 static unsigned long maxTarget = 1000, maxRegen = 1000, tardivreg_x1000 = 1000;
TickTock 28:f24ac05645d9 397 unsigned long temp;
TickTock 28:f24ac05645d9 398 static unsigned char lastPressure[4] = {200,200,200,200};
TickTock 28:f24ac05645d9 399 unsigned char i,r,t;
TickTock 37:fea2c1d52c5f 400 static unsigned char lr=0, lt=0;
TickTock 37:fea2c1d52c5f 401 signed short steering;
TickTock 37:fea2c1d52c5f 402 unsigned short s;
TickTock 37:fea2c1d52c5f 403 static unsigned short ls;
TickTock 37:fea2c1d52c5f 404 unsigned char throttle;
TickTock 37:fea2c1d52c5f 405 static unsigned char lthrottle;
TickTock 48:d1ce92104a1f 406 short steerOutBounds = 0 ;
TickTock 28:f24ac05645d9 407 CANMessage msg;
TickTock 28:f24ac05645d9 408
TickTock 48:d1ce92104a1f 409 //---------------
TickTock 37:fea2c1d52c5f 410 msg = lastMsg[indexLastMsg[0x180]]; //Get Throttle position
TickTock 37:fea2c1d52c5f 411 throttle = msg.data[5];
TickTock 48:d1ce92104a1f 412
TickTock 48:d1ce92104a1f 413 // ---- steering ----
TickTock 37:fea2c1d52c5f 414 msg = lastMsg[indexLastMsg[0x002]]; //Get Steering angle
TickTock 37:fea2c1d52c5f 415 steering = (msg.data[1]<<8)+msg.data[0];
TickTock 48:d1ce92104a1f 416
TickTock 48:d1ce92104a1f 417 if(skin==ttSkin){
TickTock 66:b7476ce7a59e 418 s= (unsigned short) ((steering/10)+155)%310; // this modulo wraps display
TickTock 48:d1ce92104a1f 419 }else{// if(skin==ggSkin){
TickTock 48:d1ce92104a1f 420 // do not go off screen left or right. gg - steering
TickTock 48:d1ce92104a1f 421 short ss = (short) ((steering/15)+160); // less gain 10 -> 15
TickTock 48:d1ce92104a1f 422 if(ss<0) { ss=0; steerOutBounds = 1; }
TickTock 48:d1ce92104a1f 423 if(ss>310) { ss=310; steerOutBounds = 1; }
TickTock 48:d1ce92104a1f 424 s = (unsigned short) ss;
TickTock 48:d1ce92104a1f 425 }
TickTock 48:d1ce92104a1f 426
TickTock 48:d1ce92104a1f 427 //--------------
TickTock 28:f24ac05645d9 428 msg = lastMsg[indexLastMsg[0x1ca]]; //Get brake pressure
TickTock 28:f24ac05645d9 429 tt.background(Navy);
TickTock 28:f24ac05645d9 430 if (force) {
TickTock 28:f24ac05645d9 431 tt.cls();
TickTock 28:f24ac05645d9 432 tt.rect(0,111,170,239,White);
TickTock 28:f24ac05645d9 433 tt.line(0,207,170,207,White);
TickTock 28:f24ac05645d9 434 tt.line(0,175,170,175,White);
TickTock 28:f24ac05645d9 435 tt.line(0,143,170,143,White);
TickTock 28:f24ac05645d9 436 lastPressure[0] = 200;
TickTock 28:f24ac05645d9 437 lastPressure[1] = 200;
TickTock 28:f24ac05645d9 438 lastPressure[2] = 200;
TickTock 28:f24ac05645d9 439 lastPressure[3] = 200;
TickTock 28:f24ac05645d9 440 }
TickTock 48:d1ce92104a1f 441
TickTock 48:d1ce92104a1f 442 // display the steering position small square
TickTock 37:fea2c1d52c5f 443 if (s!=ls){
TickTock 48:d1ce92104a1f 444 // steering position has moved
TickTock 48:d1ce92104a1f 445 //tt.fillrect(ls,5,ls+9,14, Navy); // blank old position
TickTock 48:d1ce92104a1f 446
TickTock 48:d1ce92104a1f 447 //---- gg - steering red
TickTock 48:d1ce92104a1f 448 // box is blanked by top of Braking bar, so move up 5
TickTock 48:d1ce92104a1f 449 tt.fillrect(ls,0,ls+9,9, Navy); // blank old position
TickTock 48:d1ce92104a1f 450 if( steerOutBounds != 0 ) // draw out-of-bounds as a red box
TickTock 48:d1ce92104a1f 451 tt.fillrect(s,0,s+9,9, Red); // draw out-of-bounds position
TickTock 48:d1ce92104a1f 452 else
TickTock 48:d1ce92104a1f 453 tt.fillrect(s,0,s+9,9, White); // draw new in-bounds position
TickTock 48:d1ce92104a1f 454
TickTock 48:d1ce92104a1f 455 //----
TickTock 37:fea2c1d52c5f 456 //tt.foreground(Yellow);
TickTock 37:fea2c1d52c5f 457 //tt.set_font((unsigned char*) Arial28x28);
TickTock 37:fea2c1d52c5f 458 //tt.locate(10,40);
TickTock 37:fea2c1d52c5f 459 //printf("%d %d \n",s,ls);
TickTock 37:fea2c1d52c5f 460 ls=s;
TickTock 37:fea2c1d52c5f 461 }
TickTock 48:d1ce92104a1f 462
TickTock 37:fea2c1d52c5f 463 if (throttle!=lthrottle){
TickTock 37:fea2c1d52c5f 464 if (throttle>239) throttle=239;
TickTock 37:fea2c1d52c5f 465 if(throttle<lthrottle){
TickTock 37:fea2c1d52c5f 466 tt.fillrect(280,239-lthrottle,310,239-throttle,Navy);
TickTock 37:fea2c1d52c5f 467 }else{
TickTock 37:fea2c1d52c5f 468 tt.fillrect(280,239-throttle,310,239,Yellow);
TickTock 37:fea2c1d52c5f 469 }
TickTock 37:fea2c1d52c5f 470 lthrottle=throttle;
TickTock 37:fea2c1d52c5f 471 }
TickTock 37:fea2c1d52c5f 472
TickTock 28:f24ac05645d9 473 // plot bar graph for each wheel pressure
TickTock 28:f24ac05645d9 474 for (i=0; i<4; i++){
TickTock 28:f24ac05645d9 475 if (msg.data[i]<239) {
TickTock 28:f24ac05645d9 476 if (msg.data[i]>lastPressure[i]){
TickTock 28:f24ac05645d9 477 tt.fillrect(10+40*i,239-msg.data[i],40+40*i,239,Red);
TickTock 28:f24ac05645d9 478 } else if (msg.data[i]<lastPressure[i]) {
TickTock 28:f24ac05645d9 479 tt.fillrect(10+40*i,238-lastPressure[i],40+40*i,238-msg.data[i],Navy);
TickTock 28:f24ac05645d9 480 }
TickTock 28:f24ac05645d9 481 lastPressure[i]=msg.data[i];
TickTock 28:f24ac05645d9 482 }
TickTock 28:f24ac05645d9 483 }
TickTock 28:f24ac05645d9 484
TickTock 73:62ee8eae3a84 485 msg = lastMsg[indexLastMsg[0x1cb]]; //Get Target and Regen
TickTock 73:62ee8eae3a84 486 regenBraking = (msg.data[0]<<3)+(msg.data[1]>>5);
TickTock 73:62ee8eae3a84 487 targetBraking = (msg.data[2]<<3)+(msg.data[3]>>5);
TickTock 113:f388b4505463 488 msg = lastMsg[indexLastMsg[0x421]]; //Get Drive Mode
TickTock 113:f388b4505463 489 if (msg.data[0]==0x18) { // In Neutral
TickTock 108:29b5a760adc2 490 regenBraking = 0; // No regen when in Neutral
TickTock 108:29b5a760adc2 491 }
TickTock 73:62ee8eae3a84 492
TickTock 73:62ee8eae3a84 493 if (targetBraking<2045){
TickTock 73:62ee8eae3a84 494 if ((targetBraking>50)&&(regenBraking>50)){
TickTock 73:62ee8eae3a84 495 temp = targetBraking;
TickTock 73:62ee8eae3a84 496 temp *= 1000;
TickTock 73:62ee8eae3a84 497 temp /= regenBraking;
TickTock 73:62ee8eae3a84 498 if (temp<tardivreg_x1000) tardivreg_x1000=temp;
TickTock 73:62ee8eae3a84 499 }
TickTock 73:62ee8eae3a84 500 if (targetBraking>maxTarget) maxTarget=targetBraking;
TickTock 73:62ee8eae3a84 501 if (regenBraking>maxRegen) maxRegen=regenBraking;
TickTock 73:62ee8eae3a84 502 temp = targetBraking;
TickTock 73:62ee8eae3a84 503 temp *=200;
TickTock 73:62ee8eae3a84 504 temp /= maxTarget;
TickTock 73:62ee8eae3a84 505 t = (char) temp;
TickTock 73:62ee8eae3a84 506 if (t>200) t=200;
TickTock 73:62ee8eae3a84 507 temp = regenBraking;
TickTock 73:62ee8eae3a84 508 temp *= tardivreg_x1000;
TickTock 73:62ee8eae3a84 509 temp /= maxTarget;
TickTock 73:62ee8eae3a84 510 temp /= 5; // 1000/200=5
TickTock 73:62ee8eae3a84 511 r = (char) temp;
TickTock 73:62ee8eae3a84 512 if (r>200) r=200;
TickTock 73:62ee8eae3a84 513 if(lr!=r&&prdata){
TickTock 73:62ee8eae3a84 514 tt.foreground(Yellow);
TickTock 73:62ee8eae3a84 515 tt.set_font((unsigned char*) Arial28x28);
TickTock 73:62ee8eae3a84 516 tt.locate(100,40);
TickTock 73:62ee8eae3a84 517 printf("%d %d \n",regenBraking,maxRegen);
TickTock 73:62ee8eae3a84 518 tt.locate(100,70);
TickTock 73:62ee8eae3a84 519 printf("%3.1f (%3.1f%s) \n",(float)tardivreg_x1000/10,(float)regenBraking*tardivreg_x1000/targetBraking/10,"%");
TickTock 73:62ee8eae3a84 520 }
TickTock 73:62ee8eae3a84 521 if(lt!=t&&prdata){
TickTock 73:62ee8eae3a84 522 tt.foreground(Yellow);
TickTock 73:62ee8eae3a84 523 tt.set_font((unsigned char*) Arial28x28);
TickTock 73:62ee8eae3a84 524 tt.locate(100,10);
TickTock 73:62ee8eae3a84 525 printf("%d %d \n",targetBraking,maxTarget);
TickTock 73:62ee8eae3a84 526 }
TickTock 73:62ee8eae3a84 527 if (r>t) t=r; //Should never happen
TickTock 73:62ee8eae3a84 528 if((lr!=r||lt!=t)&&!prdata){
TickTock 73:62ee8eae3a84 529 tt.fillrect(190,10,260,239-t,Navy);
TickTock 73:62ee8eae3a84 530 tt.fillrect(190,239-t,260,239-r,Red);
TickTock 73:62ee8eae3a84 531 tt.fillrect(190,239-r,260,239,Green);
TickTock 73:62ee8eae3a84 532 }
TickTock 73:62ee8eae3a84 533 lt=t;
TickTock 73:62ee8eae3a84 534 lr=r;
TickTock 28:f24ac05645d9 535 }
TickTock 28:f24ac05645d9 536 }
TickTock 28:f24ac05645d9 537
TickTock 42:4533b13b297d 538 void cpData(bool force, bool showButtons){
TickTock 36:dbd39c315258 539 short unsigned max, min, jv, i, bd;
TickTock 36:dbd39c315258 540 unsigned avg;
TickTock 97:a25940fd7b5b 541 static char step=0; // counter to allow incremental update
TickTock 36:dbd39c315258 542 if(force){
TickTock 36:dbd39c315258 543 tt.foreground(White);
TickTock 36:dbd39c315258 544 tt.background(Navy);
TickTock 36:dbd39c315258 545 tt.set_font((unsigned char*) Arial12x12_prop); // select the font
TickTock 36:dbd39c315258 546 max=0;
TickTock 36:dbd39c315258 547 min=9999;
TickTock 36:dbd39c315258 548 avg=0;
TickTock 36:dbd39c315258 549 for(i=0; i<96; i++){
TickTock 124:0d622967b764 550 bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4];
TickTock 36:dbd39c315258 551 avg+=bd;
TickTock 36:dbd39c315258 552 if(bd>max) max=bd;
TickTock 36:dbd39c315258 553 if(bd<min) min=bd;
TickTock 36:dbd39c315258 554 }
TickTock 36:dbd39c315258 555 avg /= 96;
TickTock 36:dbd39c315258 556 if(min<3713) {
TickTock 36:dbd39c315258 557 jv=avg-(max-avg)*1.5;
TickTock 36:dbd39c315258 558 } else { // Only compute judgement value if min cellpair meets <= 3712mV requirement
TickTock 36:dbd39c315258 559 jv=0;
TickTock 36:dbd39c315258 560 }
TickTock 99:c05abf8e1cdc 561
TickTock 107:e9be732c1ad4 562 char* sTemperatureUnit = temperatureUnit();
TickTock 97:a25940fd7b5b 563 switch(step){
TickTock 97:a25940fd7b5b 564 case 0:
TickTock 97:a25940fd7b5b 565 tt.cls();
TickTock 97:a25940fd7b5b 566 showCP=true;
TickTock 97:a25940fd7b5b 567 break;
TickTock 97:a25940fd7b5b 568 case 1:
TickTock 97:a25940fd7b5b 569 tt.locate(0,6);
TickTock 99:c05abf8e1cdc 570 printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %2.0f%s %2.0f%s %2.0f%s %2.0f%s\n\n",
TickTock 124:0d622967b764 571 max,min,avg,jv, convertTemperature(battData[BatDataBaseG4*7+5]),sTemperatureUnit,convertTemperature(battData[BatDataBaseG4*7+8]),sTemperatureUnit,
TickTock 124:0d622967b764 572 convertTemperature(battData[BatDataBaseG4*7+11]),sTemperatureUnit,convertTemperature(battData[BatDataBaseG4*7+14]),sTemperatureUnit);
TickTock 97:a25940fd7b5b 573 tt.rect(8+0*41,16,40+0*41,28,Green);
TickTock 97:a25940fd7b5b 574 tt.rect(8+1*41,16,40+1*41,28,Yellow);
TickTock 97:a25940fd7b5b 575 //tt.rect(8+2*41,16,40+2*41,28,White);
TickTock 97:a25940fd7b5b 576 tt.rect(8+3*41,16,40+3*41,28,Red);
TickTock 97:a25940fd7b5b 577 break;
TickTock 97:a25940fd7b5b 578 default:
TickTock 97:a25940fd7b5b 579 tt.locate(0,36+(step-2)*48);
TickTock 97:a25940fd7b5b 580 for(i=(step-2)*4; i<(step-1)*4; i++){
TickTock 97:a25940fd7b5b 581 printf("%02d-%02d : %04d %04d %04d %04d %04d %04d\n",
TickTock 97:a25940fd7b5b 582 i*6+1,i*6+6,
TickTock 124:0d622967b764 583 (battData[BatDataBaseG2*7+i*12+3]<<8)+battData[BatDataBaseG2*7+i*12+4],(battData[BatDataBaseG2*7+i*12+5]<<8)+battData[BatDataBaseG2*7+i*12+6],
TickTock 124:0d622967b764 584 (battData[BatDataBaseG2*7+i*12+7]<<8)+battData[BatDataBaseG2*7+i*12+8],(battData[BatDataBaseG2*7+i*12+9]<<8)+battData[BatDataBaseG2*7+i*12+10],
TickTock 124:0d622967b764 585 (battData[BatDataBaseG2*7+i*12+11]<<8)+battData[BatDataBaseG2*7+i*12+12],(battData[BatDataBaseG2*7+i*12+13]<<8)+battData[BatDataBaseG2*7+i*12+14]);
TickTock 97:a25940fd7b5b 586 }
TickTock 97:a25940fd7b5b 587 for(i=(step-2)*24; i<(step-1)*24; i++){
TickTock 124:0d622967b764 588 bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4];
TickTock 97:a25940fd7b5b 589 if(bd>0){
TickTock 97:a25940fd7b5b 590 if(bd==max) tt.rect(58+(i%6)*41,34+(int)(i/6)*12,90+(i%6)*41,46+(int)(i/6)*12,Green);
TickTock 97:a25940fd7b5b 591 //if(bd==avg) tt.rect(58+(i%6)*41,34+(int)(i/6)*12,90+(i%6)*41,46+(int)(i/6)*12,White);
TickTock 97:a25940fd7b5b 592 if(bd==min) tt.rect(58+(i%6)*41,34+(int)(i/6)*12,90+(i%6)*41,46+(int)(i/6)*12,Yellow);
TickTock 97:a25940fd7b5b 593 if(bd<jv) tt.rect(58+(i%6)*41,34+(int)(i/6)*12,90+(i%6)*41,46+(int)(i/6)*12,Red);
TickTock 97:a25940fd7b5b 594 }
TickTock 97:a25940fd7b5b 595 }
TickTock 36:dbd39c315258 596 }
TickTock 97:a25940fd7b5b 597 step=step<5?step+1:0;
TickTock 97:a25940fd7b5b 598 if(step==0){
TickTock 97:a25940fd7b5b 599 showCP=false;
TickTock 36:dbd39c315258 600 }
TickTock 36:dbd39c315258 601 }
TickTock 122:138a40892a4c 602 if(showButtons){
TickTock 36:dbd39c315258 603 tt.foreground(Yellow);
TickTock 36:dbd39c315258 604 tt.background(DarkCyan);
TickTock 36:dbd39c315258 605 tt.set_font((unsigned char*) Arial12x12);
garygid 54:6ce808d0995e 606
garygid 54:6ce808d0995e 607 showButton(1,0,"Request","CP Data",4,4);
TickTock 44:6262a9fd1e56 608 }
TickTock 44:6262a9fd1e56 609 }
TickTock 44:6262a9fd1e56 610
TickTock 44:6262a9fd1e56 611 //----------------
garygid 67:2022fce701d0 612 // gg - index
garygid 67:2022fce701d0 613 void showIndex(bool force, bool showButtons){
garygid 67:2022fce701d0 614
garygid 67:2022fce701d0 615 if(force){
garygid 67:2022fce701d0 616 tt.foreground(White);
garygid 67:2022fce701d0 617 tt.background(Navy);
garygid 67:2022fce701d0 618 //tt.set_font((unsigned char*) Arial12x12_prop); // select the font
garygid 67:2022fce701d0 619
garygid 67:2022fce701d0 620 tt.cls();
garygid 67:2022fce701d0 621
garygid 67:2022fce701d0 622 // add the buttons to GoTo to other screens
garygid 67:2022fce701d0 623
garygid 67:2022fce701d0 624 tt.foreground(Yellow);
garygid 67:2022fce701d0 625 tt.background(DarkCyan);
garygid 67:2022fce701d0 626 tt.set_font((unsigned char*) Arial12x12);
garygid 67:2022fce701d0 627
garygid 67:2022fce701d0 628 // top row
garygid 67:2022fce701d0 629 showButton(0,0," GoTo"," Main",4,4);
garygid 67:2022fce701d0 630 showButton(1,0," GoTo"," Brake",4,4);
garygid 67:2022fce701d0 631 showButton(2,0," GoTo"," EFF",4,4);
TickTock 122:138a40892a4c 632 showButton(3,0," GoTo","Health",4,4);
garygid 67:2022fce701d0 633 // middle row
garygid 67:2022fce701d0 634 showButton(0,1," GoTo","CP Data",4,4);
garygid 67:2022fce701d0 635 showButton(1,1," GoTo","CP Hist",4,4);
garygid 67:2022fce701d0 636 showButton(2,1," GoTo","CP Bars",4,4);
leafman 98:9f8bab96edff 637 showButton(3,1," GoTo"," Config",4,4);
leafman 98:9f8bab96edff 638 // bottom (not Nav) row
leafman 98:9f8bab96edff 639 showButton(0,2," GoTo","Playback",4,4);
TickTock 131:0d926c080a65 640 //showButton(1,2," GoTo","Set Time",4,4);
leafman 98:9f8bab96edff 641 showButton(2,2," GoTo"," Log",4,4);
TickTock 108:29b5a760adc2 642 showButton(3,2," GoTo"," Trip",4,4);
garygid 67:2022fce701d0 643
garygid 67:2022fce701d0 644 showCP=false;
garygid 67:2022fce701d0 645 }
garygid 67:2022fce701d0 646
garygid 67:2022fce701d0 647 if(sMode==1&&showButtons){
garygid 67:2022fce701d0 648 tt.foreground(Yellow);
garygid 67:2022fce701d0 649 tt.background(DarkCyan);
garygid 67:2022fce701d0 650 tt.set_font((unsigned char*) Arial12x12);
garygid 67:2022fce701d0 651
garygid 67:2022fce701d0 652 // do nothing here?
garygid 67:2022fce701d0 653 }
garygid 67:2022fce701d0 654 }
garygid 67:2022fce701d0 655
garygid 67:2022fce701d0 656 //----------------
TickTock 48:d1ce92104a1f 657 // gg - cpbars
TickTock 48:d1ce92104a1f 658 void cpBarPlot(bool force, bool showButtons){
TickTock 48:d1ce92104a1f 659 short unsigned max, min, jv, i, bd;
TickTock 48:d1ce92104a1f 660 unsigned avg;
TickTock 48:d1ce92104a1f 661 short unsigned nBar[96] ; // bar height over min
TickTock 48:d1ce92104a1f 662
TickTock 48:d1ce92104a1f 663 if(force){
TickTock 48:d1ce92104a1f 664 tt.foreground(White);
TickTock 48:d1ce92104a1f 665 tt.background(Navy);
TickTock 48:d1ce92104a1f 666 tt.set_font((unsigned char*) Arial12x12_prop); // select the font
TickTock 48:d1ce92104a1f 667 max=0;
TickTock 48:d1ce92104a1f 668 min=9999;
TickTock 48:d1ce92104a1f 669 avg=0;
TickTock 48:d1ce92104a1f 670
TickTock 48:d1ce92104a1f 671 // calc each cell-pair voltage, find max and min
TickTock 48:d1ce92104a1f 672 for(i=0; i<96; i++){
TickTock 124:0d622967b764 673 bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4];
TickTock 48:d1ce92104a1f 674 nBar[i] = bd; // init to bar height
TickTock 48:d1ce92104a1f 675 avg+=bd;
TickTock 48:d1ce92104a1f 676 if(bd>max) max=bd;
TickTock 48:d1ce92104a1f 677 if(bd<min) min=bd;
TickTock 48:d1ce92104a1f 678 }
TickTock 48:d1ce92104a1f 679 avg /= 96;
TickTock 48:d1ce92104a1f 680
TickTock 48:d1ce92104a1f 681 if(min<3713) {
TickTock 48:d1ce92104a1f 682 jv=avg-(max-avg)*1.5;
TickTock 48:d1ce92104a1f 683 } else { // Only compute judgement value if min cellpair meets <= 3712mV requirement
TickTock 48:d1ce92104a1f 684 jv=0;
TickTock 48:d1ce92104a1f 685 }
TickTock 48:d1ce92104a1f 686
TickTock 48:d1ce92104a1f 687 //------------------
TickTock 48:d1ce92104a1f 688 tt.cls();
TickTock 48:d1ce92104a1f 689
TickTock 48:d1ce92104a1f 690 // show as vertical bar plot
TickTock 48:d1ce92104a1f 691 int xWinMin = 26;
TickTock 48:d1ce92104a1f 692 int xWinMax = 316;
TickTock 48:d1ce92104a1f 693 int yWinMin = 50;
TickTock 48:d1ce92104a1f 694 int yWinMax = 150;
TickTock 48:d1ce92104a1f 695 // draw the Bar Graph Frame, 2 pixels wide
TickTock 48:d1ce92104a1f 696 tt.rect( xWinMin-1,yWinMin-1, xWinMax+1,yWinMax+1,Red);
TickTock 48:d1ce92104a1f 697 tt.rect( xWinMin-2,yWinMin-2, xWinMax+2,yWinMax+2,Green);
TickTock 48:d1ce92104a1f 698
TickTock 48:d1ce92104a1f 699 // bar heights
TickTock 48:d1ce92104a1f 700 int height = yWinMax - yWinMin ;
TickTock 48:d1ce92104a1f 701 int iBarValMax = max - min ; // zero to N
TickTock 48:d1ce92104a1f 702
TickTock 48:d1ce92104a1f 703 //----------------
TickTock 48:d1ce92104a1f 704 if( iBarValMax == 0 ) {
TickTock 48:d1ce92104a1f 705 // for testing
TickTock 48:d1ce92104a1f 706 min = 3501 ;
TickTock 48:d1ce92104a1f 707 //max = min + 95*2 ; // for tall values
TickTock 48:d1ce92104a1f 708 max = min + 95/4 ; // for small values
TickTock 48:d1ce92104a1f 709 avg = ( max + min ) / 2;
TickTock 48:d1ce92104a1f 710 iBarValMax = max - min ; // zero to N
TickTock 48:d1ce92104a1f 711 for(int i=0; i<96; i++) {
TickTock 48:d1ce92104a1f 712 //nBar[i] = i*2 + min ; // test tall values
TickTock 48:d1ce92104a1f 713 nBar[i] = i/4 + min ; // test small values
TickTock 48:d1ce92104a1f 714 }
TickTock 48:d1ce92104a1f 715 }
TickTock 48:d1ce92104a1f 716 //---------------
TickTock 48:d1ce92104a1f 717 float nBarScale = float(height) / iBarValMax ;
TickTock 48:d1ce92104a1f 718 if( nBarScale < 0.1 ) nBarScale = 0.1 ;
TickTock 48:d1ce92104a1f 719
TickTock 48:d1ce92104a1f 720 // do the Bar-height scaling
TickTock 48:d1ce92104a1f 721 for(int i=0; i<96; i++){
TickTock 48:d1ce92104a1f 722 nBar[i] -= min ; // now, 0 to N = iBinValMax
TickTock 48:d1ce92104a1f 723 nBar[i] *= nBarScale ; // scale, as needed
TickTock 48:d1ce92104a1f 724 }
TickTock 48:d1ce92104a1f 725
TickTock 48:d1ce92104a1f 726 // values, for now
TickTock 124:0d622967b764 727 // BatDataBaseG4 * 7 = 280
TickTock 48:d1ce92104a1f 728 tt.locate( 0, yWinMax+40 );
TickTock 108:29b5a760adc2 729 char* sTemperatureUnit = temperatureUnit();
TickTock 108:29b5a760adc2 730 printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %2.0f%s %2.0f%s %2.0f%s %2.0f%s\n\n",
TickTock 124:0d622967b764 731 max,min,avg,jv, convertTemperature(battData[BatDataBaseG4*7+5]),sTemperatureUnit,convertTemperature(battData[BatDataBaseG4*7+8]),sTemperatureUnit,
TickTock 124:0d622967b764 732 convertTemperature(battData[BatDataBaseG4*7+11]),sTemperatureUnit,convertTemperature(battData[BatDataBaseG4*7+14]),sTemperatureUnit);
TickTock 108:29b5a760adc2 733 //printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %02dC %02dC %02dC %02dC\n\n",
TickTock 124:0d622967b764 734 // max,min,avg,jv, battData[BatDataBaseG4*7+5],battData[BatDataBaseG4*7+8], battData[BatDataBaseG4*7+11],battData[BatDataBaseG4*7+14]);
TickTock 48:d1ce92104a1f 735
TickTock 48:d1ce92104a1f 736 // label the X axis (approximate)
TickTock 48:d1ce92104a1f 737 tt.locate( 2, yWinMax+5); printf("%04d", min );
TickTock 48:d1ce92104a1f 738 //tt.locate( 2, yWinMin-14 ); printf("%04d = %04d from %1.4f", max, int( height / nBarScale ) + min, nBarScale );
TickTock 48:d1ce92104a1f 739 tt.locate( 2, yWinMin-14 ); printf("%04d = (%d) mv range.", max , max - min );
TickTock 48:d1ce92104a1f 740
TickTock 48:d1ce92104a1f 741 //---------------
TickTock 48:d1ce92104a1f 742 // show the bars
TickTock 48:d1ce92104a1f 743 int nBarWidth = 2 ;
TickTock 48:d1ce92104a1f 744 int nBarSpace = 1 ; // 1 for testing
TickTock 48:d1ce92104a1f 745
TickTock 48:d1ce92104a1f 746 int xPos = xWinMin + 2 ; // start one from the left
TickTock 48:d1ce92104a1f 747
TickTock 48:d1ce92104a1f 748 for( int i=0; i<96; i++) {
TickTock 48:d1ce92104a1f 749 height = nBar[i] ;
TickTock 48:d1ce92104a1f 750 if( height > 100 ) height = 100 ; // clip tops
TickTock 48:d1ce92104a1f 751
TickTock 48:d1ce92104a1f 752 // draw the bar, is always inside x-window
TickTock 121:553faf139a20 753 if (shunt[i]){
TickTock 121:553faf139a20 754 tt.fillrect( xPos,yWinMax-height, xPos+nBarWidth-1,yWinMax, Red);
TickTock 121:553faf139a20 755 } else {
TickTock 121:553faf139a20 756 tt.fillrect( xPos,yWinMax-height, xPos+nBarWidth-1,yWinMax, Green);
TickTock 121:553faf139a20 757 }
TickTock 48:d1ce92104a1f 758 // tic mark the y axis each 5
TickTock 48:d1ce92104a1f 759 if(i%5 == 4){
TickTock 48:d1ce92104a1f 760 tt.line( xPos,yWinMax+2, xPos,yWinMax+5, White); // a white tick mark
TickTock 48:d1ce92104a1f 761 tt.line( xPos+1,yWinMax+2, xPos+1,yWinMax+5, White); // a white tick mark, to widen
TickTock 48:d1ce92104a1f 762 //tt.rect( xPos,yWinMax+2, xPos+1,yWinMax+5, White); // a white 2-wide tick mark is SLOW
TickTock 48:d1ce92104a1f 763 }
TickTock 48:d1ce92104a1f 764 // label the y axis each 10
TickTock 48:d1ce92104a1f 765 if(i%10 == 9){
TickTock 48:d1ce92104a1f 766 tt.locate( xPos-6, yWinMax+8 );
TickTock 48:d1ce92104a1f 767 printf("%02d\n", i+1 );
TickTock 48:d1ce92104a1f 768 }
TickTock 48:d1ce92104a1f 769
TickTock 48:d1ce92104a1f 770 // step to the next bar position
TickTock 48:d1ce92104a1f 771 xPos += nBarWidth + nBarSpace ;
TickTock 48:d1ce92104a1f 772 }
TickTock 48:d1ce92104a1f 773
TickTock 48:d1ce92104a1f 774 showCP=false;
TickTock 48:d1ce92104a1f 775 }
TickTock 48:d1ce92104a1f 776
TickTock 48:d1ce92104a1f 777 // handle the button
TickTock 48:d1ce92104a1f 778 if(sMode==1&&showButtons){
TickTock 48:d1ce92104a1f 779 tt.foreground(Yellow);
TickTock 48:d1ce92104a1f 780 tt.background(DarkCyan);
TickTock 48:d1ce92104a1f 781 tt.set_font((unsigned char*) Arial12x12);
garygid 54:6ce808d0995e 782
garygid 54:6ce808d0995e 783 showButton(1,0,"Request","CP Data",4,4);
TickTock 48:d1ce92104a1f 784 }
TickTock 48:d1ce92104a1f 785 }
TickTock 48:d1ce92104a1f 786
TickTock 48:d1ce92104a1f 787 //----------------
TickTock 44:6262a9fd1e56 788 // gg - hist
TickTock 47:9cc7d876dd6d 789 void cpHistogram(bool force, bool showButtons){
TickTock 44:6262a9fd1e56 790 short unsigned max, min, jv, i, bd;
TickTock 44:6262a9fd1e56 791 unsigned avg;
TickTock 44:6262a9fd1e56 792 if(force){
TickTock 44:6262a9fd1e56 793 tt.foreground(White);
TickTock 44:6262a9fd1e56 794 tt.background(Navy);
TickTock 44:6262a9fd1e56 795 tt.set_font((unsigned char*) Arial12x12_prop); // select the font
TickTock 44:6262a9fd1e56 796 max=0;
TickTock 44:6262a9fd1e56 797 min=9999;
TickTock 44:6262a9fd1e56 798 avg=0;
TickTock 44:6262a9fd1e56 799 for(i=0; i<96; i++){
TickTock 124:0d622967b764 800 bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4];
TickTock 44:6262a9fd1e56 801 avg+=bd;
TickTock 44:6262a9fd1e56 802 if(bd>max) max=bd;
TickTock 44:6262a9fd1e56 803 if(bd<min) min=bd;
TickTock 44:6262a9fd1e56 804 }
TickTock 44:6262a9fd1e56 805 avg /= 96;
TickTock 44:6262a9fd1e56 806 if(min<3713) {
TickTock 44:6262a9fd1e56 807 jv=avg-(max-avg)*1.5;
TickTock 44:6262a9fd1e56 808 } else { // Only compute judgement value if min cellpair meets <= 3712mV requirement
TickTock 44:6262a9fd1e56 809 jv=0;
TickTock 44:6262a9fd1e56 810 }
TickTock 44:6262a9fd1e56 811
TickTock 44:6262a9fd1e56 812 //------------------
TickTock 44:6262a9fd1e56 813 tt.cls();
TickTock 44:6262a9fd1e56 814
TickTock 44:6262a9fd1e56 815 // show as histogram
TickTock 44:6262a9fd1e56 816 int xWinMin = 20;
TickTock 44:6262a9fd1e56 817 int xWinMax = 300;
TickTock 44:6262a9fd1e56 818 int yWinMin = 50;
TickTock 44:6262a9fd1e56 819 int yWinMax = 150;
TickTock 44:6262a9fd1e56 820 // draw the Histogram Frame, 2 pixels wide
TickTock 44:6262a9fd1e56 821 tt.rect( xWinMin-1,yWinMin-1, xWinMax+1,yWinMax+1,Red);
TickTock 44:6262a9fd1e56 822 tt.rect( xWinMin-2,yWinMin-2, xWinMax+2,yWinMax+2,Green);
TickTock 44:6262a9fd1e56 823
TickTock 44:6262a9fd1e56 824 // binning
TickTock 44:6262a9fd1e56 825 short nBin[301] ; // bins to count Min values in nBin[0], etc.
TickTock 44:6262a9fd1e56 826 int height ;
TickTock 44:6262a9fd1e56 827 int iBinIndxMax = 300 ;
TickTock 44:6262a9fd1e56 828 int iBinValMax = max - min ; // zero to N
TickTock 44:6262a9fd1e56 829 if( iBinValMax > iBinIndxMax ) iBinValMax = iBinIndxMax ;
TickTock 44:6262a9fd1e56 830
TickTock 44:6262a9fd1e56 831 // clean the bins
TickTock 44:6262a9fd1e56 832 for(int i=0; i<=iBinIndxMax; i++) {
TickTock 44:6262a9fd1e56 833 nBin[i] = 0;
TickTock 44:6262a9fd1e56 834 }
TickTock 44:6262a9fd1e56 835
TickTock 44:6262a9fd1e56 836 // do the bin counting
TickTock 44:6262a9fd1e56 837 for(int i=0; i<96; i++){
TickTock 124:0d622967b764 838 bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4] - min ;
TickTock 44:6262a9fd1e56 839 if( bd > iBinValMax ) bd = iBinValMax ;
TickTock 44:6262a9fd1e56 840 nBin[bd] ++ ;
TickTock 44:6262a9fd1e56 841 }
TickTock 44:6262a9fd1e56 842
TickTock 44:6262a9fd1e56 843 //----------------
TickTock 44:6262a9fd1e56 844 if( iBinValMax == 0 ) {
TickTock 44:6262a9fd1e56 845 // for testing
TickTock 44:6262a9fd1e56 846 min = 10 ;
TickTock 44:6262a9fd1e56 847 max = 50 ;
TickTock 44:6262a9fd1e56 848 avg = ( max + min ) / 2;
TickTock 44:6262a9fd1e56 849 iBinValMax = max - min ;
TickTock 44:6262a9fd1e56 850 for(int i=0; i<=(iBinValMax/2); i++) {
TickTock 44:6262a9fd1e56 851 nBin[i] = i ;
TickTock 44:6262a9fd1e56 852 nBin[iBinValMax-i] = i ;
TickTock 44:6262a9fd1e56 853 }
TickTock 44:6262a9fd1e56 854 }
TickTock 44:6262a9fd1e56 855
TickTock 48:d1ce92104a1f 856 // the values, for now
TickTock 124:0d622967b764 857 // BatDataBaseG4 * 7 = 280
TickTock 48:d1ce92104a1f 858 tt.locate( 0, yWinMax+40 );
TickTock 108:29b5a760adc2 859 char* sTemperatureUnit = temperatureUnit();
TickTock 108:29b5a760adc2 860 printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %2.0f%s %2.0f%s %2.0f%s %2.0f%s\n\n",
TickTock 124:0d622967b764 861 max,min,avg,jv, convertTemperature(battData[BatDataBaseG4*7+5]),sTemperatureUnit,convertTemperature(battData[BatDataBaseG4*7+8]),sTemperatureUnit,
TickTock 124:0d622967b764 862 convertTemperature(battData[BatDataBaseG4*7+11]),sTemperatureUnit,convertTemperature(battData[BatDataBaseG4*7+14]),sTemperatureUnit);
TickTock 108:29b5a760adc2 863 //printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %02dC %02dC %02dC %02dC\n\n",
TickTock 124:0d622967b764 864 // max,min,avg,jv, battData[BatDataBaseG2*7+BatDataBaseG4*7+5],battData[BatDataBaseG2*7+BatDataBaseG4*7+8], battData[BatDataBaseG2*7+BatDataBaseG4*7+11],battData[BatDataBaseG2*7+BatDataBaseG4*7+14]);
TickTock 48:d1ce92104a1f 865
TickTock 44:6262a9fd1e56 866 //---------------
TickTock 44:6262a9fd1e56 867 // show the bars
TickTock 44:6262a9fd1e56 868 int nBarWidth = 3 ;
TickTock 44:6262a9fd1e56 869 int nBarSpace = 1 ; // 1 for testing
TickTock 44:6262a9fd1e56 870
TickTock 44:6262a9fd1e56 871 int xPos = (xWinMin + xWinMax) / 2 ;
TickTock 44:6262a9fd1e56 872 xPos -= (avg-min) * (nBarWidth + nBarSpace) ;
TickTock 44:6262a9fd1e56 873
TickTock 44:6262a9fd1e56 874 for( int i=0; i<=iBinValMax; i++) {
TickTock 44:6262a9fd1e56 875 height = 4 * nBin[i] ;
TickTock 44:6262a9fd1e56 876 if( height > 100 ) height = 100 ; // clip tops
TickTock 44:6262a9fd1e56 877
TickTock 44:6262a9fd1e56 878 // if inside the window, draw the bar
TickTock 44:6262a9fd1e56 879 if( ( xPos + nBarWidth < xWinMax ) && ( xPos > xWinMin ) )
TickTock 44:6262a9fd1e56 880 tt.fillrect( xPos,yWinMax-height, xPos+nBarWidth-1,yWinMax, Green);
TickTock 44:6262a9fd1e56 881
TickTock 44:6262a9fd1e56 882 // step to the next bar position
TickTock 44:6262a9fd1e56 883 xPos += nBarWidth + nBarSpace ;
TickTock 44:6262a9fd1e56 884 }
TickTock 44:6262a9fd1e56 885
TickTock 44:6262a9fd1e56 886 showCP=false;
TickTock 44:6262a9fd1e56 887 }
TickTock 44:6262a9fd1e56 888
TickTock 44:6262a9fd1e56 889 // handle the button
TickTock 47:9cc7d876dd6d 890 if(sMode==1&&showButtons){
TickTock 44:6262a9fd1e56 891 tt.foreground(Yellow);
TickTock 44:6262a9fd1e56 892 tt.background(DarkCyan);
TickTock 44:6262a9fd1e56 893 tt.set_font((unsigned char*) Arial12x12);
garygid 54:6ce808d0995e 894
garygid 54:6ce808d0995e 895 showButton(1,0,"Request","CP Data",4,4);
garygid 54:6ce808d0995e 896 }
TickTock 36:dbd39c315258 897 }
TickTock 36:dbd39c315258 898
TickTock 48:d1ce92104a1f 899 //---------------
leafman 98:9f8bab96edff 900 void config(bool force, bool showButtons){
TickTock 36:dbd39c315258 901 if (force) {
TickTock 36:dbd39c315258 902 tt.background(Black);
TickTock 36:dbd39c315258 903 tt.cls();
TickTock 36:dbd39c315258 904 }
TickTock 36:dbd39c315258 905 tt.foreground(Yellow);
TickTock 36:dbd39c315258 906 tt.background(DarkCyan);
TickTock 36:dbd39c315258 907 tt.set_font((unsigned char*) Arial12x12);
garygid 54:6ce808d0995e 908
garygid 65:821fc79cd7fe 909 //-------- top row --------
garygid 54:6ce808d0995e 910 showButton(0,0,"Calibrate"," Touch",4,4); // gg - 4x4
garygid 54:6ce808d0995e 911 showButton(1,0," Reset","",4,4);
TickTock 131:0d926c080a65 912 showButton(2,0," Save"," Config",4,4);
garygid 65:821fc79cd7fe 913
garygid 65:821fc79cd7fe 914 // a button to step to the next skin
garygid 65:821fc79cd7fe 915 unsigned int nextSkin = skin + 1 ;
garygid 65:821fc79cd7fe 916 if( nextSkin > maxSkin ) nextSkin = 0 ;
garygid 54:6ce808d0995e 917
garygid 65:821fc79cd7fe 918 if( nextSkin == ttSkin ) sprintf(sTemp1,"Skin TT");
garygid 65:821fc79cd7fe 919 else if( nextSkin == ggSkin ) sprintf(sTemp1,"Skin GG");
garygid 65:821fc79cd7fe 920 else sprintf(sTemp1,"Skin %d",nextSkin);
garygid 65:821fc79cd7fe 921
TickTock 131:0d926c080a65 922 showButton(3,0," Use",sTemp1,4,4);
TickTock 48:d1ce92104a1f 923
TickTock 48:d1ce92104a1f 924 //------- second row -----
TickTock 108:29b5a760adc2 925 if (logEn&&usbEn) {
garygid 54:6ce808d0995e 926 sprintf(sTemp1,"Disable");
TickTock 36:dbd39c315258 927 } else {
garygid 54:6ce808d0995e 928 sprintf(sTemp1,"Enable");
TickTock 36:dbd39c315258 929 }
garygid 54:6ce808d0995e 930 showButton(0,1,sTemp1,"Logging",4,4);
TickTock 48:d1ce92104a1f 931
TickTock 36:dbd39c315258 932 if (repeatPoll) {
garygid 54:6ce808d0995e 933 sprintf(sTemp1,"Disable");
TickTock 36:dbd39c315258 934 } else {
garygid 54:6ce808d0995e 935 sprintf(sTemp1,"Enable");
TickTock 36:dbd39c315258 936 }
garygid 54:6ce808d0995e 937 showButton(1,1,sTemp1,"Auto CP",4,4);
TickTock 48:d1ce92104a1f 938
TickTock 48:d1ce92104a1f 939 // add Enable/Disable Batt Log gg - yesBattLog
TickTock 48:d1ce92104a1f 940 if (yesBattLog) {
garygid 54:6ce808d0995e 941 sprintf(sTemp1,"Disable");
TickTock 48:d1ce92104a1f 942 } else {
garygid 54:6ce808d0995e 943 sprintf(sTemp1,"Enable");
TickTock 48:d1ce92104a1f 944 }
garygid 54:6ce808d0995e 945 showButton(2,1,sTemp1,"Batt Log",4,4);
garygid 87:46ac3f2519d6 946
garygid 87:46ac3f2519d6 947 // add Enable/Disable Debug - debugMode
garygid 87:46ac3f2519d6 948 if (debugMode) {
TickTock 131:0d926c080a65 949 sprintf(sTemp1," Disable");
garygid 87:46ac3f2519d6 950 } else {
TickTock 131:0d926c080a65 951 sprintf(sTemp1," Enable");
garygid 87:46ac3f2519d6 952 }
garygid 87:46ac3f2519d6 953 showButton(3,1,sTemp1," Debug",4,4);
leafman 98:9f8bab96edff 954
leafman 98:9f8bab96edff 955 if(metric)
leafman 98:9f8bab96edff 956 showButton(0,2,"Imperial","",4,4);
leafman 98:9f8bab96edff 957 else
leafman 98:9f8bab96edff 958 showButton(0,2,"Metric","",4,4);
leafman 98:9f8bab96edff 959
TickTock 131:0d926c080a65 960 showButton(1,2," Set"," Time",4,4);
TickTock 131:0d926c080a65 961 if (showHealth) {
TickTock 131:0d926c080a65 962 sprintf(sTemp1," Hide");
TickTock 131:0d926c080a65 963 } else {
TickTock 131:0d926c080a65 964 sprintf(sTemp1," Show");
TickTock 131:0d926c080a65 965 }
TickTock 131:0d926c080a65 966 showButton(2,2,sTemp1," Health",4,4);
leafman 98:9f8bab96edff 967 showButton(3,2,"Update","Firmware",4,4);
leafman 98:9f8bab96edff 968
TickTock 36:dbd39c315258 969 }
TickTock 36:dbd39c315258 970
TickTock 42:4533b13b297d 971 void pbScreen(bool force, bool showButtons){
TickTock 36:dbd39c315258 972 if (force) {
TickTock 36:dbd39c315258 973 tt.background(Black);
TickTock 36:dbd39c315258 974 tt.cls();
TickTock 36:dbd39c315258 975 }
TickTock 36:dbd39c315258 976 tt.foreground(Yellow);
TickTock 36:dbd39c315258 977 tt.background(DarkCyan);
TickTock 36:dbd39c315258 978 tt.set_font((unsigned char*) Arial12x12);
TickTock 36:dbd39c315258 979 if(playbackOpen){
garygid 54:6ce808d0995e 980 showButton(0,0,"Slower"," <--",4,4);
garygid 54:6ce808d0995e 981
TickTock 36:dbd39c315258 982 if(playbackEn){
garygid 54:6ce808d0995e 983 sprintf(sTemp1,"Pause");
TickTock 36:dbd39c315258 984 }else{
garygid 54:6ce808d0995e 985 sprintf(sTemp1," Run");
TickTock 36:dbd39c315258 986 }
garygid 54:6ce808d0995e 987 sprintf(sTemp2,"%4.3f ",playbackInt);
garygid 54:6ce808d0995e 988 showButton(1,0,sTemp1,sTemp2,4,4);
garygid 54:6ce808d0995e 989
garygid 54:6ce808d0995e 990 showButton(2,0,"Faster"," -->",4,4);
TickTock 36:dbd39c315258 991 }
TickTock 36:dbd39c315258 992 if(playbackOpen){
TickTock 36:dbd39c315258 993 sprintf(sTemp1," Stop");
TickTock 36:dbd39c315258 994 }else{
garygid 54:6ce808d0995e 995 sprintf(sTemp1,"Start");
TickTock 36:dbd39c315258 996 }
garygid 54:6ce808d0995e 997 showButton(1,1,sTemp1,"Playback",4,4);
TickTock 36:dbd39c315258 998 }
TickTock 36:dbd39c315258 999
TickTock 42:4533b13b297d 1000 void showDateTime(bool force, bool showButtons){
TickTock 36:dbd39c315258 1001 struct tm t; // pointer to a static tm structure
TickTock 36:dbd39c315258 1002 time_t seconds ;
TickTock 36:dbd39c315258 1003 tt.foreground(Yellow);
TickTock 44:6262a9fd1e56 1004 tt.background(Black);
TickTock 36:dbd39c315258 1005 if (force) {
TickTock 36:dbd39c315258 1006 tt.cls();
TickTock 36:dbd39c315258 1007 seconds = time(NULL);
TickTock 36:dbd39c315258 1008 t = *localtime(&seconds) ;
TickTock 36:dbd39c315258 1009
TickTock 36:dbd39c315258 1010 tt.locate(10,10);
TickTock 43:e7f6f80590e3 1011 tt.set_font((unsigned char*) Arial12x12);
TickTock 36:dbd39c315258 1012 strftime(sTemp1, 32, "%a %m/%d/%Y %X \n", &t);
TickTock 36:dbd39c315258 1013 printf("%s",sTemp1);
TickTock 122:138a40892a4c 1014 if(showButtons){
TickTock 36:dbd39c315258 1015 switch(dtMode){
TickTock 36:dbd39c315258 1016 case 0:
TickTock 36:dbd39c315258 1017 sprintf(sTemp1,"Year");
TickTock 36:dbd39c315258 1018 break;
TickTock 36:dbd39c315258 1019 case 1:
TickTock 36:dbd39c315258 1020 sprintf(sTemp1,"Month");
TickTock 36:dbd39c315258 1021 break;
TickTock 36:dbd39c315258 1022 case 2:
TickTock 36:dbd39c315258 1023 sprintf(sTemp1,"Day");
TickTock 36:dbd39c315258 1024 break;
TickTock 36:dbd39c315258 1025 case 3:
TickTock 36:dbd39c315258 1026 sprintf(sTemp1,"Hour");
TickTock 36:dbd39c315258 1027 break;
TickTock 36:dbd39c315258 1028 case 4:
TickTock 36:dbd39c315258 1029 sprintf(sTemp1,"Minute");
TickTock 36:dbd39c315258 1030 break;
TickTock 36:dbd39c315258 1031 case 5:
TickTock 36:dbd39c315258 1032 sprintf(sTemp1,"Second");
TickTock 36:dbd39c315258 1033 break;
TickTock 36:dbd39c315258 1034 default:
TickTock 36:dbd39c315258 1035 break;
TickTock 36:dbd39c315258 1036 }
TickTock 44:6262a9fd1e56 1037 tt.background(DarkCyan);
TickTock 66:b7476ce7a59e 1038 showButton(0,1,sTemp1,"",4,4);
garygid 54:6ce808d0995e 1039 showButton(1,1," UP","",4,4);
garygid 54:6ce808d0995e 1040 showButton(2,1," DOWN","",4,4);
TickTock 36:dbd39c315258 1041 }
TickTock 36:dbd39c315258 1042 }
TickTock 36:dbd39c315258 1043 }
TickTock 36:dbd39c315258 1044
TickTock 50:83d5864c64a0 1045 void dteDisplay(bool force, bool showButtons, bool showMiles){
TickTock 66:b7476ce7a59e 1046 unsigned short i,x,y,lx,ly,gids,radius,color,r,t;
TickTock 79:68f0dd8d1f19 1047 unsigned char toVal;
TickTock 50:83d5864c64a0 1048 static unsigned short lgids=0;
TickTock 50:83d5864c64a0 1049 static unsigned char leff[39]={0};
TickTock 50:83d5864c64a0 1050 CANMessage msg;
TickTock 66:b7476ce7a59e 1051 unsigned long targetBraking, regenBraking, temp;
TickTock 73:62ee8eae3a84 1052 static unsigned long maxTarget = 1000, maxRegen = 1000, tardivreg_x1000 = 1000;
TickTock 66:b7476ce7a59e 1053 static unsigned char lr=0, lt=0;
TickTock 50:83d5864c64a0 1054
TickTock 50:83d5864c64a0 1055 msg = lastMsg[indexLastMsg[0x5bc]]; //Get gids
TickTock 50:83d5864c64a0 1056 gids = (msg.data[0]<<2)+(msg.data[1]>>6);
TickTock 50:83d5864c64a0 1057 if(gids==0){
TickTock 83:52b1f330a62d 1058 gids=281; // Display new, fully charged capacity until real data obtained
TickTock 50:83d5864c64a0 1059 }
TickTock 50:83d5864c64a0 1060
TickTock 37:fea2c1d52c5f 1061 tt.background(Navy);
TickTock 49:a3d2c5bb3cfa 1062 tt.foreground(Yellow);
TickTock 52:d5385fbf4ea1 1063 if(force){
TickTock 97:a25940fd7b5b 1064 tt.set_font((unsigned char*) Arial12x12);
TickTock 52:d5385fbf4ea1 1065 tt.cls();
TickTock 49:a3d2c5bb3cfa 1066 x=50+0*6;
TickTock 52:d5385fbf4ea1 1067 tt.locate(x-10,226);
TickTock 49:a3d2c5bb3cfa 1068 printf("sec\n");
TickTock 50:83d5864c64a0 1069 tt.line(x,10,x,220,DarkGrey);
TickTock 49:a3d2c5bb3cfa 1070 x=50+9*6;
TickTock 52:d5385fbf4ea1 1071 tt.locate(x-10,226);
TickTock 49:a3d2c5bb3cfa 1072 printf("min\n");
TickTock 50:83d5864c64a0 1073 tt.line(x,10,x,220,DarkGrey);
TickTock 49:a3d2c5bb3cfa 1074 x=50+18*6;
TickTock 52:d5385fbf4ea1 1075 tt.locate(x-10,226);
TickTock 49:a3d2c5bb3cfa 1076 printf("hour\n");
TickTock 83:52b1f330a62d 1077 tt.line(x,10,x,220,DarkGrey);
TickTock 49:a3d2c5bb3cfa 1078 x=50+25*6;
TickTock 52:d5385fbf4ea1 1079 tt.locate(x-10,226);
TickTock 49:a3d2c5bb3cfa 1080 printf("day\n");
TickTock 50:83d5864c64a0 1081 tt.line(x,10,x,220,DarkGrey);
TickTock 49:a3d2c5bb3cfa 1082 x=50+32*6;
TickTock 52:d5385fbf4ea1 1083 tt.locate(x-10,226);
TickTock 49:a3d2c5bb3cfa 1084 printf("mon\n");
TickTock 50:83d5864c64a0 1085 tt.line(x,10,x,220,DarkGrey);
TickTock 49:a3d2c5bb3cfa 1086 x=50+38*6;
TickTock 66:b7476ce7a59e 1087 //tt.locate(x-10,226);
TickTock 66:b7476ce7a59e 1088 //printf("year\n");
TickTock 66:b7476ce7a59e 1089 //tt.line(x,10,x,220,DarkGrey);
TickTock 97:a25940fd7b5b 1090 toVal=33;
TickTock 83:52b1f330a62d 1091 } else {
TickTock 97:a25940fd7b5b 1092 toVal=24;// no need to constantly update the long tc values
TickTock 50:83d5864c64a0 1093 }
TickTock 83:52b1f330a62d 1094 if(force||lgids!=gids){ // update Y axis when kWh changes
TickTock 97:a25940fd7b5b 1095 //tt.set_font((unsigned char*) Arial12x12);
TickTock 97:a25940fd7b5b 1096 tt.set_font((unsigned char*) Arial24x23);
TickTock 97:a25940fd7b5b 1097 //for(i=0;i<10;i++){
TickTock 97:a25940fd7b5b 1098 //y=200-i*20;
TickTock 131:0d926c080a65 1099 for(i=2;i<7;i++){
TickTock 131:0d926c080a65 1100 y=200-(i-2)*40;
TickTock 97:a25940fd7b5b 1101 tt.locate(0,y-8);
TickTock 83:52b1f330a62d 1102 if (showMiles){
leafman 98:9f8bab96edff 1103 printf("%3.0f\n",convertDistance(i*((float)(gids-5)*.075))); // LM - Added metric support
TickTock 99:c05abf8e1cdc 1104 //printf("%2.0f \n",i*((float)(gids-5)*.075));
TickTock 83:52b1f330a62d 1105 }else{
TickTock 83:52b1f330a62d 1106 printf("%d.0\n",i);
TickTock 50:83d5864c64a0 1107 }
TickTock 97:a25940fd7b5b 1108 tt.line(48,y,toVal*6+56,y,DarkGrey);
TickTock 83:52b1f330a62d 1109 }
TickTock 50:83d5864c64a0 1110 lgids=gids;
TickTock 50:83d5864c64a0 1111 }
TickTock 121:553faf139a20 1112 if(tock||force){
TickTock 131:0d926c080a65 1113 for(i=2;i<7;i++){
TickTock 131:0d926c080a65 1114 y=200-(i-2)*40;
TickTock 83:52b1f330a62d 1115 tt.line(40,y,158,y,DarkGrey);
TickTock 50:83d5864c64a0 1116 }
TickTock 50:83d5864c64a0 1117
TickTock 50:83d5864c64a0 1118 x=50+0*6;
TickTock 50:83d5864c64a0 1119 tt.line(x,10,x,220,DarkGrey);
TickTock 50:83d5864c64a0 1120 x=50+9*6;
TickTock 50:83d5864c64a0 1121 tt.line(x,10,x,220,DarkGrey);
TickTock 50:83d5864c64a0 1122 x=50+18*6;
TickTock 50:83d5864c64a0 1123 tt.line(x,10,x,220,DarkGrey);
TickTock 83:52b1f330a62d 1124 //x=50+25*6;
TickTock 83:52b1f330a62d 1125 //tt.line(x,60,x,220,DarkGrey);
TickTock 83:52b1f330a62d 1126 //x=50+32*6;
TickTock 83:52b1f330a62d 1127 //tt.line(x,60,x,220,DarkGrey);
TickTock 66:b7476ce7a59e 1128 //x=50+38*6;
TickTock 66:b7476ce7a59e 1129 //tt.line(x,60,x,220,DarkGrey);
TickTock 50:83d5864c64a0 1130 tt.set_font((unsigned char*) SCProSB31x55);
TickTock 50:83d5864c64a0 1131 tt.foreground(Green);
TickTock 50:83d5864c64a0 1132 if (showMiles){
TickTock 93:c2402e8cd0e2 1133 float miles = mpkWh[dtePeriod]*((float)(gids-5)*.075);
leafman 98:9f8bab96edff 1134 miles = convertDistance(miles); // LM - Metric support
TickTock 93:c2402e8cd0e2 1135 // Right justify
TickTock 94:c3a14b3975d6 1136 if (miles>99.9){ //space=18; num=31; . = 23
TickTock 94:c3a14b3975d6 1137 tt.locate(161,8);
TickTock 94:c3a14b3975d6 1138 printf("%4.1f\n",miles);
TickTock 93:c2402e8cd0e2 1139 } else if (miles>9.9){
TickTock 94:c3a14b3975d6 1140 tt.locate(156,8);
TickTock 94:c3a14b3975d6 1141 printf(" %3.1f\n",miles);
TickTock 93:c2402e8cd0e2 1142 } else {
TickTock 94:c3a14b3975d6 1143 tt.locate(151,8);
TickTock 94:c3a14b3975d6 1144 printf(" %2.1f\n",miles);
TickTock 93:c2402e8cd0e2 1145 }
TickTock 97:a25940fd7b5b 1146 tt.foreground(Cyan);
TickTock 97:a25940fd7b5b 1147 tt.set_font((unsigned char*) Arial24x23);
TickTock 97:a25940fd7b5b 1148 tt.locate(198,70);
TickTock 97:a25940fd7b5b 1149 printf("%3.1f \n",mpkWh[dtePeriod]);
TickTock 50:83d5864c64a0 1150 } else {
TickTock 97:a25940fd7b5b 1151 tt.locate(200,10);
TickTock 66:b7476ce7a59e 1152 printf("%3.1f \n",mpkWh[dtePeriod]);
TickTock 50:83d5864c64a0 1153 }
TickTock 49:a3d2c5bb3cfa 1154 lx=50;
TickTock 97:a25940fd7b5b 1155 ly=mpkWh[0]*40;
TickTock 50:83d5864c64a0 1156 if(dtePeriod==0){
TickTock 52:d5385fbf4ea1 1157 radius=6;
TickTock 79:68f0dd8d1f19 1158 color=Yellow;
TickTock 50:83d5864c64a0 1159 }else{
TickTock 50:83d5864c64a0 1160 radius=2;
TickTock 50:83d5864c64a0 1161 color=Green;
TickTock 50:83d5864c64a0 1162 }
TickTock 131:0d926c080a65 1163 if(ly<60){
TickTock 97:a25940fd7b5b 1164 ly=220;
TickTock 97:a25940fd7b5b 1165 color=Red;
TickTock 131:0d926c080a65 1166 }else if(ly<280) {
TickTock 131:0d926c080a65 1167 ly=280-ly;
TickTock 97:a25940fd7b5b 1168 }else{
TickTock 97:a25940fd7b5b 1169 ly=0;
TickTock 97:a25940fd7b5b 1170 }
TickTock 50:83d5864c64a0 1171 tt.fillcircle(lx,leff[0],radius,Navy);
TickTock 50:83d5864c64a0 1172 tt.fillcircle(lx,ly,radius,color);
TickTock 49:a3d2c5bb3cfa 1173
TickTock 79:68f0dd8d1f19 1174 for(i=1;i<toVal;i++){
TickTock 49:a3d2c5bb3cfa 1175 x=50+i*6;
TickTock 97:a25940fd7b5b 1176 y=mpkWh[i]*40;
TickTock 50:83d5864c64a0 1177 if(i==dtePeriod){
TickTock 79:68f0dd8d1f19 1178 radius=6;
TickTock 79:68f0dd8d1f19 1179 color=Yellow;
TickTock 50:83d5864c64a0 1180 }else{
TickTock 50:83d5864c64a0 1181 radius=2;
TickTock 50:83d5864c64a0 1182 color=Green;
TickTock 50:83d5864c64a0 1183 }
TickTock 131:0d926c080a65 1184 if(y<60){
TickTock 97:a25940fd7b5b 1185 y=220;
TickTock 97:a25940fd7b5b 1186 color=Red;
TickTock 131:0d926c080a65 1187 }else if(y<280) {
TickTock 131:0d926c080a65 1188 y=280-y;
TickTock 97:a25940fd7b5b 1189 }else{
TickTock 97:a25940fd7b5b 1190 y=0;
TickTock 97:a25940fd7b5b 1191 }
TickTock 50:83d5864c64a0 1192 tt.fillcircle(x,leff[i],radius,Navy);
TickTock 50:83d5864c64a0 1193 tt.line(x-6,leff[i-1],x,leff[i],Navy);
TickTock 50:83d5864c64a0 1194 leff[i-1]=ly;
TickTock 52:d5385fbf4ea1 1195 if(y>0){
TickTock 52:d5385fbf4ea1 1196 tt.fillcircle(x,y,radius,color);
TickTock 52:d5385fbf4ea1 1197 }
TickTock 49:a3d2c5bb3cfa 1198 tt.line(lx,ly,x,y,White);
TickTock 49:a3d2c5bb3cfa 1199 lx=x;
TickTock 49:a3d2c5bb3cfa 1200 ly=y;
TickTock 49:a3d2c5bb3cfa 1201 }
TickTock 50:83d5864c64a0 1202 leff[i-1]=y;
TickTock 37:fea2c1d52c5f 1203 }
TickTock 66:b7476ce7a59e 1204
TickTock 66:b7476ce7a59e 1205 msg = lastMsg[indexLastMsg[0x1cb]]; //Get Target and Regen
TickTock 66:b7476ce7a59e 1206 regenBraking = (msg.data[0]<<3)+(msg.data[1]>>5);
TickTock 66:b7476ce7a59e 1207 targetBraking = (msg.data[2]<<3)+(msg.data[3]>>5);
TickTock 113:f388b4505463 1208 msg = lastMsg[indexLastMsg[0x421]]; //Get Drive Mode
TickTock 113:f388b4505463 1209 if (msg.data[0]==0x18) { // In Neutral
TickTock 108:29b5a760adc2 1210 regenBraking = 0; // No regen when in Neutral
TickTock 108:29b5a760adc2 1211 }
TickTock 73:62ee8eae3a84 1212
TickTock 73:62ee8eae3a84 1213 if (targetBraking<2045){
TickTock 73:62ee8eae3a84 1214 if ((targetBraking>50)&&(regenBraking>50)){
TickTock 73:62ee8eae3a84 1215 temp = targetBraking;
TickTock 73:62ee8eae3a84 1216 temp *= 1000;
TickTock 73:62ee8eae3a84 1217 temp /= regenBraking;
TickTock 73:62ee8eae3a84 1218 if (temp<tardivreg_x1000) tardivreg_x1000=temp;
TickTock 73:62ee8eae3a84 1219 }
TickTock 73:62ee8eae3a84 1220 if (targetBraking>maxTarget) maxTarget=targetBraking;
TickTock 73:62ee8eae3a84 1221 if (regenBraking>maxRegen) maxRegen=regenBraking;
TickTock 73:62ee8eae3a84 1222
TickTock 66:b7476ce7a59e 1223 temp = targetBraking;
TickTock 73:62ee8eae3a84 1224 temp *=200;
TickTock 73:62ee8eae3a84 1225 temp /= maxTarget;
TickTock 73:62ee8eae3a84 1226 t = (char) temp;
TickTock 73:62ee8eae3a84 1227 if (t>175) t=175;
TickTock 73:62ee8eae3a84 1228 temp = regenBraking;
TickTock 73:62ee8eae3a84 1229 temp *= tardivreg_x1000;
TickTock 73:62ee8eae3a84 1230 temp /= maxTarget;
TickTock 73:62ee8eae3a84 1231 temp /= 5; // 1000/200=5
TickTock 73:62ee8eae3a84 1232 r = (char) temp;
TickTock 73:62ee8eae3a84 1233 if (r>175) r=175;
TickTock 73:62ee8eae3a84 1234 if (r>t) t=r; //Should never happen
TickTock 73:62ee8eae3a84 1235 if(lr!=r||lt!=t){
TickTock 73:62ee8eae3a84 1236 tt.fillrect(264,64,310,239-t,Navy);
TickTock 73:62ee8eae3a84 1237 tt.fillrect(264,239-t,310,239-r,Red);
TickTock 73:62ee8eae3a84 1238 tt.fillrect(264,239-r,310,239,Green);
TickTock 73:62ee8eae3a84 1239 }
TickTock 73:62ee8eae3a84 1240 lt=t;
TickTock 73:62ee8eae3a84 1241 lr=r;
TickTock 66:b7476ce7a59e 1242 }
TickTock 37:fea2c1d52c5f 1243 }
TickTock 37:fea2c1d52c5f 1244
TickTock 36:dbd39c315258 1245 void updateDisplay(char display){
TickTock 122:138a40892a4c 1246 bool changed,showButtons;
TickTock 36:dbd39c315258 1247 changed = dMode[display]!=lastDMode[display];
TickTock 122:138a40892a4c 1248 showButtons = (display==whichTouched)&&(sMode==1);
TickTock 36:dbd39c315258 1249 tt.set_display(display);
TickTock 36:dbd39c315258 1250 switch (dMode[display]) {
TickTock 36:dbd39c315258 1251 case logScreen:
TickTock 122:138a40892a4c 1252 printLog(changed,showButtons);
TickTock 36:dbd39c315258 1253 break;
TickTock 41:8d4609ea7259 1254 case mainScreen:
TickTock 122:138a40892a4c 1255 mainDisplay(changed,showButtons);
TickTock 36:dbd39c315258 1256 break;
TickTock 36:dbd39c315258 1257 case brakeScreen:
TickTock 122:138a40892a4c 1258 braking(changed,showButtons);
TickTock 36:dbd39c315258 1259 break;
TickTock 41:8d4609ea7259 1260 case dteScreen:
TickTock 122:138a40892a4c 1261 dteDisplay(changed,showButtons,true);
TickTock 37:fea2c1d52c5f 1262 break;
TickTock 50:83d5864c64a0 1263 case effScreen:
TickTock 122:138a40892a4c 1264 dteDisplay(changed,showButtons,false);
TickTock 50:83d5864c64a0 1265 break;
TickTock 50:83d5864c64a0 1266 case monitorScreen:
TickTock 122:138a40892a4c 1267 printLast(changed,showButtons);
TickTock 36:dbd39c315258 1268 break;
TickTock 36:dbd39c315258 1269 case changedScreen:
TickTock 122:138a40892a4c 1270 printChanged(changed,showButtons);
TickTock 36:dbd39c315258 1271 break;
TickTock 36:dbd39c315258 1272 case cpScreen:
TickTock 122:138a40892a4c 1273 cpData(changed||showCP,showButtons);
TickTock 36:dbd39c315258 1274 break;
leafman 98:9f8bab96edff 1275 case configScreen:
TickTock 122:138a40892a4c 1276 config(changed,showButtons);
TickTock 36:dbd39c315258 1277 break;
TickTock 38:155ec32c5e91 1278 case playbackScreen:
TickTock 122:138a40892a4c 1279 pbScreen(changed,showButtons);
TickTock 36:dbd39c315258 1280 break;
TickTock 36:dbd39c315258 1281 case dateScreen:
TickTock 122:138a40892a4c 1282 showDateTime(changed,showButtons);
TickTock 36:dbd39c315258 1283 break;
TickTock 44:6262a9fd1e56 1284 case cpHistScreen: // gg - hist
TickTock 122:138a40892a4c 1285 cpHistogram(changed||showCP,showButtons);
TickTock 44:6262a9fd1e56 1286 break;
TickTock 48:d1ce92104a1f 1287 case cpBarScreen: // gg - cpbars
TickTock 122:138a40892a4c 1288 cpBarPlot(changed||showCP,showButtons);
TickTock 48:d1ce92104a1f 1289 break;
garygid 67:2022fce701d0 1290 case indexScreen:
TickTock 122:138a40892a4c 1291 showIndex(changed,showButtons);
garygid 67:2022fce701d0 1292 break;
TickTock 107:e9be732c1ad4 1293 case tripScreen:
TickTock 122:138a40892a4c 1294 tripDisplay(changed,showButtons);
TickTock 107:e9be732c1ad4 1295 break;
TickTock 118:02010b18efdc 1296 case healthScreen:
TickTock 122:138a40892a4c 1297 healthDisplay(changed,showButtons);
garygid 67:2022fce701d0 1298 break;
TickTock 36:dbd39c315258 1299 default:
TickTock 43:e7f6f80590e3 1300 if (changed){
TickTock 43:e7f6f80590e3 1301 tt.background(Black);
TickTock 43:e7f6f80590e3 1302 tt.cls();
TickTock 43:e7f6f80590e3 1303 }
TickTock 36:dbd39c315258 1304 break;
TickTock 36:dbd39c315258 1305 }
TickTock 36:dbd39c315258 1306 lastDMode[display]=dMode[display];
TickTock 36:dbd39c315258 1307
TickTock 42:4533b13b297d 1308 if(display==whichTouched){
TickTock 42:4533b13b297d 1309 switch (sMode) {
TickTock 42:4533b13b297d 1310 case 1: // Select screens
TickTock 42:4533b13b297d 1311 tt.foreground(Yellow);
TickTock 42:4533b13b297d 1312 tt.background(DarkCyan);
garygid 54:6ce808d0995e 1313 tt.set_font((unsigned char*) Arial12x12);
garygid 54:6ce808d0995e 1314
garygid 54:6ce808d0995e 1315 showButton(0,tNavRow," <-Prev","",4,4); // gg - 4x4
garygid 67:2022fce701d0 1316 // col 1 see below
garygid 67:2022fce701d0 1317 showButton(2,tNavRow," Go To"," Index",4,4); // gg - index
garygid 54:6ce808d0995e 1318 showButton(3,tNavRow," Next->","",4,4); // gg - move next
garygid 54:6ce808d0995e 1319
garygid 67:2022fce701d0 1320 // col 1 in Nav row
TickTock 42:4533b13b297d 1321 switch (dMode[display]) {
TickTock 44:6262a9fd1e56 1322 case offScreen:
garygid 54:6ce808d0995e 1323 sprintf(sTemp2," Off");
TickTock 42:4533b13b297d 1324 break;
TickTock 44:6262a9fd1e56 1325 case logScreen:
garygid 54:6ce808d0995e 1326 sprintf(sTemp2," Log");
TickTock 42:4533b13b297d 1327 break;
TickTock 44:6262a9fd1e56 1328 case mainScreen:
garygid 54:6ce808d0995e 1329 sprintf(sTemp2," Main");
TickTock 42:4533b13b297d 1330 break;
TickTock 44:6262a9fd1e56 1331 case brakeScreen:
garygid 54:6ce808d0995e 1332 sprintf(sTemp2,"Braking");
TickTock 42:4533b13b297d 1333 break;
TickTock 44:6262a9fd1e56 1334 case dteScreen:
garygid 54:6ce808d0995e 1335 sprintf(sTemp2," DTE");
TickTock 42:4533b13b297d 1336 break;
TickTock 50:83d5864c64a0 1337 case effScreen:
garygid 54:6ce808d0995e 1338 sprintf(sTemp2," Eff");
TickTock 50:83d5864c64a0 1339 break;
TickTock 44:6262a9fd1e56 1340 case monitorScreen:
garygid 54:6ce808d0995e 1341 sprintf(sTemp2," Monitor");
TickTock 42:4533b13b297d 1342 break;
TickTock 44:6262a9fd1e56 1343 case changedScreen:
garygid 54:6ce808d0995e 1344 sprintf(sTemp2,"DeltaMon");
TickTock 42:4533b13b297d 1345 break;
TickTock 44:6262a9fd1e56 1346 case cpScreen:
garygid 67:2022fce701d0 1347 sprintf(sTemp2,"CP Data");
TickTock 42:4533b13b297d 1348 break;
leafman 98:9f8bab96edff 1349 case configScreen:
garygid 54:6ce808d0995e 1350 sprintf(sTemp2," Config");
leafman 98:9f8bab96edff 1351 break;
TickTock 44:6262a9fd1e56 1352 case playbackScreen:
garygid 54:6ce808d0995e 1353 sprintf(sTemp2,"Playback");
TickTock 42:4533b13b297d 1354 break;
TickTock 44:6262a9fd1e56 1355 case dateScreen:
garygid 54:6ce808d0995e 1356 sprintf(sTemp2,"Set Time");
TickTock 42:4533b13b297d 1357 break;
TickTock 44:6262a9fd1e56 1358 case cpHistScreen: // gg - hist
garygid 54:6ce808d0995e 1359 sprintf(sTemp2,"CP Hist");
TickTock 44:6262a9fd1e56 1360 break;
TickTock 48:d1ce92104a1f 1361 case cpBarScreen: // gg - cpbars
garygid 54:6ce808d0995e 1362 sprintf(sTemp2,"CP Bars");
TickTock 48:d1ce92104a1f 1363 break;
TickTock 107:e9be732c1ad4 1364 case tripScreen:
TickTock 107:e9be732c1ad4 1365 sprintf(sTemp2," Trip");
TickTock 107:e9be732c1ad4 1366 break;
TickTock 118:02010b18efdc 1367 case healthScreen:
TickTock 118:02010b18efdc 1368 sprintf(sTemp2,"Health");
TickTock 118:02010b18efdc 1369 break;
garygid 67:2022fce701d0 1370 case indexScreen: // gg - index
garygid 67:2022fce701d0 1371 sprintf(sTemp2," Index");
garygid 67:2022fce701d0 1372 break;
TickTock 42:4533b13b297d 1373 }
garygid 54:6ce808d0995e 1374 showButton(1,tNavRow," Select",sTemp2,4,4);
garygid 54:6ce808d0995e 1375
TickTock 42:4533b13b297d 1376 wait_ms(100); // pause a moment to reduce flicker
TickTock 42:4533b13b297d 1377 break;
garygid 54:6ce808d0995e 1378
TickTock 42:4533b13b297d 1379 case 2: // numpad
TickTock 42:4533b13b297d 1380 tt.foreground(Yellow);
TickTock 42:4533b13b297d 1381 tt.background(DarkCyan);
TickTock 42:4533b13b297d 1382 tt.set_font((unsigned char*) Arial24x23);
garygid 54:6ce808d0995e 1383
garygid 54:6ce808d0995e 1384 sprintf(sTemp2,"");
garygid 54:6ce808d0995e 1385 showButton(0,0," 1",sTemp2,4,4);
garygid 54:6ce808d0995e 1386 showButton(1,0," 2",sTemp2,4,4);
garygid 54:6ce808d0995e 1387 showButton(2,0," 3",sTemp2,4,4);
garygid 54:6ce808d0995e 1388 showButton(0,1," 4",sTemp2,4,4);
garygid 54:6ce808d0995e 1389 showButton(1,1," 5",sTemp2,4,4);
garygid 54:6ce808d0995e 1390 showButton(2,1," 6",sTemp2,4,4);
garygid 54:6ce808d0995e 1391 showButton(0,2," 7",sTemp2,4,4);
garygid 54:6ce808d0995e 1392 showButton(1,2," 8",sTemp2,4,4);
garygid 54:6ce808d0995e 1393 showButton(2,2," 9",sTemp2,4,4);
garygid 54:6ce808d0995e 1394 showButton(1,3," 0",sTemp2,4,4);
garygid 54:6ce808d0995e 1395
garygid 54:6ce808d0995e 1396 showButton(0,3,"<--",sTemp2,4,4);
garygid 54:6ce808d0995e 1397 showButton(2,3,"-->",sTemp2,4,4);
garygid 54:6ce808d0995e 1398 showButton(3,3,"return",sTemp2,4,4);
TickTock 42:4533b13b297d 1399 case 3:
TickTock 42:4533b13b297d 1400 break;
TickTock 42:4533b13b297d 1401 default:
TickTock 42:4533b13b297d 1402 break;
TickTock 42:4533b13b297d 1403 }
TickTock 36:dbd39c315258 1404 }
TickTock 121:553faf139a20 1405 tock=false;
TickTock 121:553faf139a20 1406 } // updateDisplay
TickTock 36:dbd39c315258 1407
garygid 58:4d06288d75a2 1408 //---------------------
garygid 58:4d06288d75a2 1409 // gg - highlight
TickTock 62:ffd15edb5431 1410 void highlightButton(unsigned char column, unsigned char row, unsigned char tScn, unsigned char columns, unsigned char rows){
TickTock 62:ffd15edb5431 1411
garygid 58:4d06288d75a2 1412 unsigned short x1,x2,y1,y2;
garygid 58:4d06288d75a2 1413
garygid 58:4d06288d75a2 1414 x1=column*(320/columns)+btnGap/2;
garygid 58:4d06288d75a2 1415 x2=(column+1)*(320/columns)-btnGap/2;
garygid 58:4d06288d75a2 1416 y1=row*(240/rows)+btnGap/2;
garygid 58:4d06288d75a2 1417 y2=(row+1)*(240/rows)-btnGap/2;
garygid 65:821fc79cd7fe 1418
garygid 65:821fc79cd7fe 1419 tt.set_display(tScn);
garygid 65:821fc79cd7fe 1420
garygid 65:821fc79cd7fe 1421 if( skin == ggSkin ){
garygid 65:821fc79cd7fe 1422 // paint the whole button box, for a better visual effect
garygid 65:821fc79cd7fe 1423 // especially on a screen with a yellow background
garygid 65:821fc79cd7fe 1424 if( tScn == 0 )
garygid 65:821fc79cd7fe 1425 tt.fillrect(x1,y1,x2,y2,White); // DarkCyan);
garygid 65:821fc79cd7fe 1426 else
garygid 65:821fc79cd7fe 1427 tt.fillrect(x1,y1,x2,y2,Green); // DarkCyan);
TickTock 66:b7476ce7a59e 1428 } else {
TickTock 66:b7476ce7a59e 1429 tt.fillrect(x1,y1,x2,y2,Green); // DarkCyan);
garygid 65:821fc79cd7fe 1430 }
garygid 58:4d06288d75a2 1431
garygid 58:4d06288d75a2 1432 // paint the outer pixel as a yellow frame
garygid 58:4d06288d75a2 1433 tt.rect(x1,y1,x2,y2,Yellow) ; // DarkCyan);
garygid 58:4d06288d75a2 1434 }
garygid 58:4d06288d75a2 1435
garygid 58:4d06288d75a2 1436 //---------------------
TickTock 36:dbd39c315258 1437 void showButton(unsigned char column, unsigned char row, char * text1, char * text2, unsigned char columns, unsigned char rows){
TickTock 36:dbd39c315258 1438 unsigned short x1,x2,y1,y2;
garygid 54:6ce808d0995e 1439
TickTock 36:dbd39c315258 1440 x1=column*(320/columns)+btnGap/2;
TickTock 36:dbd39c315258 1441 x2=(column+1)*(320/columns)-btnGap/2;
TickTock 36:dbd39c315258 1442 y1=row*(240/rows)+btnGap/2;
TickTock 36:dbd39c315258 1443 y2=(row+1)*(240/rows)-btnGap/2;
TickTock 36:dbd39c315258 1444 tt.fillrect(x1,y1,x2,y2,DarkCyan);
garygid 54:6ce808d0995e 1445
garygid 54:6ce808d0995e 1446 // adapt formatting of text to the smaller 4x4 box
garygid 54:6ce808d0995e 1447 tt.locate(x1+btnGap/2,y1+btnGap); // gg - 4x4
TickTock 36:dbd39c315258 1448 printf("%s\n",text1);
garygid 54:6ce808d0995e 1449
garygid 54:6ce808d0995e 1450 tt.locate(x1+btnGap/2,y1+btnGap+20);
TickTock 36:dbd39c315258 1451 printf("%s\n",text2);
TickTock 36:dbd39c315258 1452 }
garygid 54:6ce808d0995e 1453
TickTock 13:62e0f7f39ff5 1454
leafman 98:9f8bab96edff 1455 //The temps are stored as metric, distances as imperial... I'm assuming the input based on that - LM
leafman 98:9f8bab96edff 1456 float convertTemperature(float input)
leafman 98:9f8bab96edff 1457 {
leafman 98:9f8bab96edff 1458 if (!metric) {
leafman 98:9f8bab96edff 1459 //convert!
leafman 98:9f8bab96edff 1460 float output = input *1.8f;
leafman 98:9f8bab96edff 1461 output += 32.0f;
leafman 98:9f8bab96edff 1462 return output;
TickTock 23:cd03f9c3395e 1463 }
leafman 98:9f8bab96edff 1464 return input;
leafman 98:9f8bab96edff 1465 }
leafman 98:9f8bab96edff 1466 float convertDistance(float input)
leafman 98:9f8bab96edff 1467 {
leafman 98:9f8bab96edff 1468 if (metric) {
leafman 98:9f8bab96edff 1469 return input / 0.62137f;
TickTock 13:62e0f7f39ff5 1470 }
leafman 98:9f8bab96edff 1471 return input;
leafman 98:9f8bab96edff 1472 }
leafman 98:9f8bab96edff 1473 char* distanceUnit()
leafman 98:9f8bab96edff 1474 {
leafman 98:9f8bab96edff 1475 if(metric)
leafman 98:9f8bab96edff 1476 return "km";
leafman 98:9f8bab96edff 1477 return "mi";
leafman 98:9f8bab96edff 1478 }
leafman 98:9f8bab96edff 1479 char* temperatureUnit()
leafman 98:9f8bab96edff 1480 {
leafman 98:9f8bab96edff 1481 if(metric)
leafman 98:9f8bab96edff 1482 return "C";
leafman 98:9f8bab96edff 1483 return "F";
leafman 98:9f8bab96edff 1484 }