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:
Fri Jul 19 12:48:10 2013 +0000
Branch:
Metric
Revision:
123:a8c0042df617
Parent:
122:138a40892a4c
Child:
124:0d622967b764
First attempt to add tire pressure

Who changed what in which revision?

UserRevisionLine numberNew contents of line
TickTock 13:62e0f7f39ff5 1 // main.cpp
TickTock 108:29b5a760adc2 2 //
TickTock 4:8d7759f4fe7a 3 //To Do:
TickTock 33:a277743ebdeb 4 // * Audible friction brake feedback
TickTock 33:a277743ebdeb 5 // * User-configurable watchpoint
TickTock 33:a277743ebdeb 6 // * Add 50% charge option
TickTock 33:a277743ebdeb 7 // * Tire Pressure Sensor display
TickTock 77:7c136766466c 8 // * Fix bug in playback while connected to canbus (hangs)
TickTock 102:fd19f777a0b4 9 // * Add coasting regen to regen/braking display
TickTock 103:1389e9efe8c3 10 // * Change semilog efficiency graph to linear with 10 minute values
TickTock 102:fd19f777a0b4 11 // * Add additional 79b bank readouts
TickTock 102:fd19f777a0b4 12 // * Add ability to transfer settings config file to/from USB
TickTock 123:a8c0042df617 13 // * Is CAN/EV designator reversed in canlog?
TickTock 13:62e0f7f39ff5 14
TickTock 12:8e42d7ba8468 15 #include "mbed.h"
TickTock 12:8e42d7ba8468 16 #include "CAN.h"
TickTock 12:8e42d7ba8468 17 #include "beep.h"
TickTock 109:3e6f0e8fca0d 18 #include "ff.h"
TickTock 12:8e42d7ba8468 19 #include "PowerControl.h"
TickTock 12:8e42d7ba8468 20 #include "EthernetPowerControl.h"
TickTock 12:8e42d7ba8468 21 #include "utility.h"
TickTock 12:8e42d7ba8468 22 #include "displayModes.h"
TickTock 23:cd03f9c3395e 23 #include "TOUCH_TFTx2.h"
TickTock 4:8d7759f4fe7a 24
TickTock 123:a8c0042df617 25 char revStr[7] = "123"; // gg - revision string, max 6 characters
TickTock 110:ffddff3ad2f2 26
TickTock 109:3e6f0e8fca0d 27 FATFS USBdrive;
TickTock 13:62e0f7f39ff5 28 LocalFileSystem local("local");
TickTock 109:3e6f0e8fca0d 29 bool waitasec = true;
TickTock 115:549410af477d 30 unsigned char wait5secs = 5;
TickTock 13:62e0f7f39ff5 31 // to write to USB Flash Drives, or equivalent (SD card in Reader/Writer)
TickTock 119:0e2b641e98a2 32 // class10 SDcard in Reader/Writer recommended
TickTock 111:d1559bb25c43 33 FRESULT mfr = f_mount(0,&USBdrive);
TickTock 13:62e0f7f39ff5 34 time_t seconds ;
TickTock 13:62e0f7f39ff5 35
TickTock 36:dbd39c315258 36 Ticker autoPoll;
TickTock 36:dbd39c315258 37 Ticker playback;
TickTock 78:a383971fe02f 38 Ticker msgReq;
TickTock 13:62e0f7f39ff5 39 Timer timer;
TickTock 13:62e0f7f39ff5 40
TickTock 13:62e0f7f39ff5 41 DigitalOut led1(LED1);
TickTock 13:62e0f7f39ff5 42 DigitalOut led2(LED2);
TickTock 13:62e0f7f39ff5 43 DigitalOut led3(LED3);
TickTock 13:62e0f7f39ff5 44 DigitalOut led4(LED4);
TickTock 13:62e0f7f39ff5 45
TickTock 13:62e0f7f39ff5 46 InterruptIn touchpad(p17);
TickTock 13:62e0f7f39ff5 47 CAN can1(p9, p10); // CAN1 (EV) uses pins 9 and 10 (rx, tx) and pin 8 (rs)
TickTock 13:62e0f7f39ff5 48 DigitalOut can1SleepMode(p8); // Use pin 8 to control the sleep mode of can2
TickTock 13:62e0f7f39ff5 49 CAN can2(p30, p29); // CAN2 (CAR) uses pins 30 and 29 (rx, tx) and pin 28 (rs)
TickTock 13:62e0f7f39ff5 50 DigitalOut can2SleepMode(p28); // Use pin 28 to control the sleep mode of can1
TickTock 35:5acbd8a64a89 51 AnalogIn mon12V(p15);
TickTock 13:62e0f7f39ff5 52 TOUCH_TFTx2 tt(p16, p17, p19, p20, p11, p12, p13, p6, p7, p5, "TFT"); // x+,x-,y+,y-,mosi, miso, sclk, cs0, cs1, reset
TickTock 35:5acbd8a64a89 53 PwmOut dled(p23);
TickTock 35:5acbd8a64a89 54 Beep spkr(p21);
TickTock 13:62e0f7f39ff5 55
garygid 87:46ac3f2519d6 56 bool debugMode = false;
TickTock 108:29b5a760adc2 57 bool usbEn = false;
TickTock 108:29b5a760adc2 58 bool logEn = true;
TickTock 108:29b5a760adc2 59 bool logOpen = false;
TickTock 115:549410af477d 60 bool yesBattLog = true; // gg - Batt Log
TickTock 108:29b5a760adc2 61 unsigned char tNavRow = 3; // gg - 4x4 touch
garygid 54:6ce808d0995e 62
TickTock 109:3e6f0e8fca0d 63 FILE *hfile; // history file
TickTock 109:3e6f0e8fca0d 64 FIL efile; // external usb file
TickTock 109:3e6f0e8fca0d 65 FRESULT efr; // external file access flags
TickTock 109:3e6f0e8fca0d 66 unsigned int bytesRW;
TickTock 108:29b5a760adc2 67 char fileName[35] = "";
TickTock 84:fd21e5d32dab 68 char writeBuffer[maxBufLen][13] __attribute__ ((section("AHBSRAM1"))); // buffer for USB write
TickTock 13:62e0f7f39ff5 69 char indexLastMsg[0x800]={0}; // index table for last message
TickTock 13:62e0f7f39ff5 70 CANMessage lastMsg[100]; // table to store last message of eachtype
garygid 87:46ac3f2519d6 71
TickTock 123:a8c0042df617 72 unsigned char queryData[DataBufMax]={0}; // 7 * 0x3D = DataBufMax
garygid 87:46ac3f2519d6 73
TickTock 13:62e0f7f39ff5 74 unsigned char msgChanged[100]; // inidcates which bytes changed
TickTock 13:62e0f7f39ff5 75 char c;
TickTock 76:fb6779d0963e 76 volatile int writePointer = 0;
TickTock 76:fb6779d0963e 77 int readPointer=0;
TickTock 75:77bd26829dca 78 volatile unsigned short secsNoMsg = 0;
TickTock 75:77bd26829dca 79 volatile unsigned short secsNoTouch = 0;
TickTock 20:3bf176d14b14 80 volatile bool canIdle;
TickTock 20:3bf176d14b14 81 volatile bool userIdle;
TickTock 26:462ccb580472 82 bool touched=false; //flag to read touchscreen
TickTock 42:4533b13b297d 83 unsigned char whichTouched = 0;
TickTock 13:62e0f7f39ff5 84 char counter = 0;
TickTock 41:8d4609ea7259 85 unsigned char dMode[2] = {mainScreen,brakeScreen}; //display mode
TickTock 13:62e0f7f39ff5 86 unsigned char sMode = 0; // setup mode
TickTock 13:62e0f7f39ff5 87 unsigned char lastDMode[2] = {0,0}; //last screen mode
TickTock 25:ddf0ec209f03 88 unsigned char dtMode = 6;
TickTock 13:62e0f7f39ff5 89 char displayLog[20][40];
TickTock 13:62e0f7f39ff5 90 unsigned char displayLoc = 0;
leafman 98:9f8bab96edff 91 unsigned int fwCount=1;
TickTock 13:62e0f7f39ff5 92 unsigned char indexOffset = 1;
TickTock 13:62e0f7f39ff5 93 bool showCP = false;
TickTock 39:eef8beac7411 94 bool logCP = false; //Turbo3
TickTock 108:29b5a760adc2 95 bool logOnce = false;
TickTock 103:1389e9efe8c3 96 bool repeatPoll = true;
TickTock 34:4751a8259b18 97 bool headlights = false;
TickTock 34:4751a8259b18 98 bool tick = false;
garygid 69:6bfdfc002036 99 bool ZeroSecTick = false;
TickTock 35:5acbd8a64a89 100 float ledHi = 0.8; // Bright LED value (until config file read)
TickTock 35:5acbd8a64a89 101 float ledLo = 0.1; // Dim LED value (until config file read)
TickTock 35:5acbd8a64a89 102 unsigned short pollInt = 300; // polling interval=5 minutes (until config file read)
TickTock 35:5acbd8a64a89 103 bool accOn = false; // Accessories on
TickTock 49:a3d2c5bb3cfa 104 bool laccOn = false;
TickTock 35:5acbd8a64a89 105 float scale12V = 16.2; // R1:R2 ratio
TickTock 40:0e6e71a7323f 106 signed long mWs_x4 = 0;
TickTock 40:0e6e71a7323f 107 unsigned short numWsamples = 0;
TickTock 41:8d4609ea7259 108 unsigned short numSsamples = 0;
TickTock 35:5acbd8a64a89 109 float accV = 0;
TickTock 36:dbd39c315258 110 bool playbackEn = false;
TickTock 36:dbd39c315258 111 bool playbackOpen = false;
TickTock 117:49883c779a74 112 //float playbackInt = 0.05; //read messages every 50 ms
TickTock 78:a383971fe02f 113 float playbackInt = 0.005; //read messages every 5 ms
TickTock 36:dbd39c315258 114 bool step = false;
TickTock 37:fea2c1d52c5f 115 char header[5];
TickTock 36:dbd39c315258 116 char data[8];
TickTock 41:8d4609ea7259 117 signed long motorRPM;
garygid 65:821fc79cd7fe 118 unsigned char skin = ttSkin ;
TickTock 50:83d5864c64a0 119 unsigned char dtePeriod = 14; //ten minute averaging interval
TickTock 107:e9be732c1ad4 120 float kWh_trip[3]={0};
TickTock 107:e9be732c1ad4 121 float miles_trip[3]={0};
TickTock 49:a3d2c5bb3cfa 122 float mph[39]={0};
TickTock 49:a3d2c5bb3cfa 123 float kW[39]={0};
TickTock 49:a3d2c5bb3cfa 124 float mpkWh[39]={0};
TickTock 120:041edeec08f5 125 float unloadedV_x2,Resr,curRmax,curRmin,redRmax,redRmin,incRmax,incRmin;
TickTock 121:553faf139a20 126 signed short Imax, Imin;
TickTock 49:a3d2c5bb3cfa 127 // Logarithmic division scale (roughly - snapped to common units of time)
TickTock 49:a3d2c5bb3cfa 128 float timeConstant[39] = {1, 1.58, 2.51, 3.98, 6.31, 10, 15.8, 25.1, 39.8, 60, // 1 minute
TickTock 52:d5385fbf4ea1 129 60*1.58, 60*2.51, 60*3.98, 60*6.31, 60*10, 60*15.8, 60*25.1, 60*39.8, 60*60, // 1 hour
TickTock 52:d5385fbf4ea1 130 60*60*1.58, 60*60*2.51, 60*60*3.98, 60*60*6.31, 60*60*10, 60*60*15.8, 60*60*24, // 1 day
TickTock 52:d5385fbf4ea1 131 60*60*24*1.58, 60*60*24*2.51, 60*60*24*3.98, 60*60*24*6.31, 60*60*24*10, 60*60*24*15.8, 60*60*24*30, // 1 month
TickTock 52:d5385fbf4ea1 132 60*60*24*39.8, 60*60*24*63.1, 60*60*24*100, 60*60*24*158, 60*60*24*251, 60*60*24*365}; // 1 year
TickTock 121:553faf139a20 133 bool tock = false;
TickTock 73:62ee8eae3a84 134 unsigned short pointerSep;
TickTock 78:a383971fe02f 135 unsigned char reqMsgCnt = 99;
TickTock 102:fd19f777a0b4 136 unsigned long Ah_x10000 = 0;
TickTock 102:fd19f777a0b4 137 unsigned long SOC_x10000 = 0;
TickTock 102:fd19f777a0b4 138 unsigned short SOH_x100 = 0;
TickTock 108:29b5a760adc2 139 float maxTemp = 0;
leafman 98:9f8bab96edff 140 bool metric = false;
TickTock 121:553faf139a20 141 bool shunt[96]={0};
TickTock 121:553faf139a20 142 bool charging=false;
TickTock 123:a8c0042df617 143 bool reqRest=false;
TickTock 0:1596b8644523 144 int main() {
TickTock 120:041edeec08f5 145 //can1SleepMode.mode(OpenDrain);
TickTock 120:041edeec08f5 146 //can2SleepMode.mode(OpenDrain);
TickTock 4:8d7759f4fe7a 147 char sTemp[40];
TickTock 2:71b1999a8ea5 148 unsigned long secs;
TickTock 49:a3d2c5bb3cfa 149 unsigned char i,j,display=0,lwt=0;
TickTock 123:a8c0042df617 150 char reqData[8] = {0x30, 0x00, 0x18, 0xff, 0xff, 0xff, 0xff, 0xff};
TickTock 22:a43df3905863 151 point lastTouch;
TickTock 52:d5385fbf4ea1 152 float average;
TickTock 3:3e879b043bc5 153 tt.set_orientation(1);
TickTock 4:8d7759f4fe7a 154 tt.background(Black);
TickTock 19:d576298c46f3 155 tt.set_display(2); // select both displays
TickTock 3:3e879b043bc5 156 tt.cls();
TickTock 1:9dcd70c32180 157 tt.claim(stdout); // send stdout to the TFT display
TickTock 12:8e42d7ba8468 158 touchpad.rise(&touch_ISR);
TickTock 4:8d7759f4fe7a 159 tt.wfi(); // enable interrupt on touch
TickTock 7:17bf9ceaf0aa 160 dled = 0.8; // turn on display LED 80%
TickTock 120:041edeec08f5 161 Resr = 0.075; // initial guess of Resr
TickTock 2:71b1999a8ea5 162 timer.start() ;
TickTock 2:71b1999a8ea5 163 RTC_Init(); // start the RTC Interrupts that sync the timer
TickTock 1:9dcd70c32180 164 struct tm t; // pointer to a static tm structure
TickTock 93:c2402e8cd0e2 165 NVIC_SetPriority(CAN_IRQn, 2); //set can priority just below RTC
TickTock 117:49883c779a74 166 NVIC_SetPriority(TIMER3_IRQn, 3); //set ticker priority just below can
TickTock 117:49883c779a74 167
TickTock 1:9dcd70c32180 168 seconds = time(NULL);
TickTock 1:9dcd70c32180 169 t = *localtime(&seconds) ;
TickTock 1:9dcd70c32180 170 // is it a date before 2012 ?
TickTock 26:462ccb580472 171 if ((t.tm_year + 1900) < 2012 ) {
TickTock 26:462ccb580472 172 // before 2013 so update year to make date entry easier
TickTock 26:462ccb580472 173 t.tm_year = 2013 - 1900;
TickTock 1:9dcd70c32180 174 // set the RTC
TickTock 1:9dcd70c32180 175 set_time(mktime(&t));
TickTock 1:9dcd70c32180 176 seconds = time(NULL);
TickTock 26:462ccb580472 177 }
TickTock 20:3bf176d14b14 178 t = *localtime(&seconds) ;
TickTock 20:3bf176d14b14 179 strftime(sTemp, 32, "%a %m/%d/%Y %X\n", &t);
TickTock 93:c2402e8cd0e2 180 printMsg(sTemp); // record RTC
garygid 54:6ce808d0995e 181
TickTock 62:ffd15edb5431 182 // revision
garygid 70:0700b769ac15 183 sprintf(sTemp,"CANary firmware rev%s\n", revStr); // gg - for Logging the revision
TickTock 93:c2402e8cd0e2 184 printMsg(sTemp); // revision
TickTock 15:a359fecf85ba 185
TickTock 26:462ccb580472 186 secsNoMsg = 0;
TickTock 43:e7f6f80590e3 187
TickTock 49:a3d2c5bb3cfa 188 //read efficiency history data
TickTock 97:a25940fd7b5b 189 hfile = fopen("/local/ehist.cny", "r");
TickTock 97:a25940fd7b5b 190 if (hfile!=NULL){ // found a efficiency history file
TickTock 92:935adef49ea4 191 for(i=0;i<39;i++){
TickTock 97:a25940fd7b5b 192 if(!feof(hfile)){
TickTock 97:a25940fd7b5b 193 fscanf(hfile,"%f %f\r\n",&mph[i],&kW[i]);
TickTock 49:a3d2c5bb3cfa 194 mpkWh[i]=mph[i]/kW[i];
TickTock 49:a3d2c5bb3cfa 195 }
TickTock 49:a3d2c5bb3cfa 196 }
TickTock 97:a25940fd7b5b 197 fclose(hfile);
TickTock 116:5cd72bae7c12 198 printMsg("History Loaded.\n"); // History loaded
TickTock 49:a3d2c5bb3cfa 199 } else { // create initial file
TickTock 116:5cd72bae7c12 200 printMsg("History not found. Created.\n"); // history not found, created
TickTock 92:935adef49ea4 201 for(i=0;i<39;i++){
TickTock 49:a3d2c5bb3cfa 202 // Pre-load with 4 mpkWh @ 40 mph
TickTock 49:a3d2c5bb3cfa 203 mph[i]=40*timeConstant[i];
TickTock 49:a3d2c5bb3cfa 204 kW[i]=10*timeConstant[i];
TickTock 49:a3d2c5bb3cfa 205 mpkWh[i]=4;
TickTock 49:a3d2c5bb3cfa 206 }
TickTock 49:a3d2c5bb3cfa 207 }
TickTock 49:a3d2c5bb3cfa 208
TickTock 46:73e8716f976f 209 // Read config file
TickTock 46:73e8716f976f 210 readConfig();
TickTock 108:29b5a760adc2 211 if (repeatPoll) { // enable autopolling if enabled
TickTock 108:29b5a760adc2 212 autoPoll.attach(&autoPollISR,pollInt);
TickTock 108:29b5a760adc2 213 }
TickTock 108:29b5a760adc2 214
TickTock 77:7c136766466c 215 // Start monitors
TickTock 77:7c136766466c 216 can1.monitor(true); // set to snoop mode
TickTock 77:7c136766466c 217 can2.monitor(true); // set to snoop mode
TickTock 77:7c136766466c 218 can1.frequency(500000);
TickTock 77:7c136766466c 219 can2.frequency(500000);
TickTock 120:041edeec08f5 220 can1SleepMode = VP230Sleep; // Turn on Monitor_only Mode
TickTock 120:041edeec08f5 221 can2SleepMode = VP230Sleep; // Turn on Monitor_only Mode
TickTock 77:7c136766466c 222 can1.attach(&recieve1);
TickTock 77:7c136766466c 223 can2.attach(&recieve2);
TickTock 77:7c136766466c 224
TickTock 26:462ccb580472 225 touched=false;
TickTock 26:462ccb580472 226 secsNoTouch=2;
TickTock 2:71b1999a8ea5 227 while (true) {
TickTock 4:8d7759f4fe7a 228 if (!logOpen) { // Open new file if one is not already open
TickTock 112:b41b35401eb6 229 if(logEn&&usbEn){ //logging enables and USB device detected
TickTock 109:3e6f0e8fca0d 230 strftime(fileName, 32, "%m%d%H%M.alc", &t); //mmddhhmm.alc
TickTock 109:3e6f0e8fca0d 231 efr = f_open(&efile,fileName,FA_WRITE|FA_OPEN_ALWAYS);
TickTock 7:17bf9ceaf0aa 232 seconds = time(NULL);
TickTock 7:17bf9ceaf0aa 233 t = *localtime(&seconds) ;
TickTock 94:c3a14b3975d6 234 lastDMode[0]=99;//force refresh
TickTock 94:c3a14b3975d6 235 lastDMode[1]=99;//force refresh
TickTock 109:3e6f0e8fca0d 236 if(efr != FR_OK){
TickTock 109:3e6f0e8fca0d 237 sprintf(sTemp,"\nERR:%d Unable to open %s\n\n\n\n",efr,fileName);
TickTock 93:c2402e8cd0e2 238 printMsg(sTemp); // cannot open alc file
TickTock 7:17bf9ceaf0aa 239 logEn=false;
TickTock 26:462ccb580472 240 spkr.beep(1000,0.25);
TickTock 109:3e6f0e8fca0d 241 wait_ms(500);
TickTock 109:3e6f0e8fca0d 242 spkr.beep(1000,0.25);
TickTock 7:17bf9ceaf0aa 243 } else {
TickTock 7:17bf9ceaf0aa 244 logOpen = true;
TickTock 7:17bf9ceaf0aa 245 readPointer=writePointer;
TickTock 7:17bf9ceaf0aa 246 sprintf(sTemp,"Starting Can Log %s\n",fileName);
TickTock 93:c2402e8cd0e2 247 printMsg(sTemp); // starting alc log file
garygid 69:6bfdfc002036 248
garygid 69:6bfdfc002036 249 logTS(); // Date Time at start
TickTock 93:c2402e8cd0e2 250 logEvent("Starting"); // Log startup msg for testing
garygid 69:6bfdfc002036 251 sprintf(sTemp,"Cr%s",revStr);
TickTock 108:29b5a760adc2 252 logEvent(sTemp); // gg - log firmware version
TickTock 26:462ccb580472 253 spkr.beep(2000,0.25);
TickTock 7:17bf9ceaf0aa 254 }
TickTock 108:29b5a760adc2 255 }//logging enabled and USB detected
TickTock 15:a359fecf85ba 256 } else { // if (logOpen)
TickTock 117:49883c779a74 257 pointerSep=(writePointer+maxBufLen-readPointer)%maxBufLen;
TickTock 117:49883c779a74 258 if (pointerSep>(maxBufLen/16)||canIdle||!logEn) {
TickTock 117:49883c779a74 259 // Dump buffer if > 1/16 full or canbus has stopped
TickTock 117:49883c779a74 260 //if (&efile == NULL) {
TickTock 117:49883c779a74 261 if (efr != FR_OK) {
TickTock 117:49883c779a74 262 logOpen = false;
TickTock 117:49883c779a74 263 printMsg("Failed to append log file.\n"); // failed to append
TickTock 117:49883c779a74 264 spkr.beep(3000,0.25);
TickTock 117:49883c779a74 265 spkr.beep(1500,0.25);
TickTock 117:49883c779a74 266 spkr.beep(750,0.25);
TickTock 117:49883c779a74 267 spkr.beep(375,0.25);
TickTock 117:49883c779a74 268 logEn=false;
TickTock 117:49883c779a74 269 } else {
TickTock 117:49883c779a74 270 while (readPointer != writePointer) {
TickTock 117:49883c779a74 271 efr=f_write(&efile,&writeBuffer[readPointer][0],13,&bytesRW);
TickTock 117:49883c779a74 272 if(++readPointer >= maxBufLen){
TickTock 117:49883c779a74 273 readPointer=0;
TickTock 117:49883c779a74 274 led4 = !led4;
TickTock 117:49883c779a74 275 }
TickTock 117:49883c779a74 276 }
TickTock 117:49883c779a74 277 }
TickTock 117:49883c779a74 278 } // if > 1/16 full, canbus has stopped, or logging stopped
TickTock 30:e633a63eb257 279 if (!logEn) {
TickTock 77:7c136766466c 280 sprintf(sTemp,"Stopping Can Log %s\n",fileName);
TickTock 93:c2402e8cd0e2 281 printMsg(sTemp); // stopping alc log file
TickTock 109:3e6f0e8fca0d 282 f_close(&efile);
TickTock 117:49883c779a74 283 logOpen=false;
TickTock 77:7c136766466c 284 pointerSep=0;
TickTock 108:29b5a760adc2 285 led4=false;
TickTock 30:e633a63eb257 286 }
TickTock 4:8d7759f4fe7a 287 } // if logOpen
TickTock 36:dbd39c315258 288 if (canIdle&&userIdle&&!playbackEn) { // canbus idle --> sleep to save power
TickTock 95:248b3c25a7df 289 if (repeatPoll) { // stop autopolling if enabled
TickTock 95:248b3c25a7df 290 autoPoll.detach();
TickTock 95:248b3c25a7df 291 }
TickTock 111:d1559bb25c43 292 if (logOpen){ //close file to dump buffer
TickTock 111:d1559bb25c43 293 f_close(&efile);
TickTock 111:d1559bb25c43 294 } // if (logOpen)
TickTock 20:3bf176d14b14 295 seconds = time(NULL);
TickTock 20:3bf176d14b14 296 t = *localtime(&seconds) ;
TickTock 21:22bdce9efcb5 297 strftime(sTemp, 40, "Sleeping: %a %m/%d/%Y %X\n", &t);
TickTock 93:c2402e8cd0e2 298 printMsg(sTemp); // sleeping date time
TickTock 25:ddf0ec209f03 299 updateDisplay(0); //Added for turbo3 who has a display override and wants to see the sleep message before going to sleep
TickTock 25:ddf0ec209f03 300 updateDisplay(1);
TickTock 4:8d7759f4fe7a 301 //LPC_RTC->CIIR=0x00; // block RTC interrupts
TickTock 4:8d7759f4fe7a 302 led1=0;
TickTock 4:8d7759f4fe7a 303 led2=0;
TickTock 4:8d7759f4fe7a 304 led3=0;
TickTock 4:8d7759f4fe7a 305 led4=0;
TickTock 4:8d7759f4fe7a 306 dled=0; // turn off display
TickTock 4:8d7759f4fe7a 307 secs = time(NULL); // seconds past 12:00:00 AM 1 Jan 1900
TickTock 22:a43df3905863 308 while (secsNoMsg>canTimeout && !touched) {
TickTock 4:8d7759f4fe7a 309 //DeepPowerDown();
TickTock 12:8e42d7ba8468 310 tt.wfi(); //enable touch interrupt
TickTock 21:22bdce9efcb5 311 //__wfi(); // freeze CPU and wait for interrupt (from canbus or touch)
TickTock 21:22bdce9efcb5 312 Sleep();
TickTock 4:8d7759f4fe7a 313 }
TickTock 97:a25940fd7b5b 314 lastDMode[0]=99;
TickTock 97:a25940fd7b5b 315 lastDMode[1]=99;
TickTock 43:e7f6f80590e3 316 secsNoTouch=2;
TickTock 4:8d7759f4fe7a 317 canIdle=secsNoMsg>canTimeout;
TickTock 7:17bf9ceaf0aa 318 dled=0.8; // turn on display LED
TickTock 20:3bf176d14b14 319 seconds = time(NULL);
TickTock 20:3bf176d14b14 320 t = *localtime(&seconds) ;
TickTock 21:22bdce9efcb5 321 strftime(sTemp, 40, "Waking: %a %m/%d/%Y %X\n", &t);
TickTock 93:c2402e8cd0e2 322 printMsg(sTemp); // wakeup date time
TickTock 4:8d7759f4fe7a 323 if (time(NULL)>(secs+1800)) {
TickTock 110:ffddff3ad2f2 324 if (logOpen){
TickTock 110:ffddff3ad2f2 325 f_close(&efile);
TickTock 110:ffddff3ad2f2 326 logOpen = false; // Start new file if asleep for more than 30 minutes
TickTock 110:ffddff3ad2f2 327 } // if (logOpen)
TickTock 4:8d7759f4fe7a 328 if (secsNoTouch>100) secsNoTouch = 100; // also mostly reset user Idle counter
TickTock 43:e7f6f80590e3 329 } else if (logOpen){ // insert timestamp on each wake if logging enabled (disabled for now)
TickTock 111:d1559bb25c43 330 efr = f_open(&efile,fileName,FA_WRITE|FA_OPEN_ALWAYS);
TickTock 111:d1559bb25c43 331 f_lseek(&efile,0xffffffff); // goto end of file (append existing)
TickTock 93:c2402e8cd0e2 332 logEvent("WakingUp"); // gg - use messeges
garygid 69:6bfdfc002036 333 logTS(); // Date-Time at wakeup
TickTock 4:8d7759f4fe7a 334 }
TickTock 95:248b3c25a7df 335 if (repeatPoll) { // re-enable autopolling if enabled
TickTock 123:a8c0042df617 336 //autoPoll.attach(&autoPollISR,pollInt);
TickTock 123:a8c0042df617 337 autoPoll.attach(&autoPollISR,10);
TickTock 95:248b3c25a7df 338 }
TickTock 4:8d7759f4fe7a 339 } // if idle
TickTock 4:8d7759f4fe7a 340
TickTock 15:a359fecf85ba 341 if(touched){ // call touchscreen procedure if touch interrupt detected
TickTock 7:17bf9ceaf0aa 342 lastTouch = tt.get_touch();
TickTock 7:17bf9ceaf0aa 343 lastTouch = tt.to_pixel(lastTouch); // convert to pixel pos
TickTock 40:0e6e71a7323f 344 if((lastTouch.x!=639)&&(lastTouch.x!=319)&&(lastTouch.y!=239)){ // filter phantom touches
TickTock 43:e7f6f80590e3 345 if (userIdle) {
TickTock 43:e7f6f80590e3 346 secsNoTouch=2; // Ignore first touch if user idle
TickTock 43:e7f6f80590e3 347 userIdle=false;
TickTock 40:0e6e71a7323f 348 } else {
TickTock 43:e7f6f80590e3 349 secsNoTouch=0;
TickTock 40:0e6e71a7323f 350 }
TickTock 43:e7f6f80590e3 351 if (lastTouch.x>320){
TickTock 43:e7f6f80590e3 352 whichTouched=1;
TickTock 43:e7f6f80590e3 353 } else {
TickTock 43:e7f6f80590e3 354 whichTouched=0;
TickTock 43:e7f6f80590e3 355 }
TickTock 43:e7f6f80590e3 356 if (whichTouched!=lwt){
TickTock 43:e7f6f80590e3 357 lastDMode[lwt]=99; // Repaint lastTouched
TickTock 43:e7f6f80590e3 358 lwt=whichTouched;
TickTock 43:e7f6f80590e3 359 }
TickTock 43:e7f6f80590e3 360 sMode = 1;
TickTock 22:a43df3905863 361 }
TickTock 22:a43df3905863 362 //sprintf(sTemp,"%d,%d ",lastTouch.x,lastTouch.y);
TickTock 93:c2402e8cd0e2 363 //printMsg(sTemp); // touch x,y - for debug
TickTock 12:8e42d7ba8468 364 touched = false; // clear interrupt flag
TickTock 7:17bf9ceaf0aa 365 }
garygid 54:6ce808d0995e 366 //---------------
garygid 54:6ce808d0995e 367 // gg - 4x4 touch
TickTock 62:ffd15edb5431 368 //unsigned char tScrn = 0 ; // screen 0
garygid 54:6ce808d0995e 369 unsigned char tCol ;
garygid 54:6ce808d0995e 370 unsigned char tRow ;
garygid 54:6ce808d0995e 371
TickTock 4:8d7759f4fe7a 372 if (!userIdle) {
TickTock 4:8d7759f4fe7a 373 if (secsNoTouch<2) {// Recently touched
TickTock 4:8d7759f4fe7a 374 secsNoTouch +=2; // increment to prevent double touch
TickTock 43:e7f6f80590e3 375 sMode = 1;
TickTock 22:a43df3905863 376 //sprintf(sTemp,"button %d %d,%d %d\n",i,buttonX(lastTouch.x,3),buttonY(lastTouch.y,3),lastTouch.x);
TickTock 93:c2402e8cd0e2 377 //printMsg(sTemp); // button parms - for debug
TickTock 23:cd03f9c3395e 378 switch (sMode) {
TickTock 23:cd03f9c3395e 379 case 0: // no select
TickTock 23:cd03f9c3395e 380 break;
TickTock 63:aa3bf6a33635 381 case 1: // select screen
garygid 54:6ce808d0995e 382 //--------------
garygid 54:6ce808d0995e 383 // gg - 4x4 touch
garygid 54:6ce808d0995e 384 tCol = buttonX(lastTouch.x,4) ;
TickTock 62:ffd15edb5431 385 if( tCol >= 4 ){ tCol -= 4; } // touch is on screen 1
garygid 54:6ce808d0995e 386
garygid 54:6ce808d0995e 387 tRow = buttonY(lastTouch.y,4) ;
garygid 54:6ce808d0995e 388
TickTock 63:aa3bf6a33635 389 highlightButton( tCol,tRow, whichTouched, 4,4) ; // gg - highlight
garygid 58:4d06288d75a2 390
TickTock 63:aa3bf6a33635 391 if( tRow == tNavRow ) tRow = 7 ; // gg
garygid 54:6ce808d0995e 392 switch ( (tCol*10) + tRow ) {
garygid 54:6ce808d0995e 393 //---------------------------------
garygid 67:2022fce701d0 394 case 00: // top row, left button on screen 0 or 1
TickTock 42:4533b13b297d 395 if (dMode[whichTouched]==monitorScreen||dMode[whichTouched]==changedScreen) {
garygid 67:2022fce701d0 396 indexOffset=indexOffset>4?indexOffset-4:1;
garygid 67:2022fce701d0 397 } else if (dMode[whichTouched] == indexScreen) { // gg - index
garygid 67:2022fce701d0 398 dMode[whichTouched] = mainScreen ; // GoTo Main Screen
TickTock 73:62ee8eae3a84 399 sMode=0;
leafman 98:9f8bab96edff 400 } else if (dMode[whichTouched]==configScreen) {
TickTock 23:cd03f9c3395e 401 wait_ms(500);
TickTock 37:fea2c1d52c5f 402 tt.background(Black);
TickTock 23:cd03f9c3395e 403 tt.calibrate();
TickTock 42:4533b13b297d 404 } else if (dMode[whichTouched]==playbackScreen) { // slower
TickTock 36:dbd39c315258 405 playbackInt *=2;
TickTock 36:dbd39c315258 406 if(playbackEn){
TickTock 36:dbd39c315258 407 playback.detach();
TickTock 36:dbd39c315258 408 playback.attach(&playbackISR,playbackInt);
TickTock 36:dbd39c315258 409 }
TickTock 62:ffd15edb5431 410 } else {
TickTock 62:ffd15edb5431 411 lastDMode[whichTouched]=99;//repaint to clear highlight
TickTock 23:cd03f9c3395e 412 }
TickTock 23:cd03f9c3395e 413 break;
garygid 54:6ce808d0995e 414 //-----------------------------------------------
garygid 67:2022fce701d0 415 case 10: // 1,0 (col left of center,top row) on screen 0 or 1
TickTock 42:4533b13b297d 416 if (dMode[whichTouched]==changedScreen) {
TickTock 92:935adef49ea4 417 for(j=0;j<100;j++) msgChanged[j]=0; // clear changed data
TickTock 42:4533b13b297d 418 lastDMode[whichTouched]=99;//force refresh
garygid 67:2022fce701d0 419 } else if (dMode[whichTouched] == indexScreen) { // gg - index
TickTock 73:62ee8eae3a84 420 sMode=0;
garygid 67:2022fce701d0 421 dMode[whichTouched] = brakeScreen ; // GoTo Brake Screen
TickTock 42:4533b13b297d 422 } else if (dMode[whichTouched]==cpScreen) {
TickTock 78:a383971fe02f 423 reqMsgCnt=0;
TickTock 123:a8c0042df617 424 msgReq.attach(&sendReq,0.035);
TickTock 48:d1ce92104a1f 425 } else if (dMode[whichTouched]==cpHistScreen) { // gg - hist
TickTock 78:a383971fe02f 426 reqMsgCnt=0;
TickTock 123:a8c0042df617 427 msgReq.attach(&sendReq,0.035);
TickTock 48:d1ce92104a1f 428 } else if (dMode[whichTouched]==cpBarScreen) { // gg - cpbars
TickTock 78:a383971fe02f 429 reqMsgCnt=0;
TickTock 123:a8c0042df617 430 msgReq.attach(&sendReq,0.035);
leafman 98:9f8bab96edff 431 } else if (dMode[whichTouched]==configScreen) {
TickTock 23:cd03f9c3395e 432 mbed_reset();
TickTock 42:4533b13b297d 433 } else if (dMode[whichTouched]==playbackScreen) { // pause/unpause
TickTock 36:dbd39c315258 434 playbackEn=!playbackEn;
TickTock 36:dbd39c315258 435 if(playbackEn){
TickTock 36:dbd39c315258 436 playback.attach(&playbackISR,playbackInt);
TickTock 62:ffd15edb5431 437 } else {
TickTock 36:dbd39c315258 438 playback.detach();
TickTock 36:dbd39c315258 439 }
TickTock 62:ffd15edb5431 440 } else {
TickTock 62:ffd15edb5431 441 lastDMode[whichTouched]=99;//repaint to clear highlight
TickTock 23:cd03f9c3395e 442 }
TickTock 62:ffd15edb5431 443
TickTock 23:cd03f9c3395e 444 break;
garygid 54:6ce808d0995e 445 //--------------------------------------
garygid 54:6ce808d0995e 446 case 20: // col 2 and row 0 on either screen 0 or 1
TickTock 42:4533b13b297d 447 if (dMode[whichTouched]==monitorScreen||dMode[whichTouched]==changedScreen) {
TickTock 23:cd03f9c3395e 448 indexOffset=indexOffset<77?indexOffset+4:80;
garygid 67:2022fce701d0 449 } else if (dMode[whichTouched] == indexScreen) { // gg - index
garygid 67:2022fce701d0 450 dMode[whichTouched] = effScreen ; // GoTo EFF Screen
TickTock 73:62ee8eae3a84 451 sMode=0;
leafman 98:9f8bab96edff 452 } else if (dMode[whichTouched]==configScreen) {
TickTock 116:5cd72bae7c12 453 printMsg("Saving config file.\n"); // saving config
TickTock 25:ddf0ec209f03 454 saveConfig();
TickTock 26:462ccb580472 455 spkr.beep(2000,0.25);
TickTock 42:4533b13b297d 456 } else if (dMode[whichTouched]==playbackScreen) { // faster
TickTock 36:dbd39c315258 457 if(playbackInt>.002){
TickTock 36:dbd39c315258 458 playbackInt/=2;
TickTock 36:dbd39c315258 459 if(playbackEn){
TickTock 36:dbd39c315258 460 playback.detach();
TickTock 36:dbd39c315258 461 playback.attach(&playbackISR,playbackInt);
TickTock 36:dbd39c315258 462 }
TickTock 36:dbd39c315258 463 }
TickTock 86:d1c9e8ac1c4b 464 } else {
TickTock 62:ffd15edb5431 465 lastDMode[whichTouched]=99;//repaint to clear highlight
TickTock 23:cd03f9c3395e 466 }
TickTock 62:ffd15edb5431 467
TickTock 23:cd03f9c3395e 468 break;
garygid 65:821fc79cd7fe 469
garygid 67:2022fce701d0 470 case 30: // right-most on top row
garygid 65:821fc79cd7fe 471
leafman 98:9f8bab96edff 472 if (dMode[whichTouched]==configScreen) {
garygid 65:821fc79cd7fe 473 // step through skins
garygid 65:821fc79cd7fe 474 if( skin < maxSkin ) skin += 1 ;
garygid 65:821fc79cd7fe 475 else skin = 0 ;
garygid 65:821fc79cd7fe 476
garygid 65:821fc79cd7fe 477 // repaint both screens, I think
garygid 65:821fc79cd7fe 478 lastDMode[whichTouched]=99;//repaint to clear highlight
garygid 65:821fc79cd7fe 479 // and re-paint the other screen too, to see new skin there
garygid 65:821fc79cd7fe 480 lastDMode[whichTouched ^ 1]=99; // repaint other screen (^ = XOR)
garygid 67:2022fce701d0 481 } else if (dMode[whichTouched] == indexScreen) { // gg - index
TickTock 122:138a40892a4c 482 dMode[whichTouched] = healthScreen ; // Goto health screen
TickTock 73:62ee8eae3a84 483 sMode=0;
TickTock 86:d1c9e8ac1c4b 484 } else {
garygid 65:821fc79cd7fe 485 lastDMode[whichTouched]=99;//repaint to clear highlight
garygid 65:821fc79cd7fe 486 }
garygid 65:821fc79cd7fe 487
garygid 65:821fc79cd7fe 488 break;
garygid 54:6ce808d0995e 489 //----------------------------------
garygid 54:6ce808d0995e 490 //----------------------------------
garygid 67:2022fce701d0 491 case 01: // left col middle row
leafman 98:9f8bab96edff 492 if (dMode[whichTouched]==configScreen) {
TickTock 23:cd03f9c3395e 493 logEn = !logEn;
garygid 67:2022fce701d0 494 } else if (dMode[whichTouched] == indexScreen) { // gg - index
TickTock 73:62ee8eae3a84 495 dMode[whichTouched] = cpScreen ; // GoTo CP Data Screen
TickTock 73:62ee8eae3a84 496 sMode=0;
TickTock 42:4533b13b297d 497 } else if (dMode[whichTouched]==dateScreen){
TickTock 25:ddf0ec209f03 498 dtMode=(dtMode<6)?dtMode+1:0;
TickTock 42:4533b13b297d 499 lastDMode[whichTouched]=99;
TickTock 62:ffd15edb5431 500 } else {
TickTock 62:ffd15edb5431 501 lastDMode[whichTouched]=99;//repaint to clear highlight
TickTock 23:cd03f9c3395e 502 }
TickTock 62:ffd15edb5431 503
TickTock 23:cd03f9c3395e 504 break;
garygid 54:6ce808d0995e 505 //------------------------------
TickTock 23:cd03f9c3395e 506 case 11:
leafman 98:9f8bab96edff 507 if (dMode[whichTouched]==configScreen){
TickTock 77:7c136766466c 508 repeatPoll = !repeatPoll;
TickTock 33:a277743ebdeb 509 if (repeatPoll) {
TickTock 36:dbd39c315258 510 autoPoll.attach(&autoPollISR,pollInt);
TickTock 33:a277743ebdeb 511 } else {
TickTock 36:dbd39c315258 512 autoPoll.detach();
TickTock 33:a277743ebdeb 513 }
garygid 67:2022fce701d0 514 } else if (dMode[whichTouched] == indexScreen) { // gg - index
garygid 67:2022fce701d0 515 dMode[whichTouched] = cpHistScreen ; // GoTo CP Hist Screen
TickTock 73:62ee8eae3a84 516 sMode=0;
TickTock 42:4533b13b297d 517 } else if (dMode[whichTouched]==playbackScreen) {
TickTock 36:dbd39c315258 518 // Start/stop playback
TickTock 36:dbd39c315258 519 if(!playbackOpen){
TickTock 36:dbd39c315258 520 if(!logOpen){
TickTock 109:3e6f0e8fca0d 521 efr = f_open(&efile,"playback.alc",FA_READ|FA_OPEN_EXISTING);
TickTock 50:83d5864c64a0 522 lastDMode[whichTouched]=99;//force refresh
TickTock 109:3e6f0e8fca0d 523 if(efr != FR_OK){
TickTock 116:5cd72bae7c12 524 printMsg("Unable to open /usb/playback.alc\n"); // no playback.alc
TickTock 36:dbd39c315258 525 spkr.beep(1000,0.25);
TickTock 36:dbd39c315258 526 } else {
TickTock 36:dbd39c315258 527 playbackOpen = true;
TickTock 50:83d5864c64a0 528 playbackEn=true;
TickTock 50:83d5864c64a0 529 playback.attach(&playbackISR,playbackInt);
TickTock 116:5cd72bae7c12 530 printMsg("Starting playback\n"); // start playback
TickTock 36:dbd39c315258 531 spkr.beep(2000,0.25);
TickTock 36:dbd39c315258 532 can1.attach(&doNothing);// Stop recieving CAN data
TickTock 36:dbd39c315258 533 can2.attach(&doNothing);
TickTock 36:dbd39c315258 534 }
TickTock 36:dbd39c315258 535 } else {
TickTock 117:49883c779a74 536 printMsg("Must stop logging first\n");
TickTock 36:dbd39c315258 537 }
TickTock 36:dbd39c315258 538 } else {
TickTock 36:dbd39c315258 539 playback.detach();
TickTock 109:3e6f0e8fca0d 540 f_close(&efile);
TickTock 36:dbd39c315258 541 playbackOpen=false;
TickTock 50:83d5864c64a0 542 playbackEn=false;
TickTock 36:dbd39c315258 543 can1.attach(&recieve1);// Restore CAN data recieve
TickTock 36:dbd39c315258 544 can2.attach(&recieve2);
TickTock 42:4533b13b297d 545 lastDMode[whichTouched]=99;
TickTock 36:dbd39c315258 546 }
TickTock 42:4533b13b297d 547 } else if (dMode[whichTouched]==dateScreen){
TickTock 25:ddf0ec209f03 548 upDate(dtMode,true);
TickTock 42:4533b13b297d 549 lastDMode[whichTouched]=99;
TickTock 62:ffd15edb5431 550 } else {
TickTock 62:ffd15edb5431 551 lastDMode[whichTouched]=99;//repaint to clear highlight
TickTock 25:ddf0ec209f03 552 }
TickTock 62:ffd15edb5431 553
TickTock 23:cd03f9c3395e 554 break;
garygid 54:6ce808d0995e 555 //---------------------------------
garygid 54:6ce808d0995e 556 case 21: // col 2 row 1
leafman 98:9f8bab96edff 557 if (dMode[whichTouched]==configScreen) { // gg - Batt Log Enable Button
TickTock 48:d1ce92104a1f 558 yesBattLog = !yesBattLog;
garygid 67:2022fce701d0 559 } else if (dMode[whichTouched] == indexScreen) { // gg - index
garygid 67:2022fce701d0 560 dMode[whichTouched] = cpBarScreen ; // GoTo CP Bars Screen
TickTock 73:62ee8eae3a84 561 sMode=0;
TickTock 48:d1ce92104a1f 562 } else if (dMode[whichTouched]==dateScreen){
TickTock 25:ddf0ec209f03 563 upDate(dtMode,false);
TickTock 42:4533b13b297d 564 lastDMode[whichTouched]=99;
TickTock 62:ffd15edb5431 565 } else {
TickTock 62:ffd15edb5431 566 lastDMode[whichTouched]=99;//repaint to clear highlight
TickTock 25:ddf0ec209f03 567 }
TickTock 62:ffd15edb5431 568
TickTock 23:cd03f9c3395e 569 break;
garygid 54:6ce808d0995e 570
garygid 87:46ac3f2519d6 571 case 31: // col 3 row 1
leafman 98:9f8bab96edff 572 if (dMode[whichTouched]==configScreen) { // gg - Batt Log Enable Button
garygid 87:46ac3f2519d6 573 debugMode = !debugMode;
leafman 98:9f8bab96edff 574 } else if (dMode[whichTouched] == indexScreen) { // gg - index
leafman 98:9f8bab96edff 575 dMode[whichTouched] = configScreen ; // GoTo Config Screen
TickTock 107:e9be732c1ad4 576 } else if (dMode[whichTouched] == tripScreen) {
TickTock 108:29b5a760adc2 577 miles_trip[1]=0;
TickTock 108:29b5a760adc2 578 kWh_trip[1]=0;
TickTock 108:29b5a760adc2 579 sMode=0;
TickTock 108:29b5a760adc2 580 lastDMode[whichTouched]=99;//repaint to clear highlight
garygid 87:46ac3f2519d6 581 } else {
garygid 87:46ac3f2519d6 582 lastDMode[whichTouched]=99;//repaint to clear highlight
garygid 87:46ac3f2519d6 583 }
garygid 87:46ac3f2519d6 584 break;
garygid 87:46ac3f2519d6 585
garygid 54:6ce808d0995e 586 //-----------------------------------
garygid 67:2022fce701d0 587 case 02: // left col, bottom row (not nav)
garygid 67:2022fce701d0 588 if (dMode[whichTouched] == indexScreen) { // gg - index
leafman 98:9f8bab96edff 589 dMode[whichTouched] = playbackScreen ; // GoTo Playback Screen
leafman 98:9f8bab96edff 590 } else if (dMode[whichTouched]==configScreen) {
leafman 98:9f8bab96edff 591 metric = !metric; // toggle metric/imperial display
garygid 87:46ac3f2519d6 592 } else {
garygid 87:46ac3f2519d6 593 lastDMode[whichTouched]=99;//repaint to clear highlight
garygid 87:46ac3f2519d6 594 }
garygid 67:2022fce701d0 595 break;
garygid 67:2022fce701d0 596
garygid 67:2022fce701d0 597 case 12: // left-middle col, bottom row (not nav)
garygid 67:2022fce701d0 598 if (dMode[whichTouched] == indexScreen) { // gg - index
leafman 98:9f8bab96edff 599 dMode[whichTouched] = dateScreen ; // GoTo Set Date/Time Screen
garygid 87:46ac3f2519d6 600 } else {
garygid 87:46ac3f2519d6 601 lastDMode[whichTouched]=99;//repaint to clear highlight
garygid 87:46ac3f2519d6 602 }
garygid 67:2022fce701d0 603 break;
garygid 67:2022fce701d0 604
garygid 67:2022fce701d0 605 case 22: // right-middle col, bottom row (not nav)
garygid 67:2022fce701d0 606 if (dMode[whichTouched] == indexScreen) { // gg - index
leafman 98:9f8bab96edff 607 dMode[whichTouched] = logScreen ;
garygid 87:46ac3f2519d6 608 } else {
garygid 87:46ac3f2519d6 609 lastDMode[whichTouched]=99;//repaint to clear highlight
garygid 87:46ac3f2519d6 610 }
garygid 67:2022fce701d0 611 break;
TickTock 72:f9a6faa28873 612
leafman 98:9f8bab96edff 613 case 32: // right col, bottom row (not nav)
leafman 98:9f8bab96edff 614 if (dMode[whichTouched] == configScreen) {
TickTock 114:3f8c59a8a2b9 615 logEn=false;
leafman 98:9f8bab96edff 616 updateFirmware();
TickTock 107:e9be732c1ad4 617 } else if (dMode[whichTouched] == tripScreen) {
TickTock 108:29b5a760adc2 618 miles_trip[2]=0;
TickTock 108:29b5a760adc2 619 kWh_trip[2]=0;
TickTock 108:29b5a760adc2 620 sMode=0;
TickTock 108:29b5a760adc2 621 lastDMode[whichTouched]=99;//repaint to clear highlight
TickTock 108:29b5a760adc2 622 } else if (dMode[whichTouched] == indexScreen) {
TickTock 108:29b5a760adc2 623 dMode[whichTouched] = tripScreen ;
leafman 98:9f8bab96edff 624 } else {
garygid 87:46ac3f2519d6 625 lastDMode[whichTouched]=99;//repaint to clear highlight
leafman 98:9f8bab96edff 626 }
TickTock 72:f9a6faa28873 627 break;
TickTock 72:f9a6faa28873 628
garygid 67:2022fce701d0 629 //-----------------------------------
garygid 54:6ce808d0995e 630 //-----------------------------------
garygid 54:6ce808d0995e 631 // Prev Navigation
garygid 54:6ce808d0995e 632 case 07: // col 0 row tNavRow
TickTock 42:4533b13b297d 633 dMode[whichTouched]=dMode[whichTouched]>0?dMode[whichTouched]-1:maxScreens;
TickTock 22:a43df3905863 634 break;
garygid 54:6ce808d0995e 635 //-----------------------------------
garygid 54:6ce808d0995e 636 // Select Screen Navigation
garygid 54:6ce808d0995e 637 case 17:
TickTock 43:e7f6f80590e3 638 //secsNoTouch = userTimeout; // immediately exit config mode
TickTock 43:e7f6f80590e3 639 sMode=0;
TickTock 43:e7f6f80590e3 640 lastDMode[whichTouched]=99; // Repaint
TickTock 22:a43df3905863 641 break;
garygid 54:6ce808d0995e 642 //-----------------------------------
garygid 54:6ce808d0995e 643 // Index Navigation
garygid 54:6ce808d0995e 644 case 27: // col 2 row tNavRow
garygid 67:2022fce701d0 645 dMode[whichTouched]= indexScreen ; // gg - index
garygid 54:6ce808d0995e 646 break;
garygid 54:6ce808d0995e 647 //------------------------------------
garygid 54:6ce808d0995e 648 // Next Navigation
garygid 54:6ce808d0995e 649 case 37: // lower right on Nav Line gg - move next
TickTock 42:4533b13b297d 650 dMode[whichTouched]=dMode[whichTouched]<maxScreens?dMode[whichTouched]+1:0;
TickTock 22:a43df3905863 651 break;
garygid 54:6ce808d0995e 652 //------------------------------------
garygid 54:6ce808d0995e 653 //------------------------------------
TickTock 22:a43df3905863 654 default:
TickTock 62:ffd15edb5431 655 lastDMode[whichTouched]=99;//repaint to clear highlight
TickTock 25:ddf0ec209f03 656 break;
TickTock 25:ddf0ec209f03 657 }
TickTock 23:cd03f9c3395e 658 break;
TickTock 23:cd03f9c3395e 659 case 2: // numpad
TickTock 23:cd03f9c3395e 660 break;
TickTock 23:cd03f9c3395e 661 case 3:
TickTock 23:cd03f9c3395e 662 break;
TickTock 23:cd03f9c3395e 663 default:
TickTock 23:cd03f9c3395e 664 break;
TickTock 23:cd03f9c3395e 665 } // case sMode
TickTock 22:a43df3905863 666 } //recently touched
TickTock 4:8d7759f4fe7a 667 } else { // userIdle
TickTock 8:67eed72f3e10 668 if(sMode==1){
TickTock 8:67eed72f3e10 669 sMode=0;
TickTock 43:e7f6f80590e3 670 lastDMode[whichTouched]=99;
TickTock 8:67eed72f3e10 671 }
TickTock 4:8d7759f4fe7a 672 }
TickTock 34:4751a8259b18 673
TickTock 123:a8c0042df617 674 if (reqRest){
TickTock 123:a8c0042df617 675 reqRest=false;
TickTock 123:a8c0042df617 676 if (reqMsgCnt<DataBaseG7){
TickTock 123:a8c0042df617 677 can1.write(CANMessage(0x79b, reqData, 8));
TickTock 123:a8c0042df617 678 }else{
TickTock 123:a8c0042df617 679 can1.write(CANMessage(0x745, reqData, 8));
TickTock 123:a8c0042df617 680 }
TickTock 123:a8c0042df617 681 }
TickTock 123:a8c0042df617 682
TickTock 34:4751a8259b18 683 if(tick){ // Executes once a second
TickTock 108:29b5a760adc2 684 tick=false;
TickTock 93:c2402e8cd0e2 685 headlights = (lastMsg[indexLastMsg[0x358]].data[1]&0x80)?true:false; // headlight/turn signal indicator
TickTock 41:8d4609ea7259 686 accV=floor(mon12V*scale12V*10+0.5)/10; //Round to nearest 10th
TickTock 35:5acbd8a64a89 687 accOn=(accV>5)?true:false;
TickTock 121:553faf139a20 688 charging=(mph[0]<0.1)&&(kW[0]<-1); // not moving and generating energy so much be charging
TickTock 49:a3d2c5bb3cfa 689 if(laccOn&&!accOn){ // Car turned off
TickTock 108:29b5a760adc2 690 if (repeatPoll) { // Log on shutdown if autopoll enabled
TickTock 108:29b5a760adc2 691 tripLog(); // Write trip log on powerdown
TickTock 108:29b5a760adc2 692 }
TickTock 49:a3d2c5bb3cfa 693 //write efficiency history data
TickTock 97:a25940fd7b5b 694 hfile = fopen("/local/ehist.cny", "w");
TickTock 97:a25940fd7b5b 695 if (hfile!=NULL){ // found a efficiency history file
TickTock 92:935adef49ea4 696 for(i=0;i<39;i++){
TickTock 97:a25940fd7b5b 697 fprintf(hfile,"%f %f\r\n",mph[i],kW[i]);
TickTock 49:a3d2c5bb3cfa 698 }
TickTock 97:a25940fd7b5b 699 fclose(hfile);
TickTock 49:a3d2c5bb3cfa 700 }
TickTock 49:a3d2c5bb3cfa 701 }
TickTock 107:e9be732c1ad4 702 if(!laccOn&&accOn){ // Car turned on
TickTock 108:29b5a760adc2 703 miles_trip[0]=0;
TickTock 108:29b5a760adc2 704 kWh_trip[0]=0;
TickTock 115:549410af477d 705 wait5secs=5;
TickTock 115:549410af477d 706 }
TickTock 115:549410af477d 707 laccOn=accOn;
TickTock 115:549410af477d 708 if(!accOn&&!logEn&&userIdle&&!playbackEn){ // Car off and logging disabled and no user activity
TickTock 115:549410af477d 709 dled = 0;
TickTock 115:549410af477d 710 }else if(!headlights){
TickTock 115:549410af477d 711 dled = ledHi;
TickTock 115:549410af477d 712 } else {
TickTock 115:549410af477d 713 dled = ledLo;
TickTock 115:549410af477d 714 }
TickTock 115:549410af477d 715 if(wait5secs>0){ // Wait a few seconds after poweron to give BMS time to measure CP's
TickTock 115:549410af477d 716 wait5secs-=1;
TickTock 115:549410af477d 717 if (repeatPoll&&(wait5secs==0)) { // Poll on startup if autopoll enabled
TickTock 108:29b5a760adc2 718 logOnce=true;
TickTock 112:b41b35401eb6 719 reqMsgCnt=0;
TickTock 123:a8c0042df617 720 msgReq.attach(&sendReq,0.035);
TickTock 108:29b5a760adc2 721 }
TickTock 107:e9be732c1ad4 722 }
TickTock 115:549410af477d 723
TickTock 49:a3d2c5bb3cfa 724 //compute historic efficiency
TickTock 41:8d4609ea7259 725 if(numSsamples>0){ // Avoid div0
TickTock 115:549410af477d 726 mph[0]=((float) motorRPM)/numSsamples/220; // Empirically derived with MXV4s - may change with different wheels&tires
TickTock 86:d1c9e8ac1c4b 727 } else {
TickTock 49:a3d2c5bb3cfa 728 mph[0]=0;
TickTock 36:dbd39c315258 729 }
TickTock 49:a3d2c5bb3cfa 730 if(mph[0]>99){
TickTock 49:a3d2c5bb3cfa 731 mph[0]=0;
TickTock 49:a3d2c5bb3cfa 732 }
TickTock 121:553faf139a20 733 numSsamples=0;
TickTock 107:e9be732c1ad4 734
TickTock 41:8d4609ea7259 735 if(numWsamples>0){ // Avoid div0
TickTock 121:553faf139a20 736 mpkWh[0]=mph[0];
TickTock 49:a3d2c5bb3cfa 737 kW[0]=((float) mWs_x4)/numWsamples/4e3;
TickTock 49:a3d2c5bb3cfa 738 mpkWh[0]/=kW[0];
TickTock 49:a3d2c5bb3cfa 739 if (mpkWh[0]<0) {
TickTock 49:a3d2c5bb3cfa 740 mpkWh[0]=99;// negative means inf.
TickTock 49:a3d2c5bb3cfa 741 }
TickTock 86:d1c9e8ac1c4b 742 } else {
TickTock 49:a3d2c5bb3cfa 743 kW[0]=0;
TickTock 49:a3d2c5bb3cfa 744 mpkWh[0]=0;
TickTock 49:a3d2c5bb3cfa 745 }
TickTock 121:553faf139a20 746 numWsamples=0;
TickTock 121:553faf139a20 747
TickTock 121:553faf139a20 748 if (!charging){
TickTock 121:553faf139a20 749 miles_trip[0]+=mph[0]/3600;
TickTock 121:553faf139a20 750 miles_trip[1]+=mph[0]/3600;
TickTock 121:553faf139a20 751 miles_trip[2]+=mph[0]/3600;
TickTock 121:553faf139a20 752 kWh_trip[0]+=kW[0]/3600;
TickTock 121:553faf139a20 753 kWh_trip[1]+=kW[0]/3600;
TickTock 121:553faf139a20 754 kWh_trip[2]+=kW[0]/3600;
TickTock 121:553faf139a20 755 }
TickTock 121:553faf139a20 756
TickTock 49:a3d2c5bb3cfa 757 motorRPM=0;
TickTock 40:0e6e71a7323f 758 mWs_x4=0;
TickTock 121:553faf139a20 759
TickTock 121:553faf139a20 760 // Compute ESR
TickTock 121:553faf139a20 761 if((Imax-Imin)<40){ // do nothing - insufficient delta_I to measure
TickTock 121:553faf139a20 762 unloadedV_x2 = (curRmax+curRmin)/2;
TickTock 120:041edeec08f5 763 }else if ((redRmax-redRmin)<(curRmax-curRmin)) {
TickTock 120:041edeec08f5 764 Resr-=0.001;
TickTock 120:041edeec08f5 765 unloadedV_x2 = (redRmax+redRmin)/2;
TickTock 120:041edeec08f5 766 } else if ((incRmax-incRmin)<(curRmax-curRmin)) {
TickTock 120:041edeec08f5 767 Resr+=0.001;
TickTock 120:041edeec08f5 768 unloadedV_x2 = (incRmax+incRmin)/2;
TickTock 120:041edeec08f5 769 } else {
TickTock 120:041edeec08f5 770 unloadedV_x2 = (curRmax+curRmin)/2;
TickTock 120:041edeec08f5 771 }
TickTock 120:041edeec08f5 772 curRmin=1000;
TickTock 120:041edeec08f5 773 curRmax=0;
TickTock 120:041edeec08f5 774 incRmin=1000;
TickTock 120:041edeec08f5 775 incRmax=0;
TickTock 120:041edeec08f5 776 redRmin=1000;
TickTock 120:041edeec08f5 777 redRmax=0;
TickTock 121:553faf139a20 778 Imax=-1000;
TickTock 121:553faf139a20 779 Imin=1000;
TickTock 121:553faf139a20 780
TickTock 121:553faf139a20 781 if((accOn||playbackEn)&&!charging){
TickTock 92:935adef49ea4 782 for(i=1;i<39;i++){
TickTock 49:a3d2c5bb3cfa 783 average=mph[i]/timeConstant[i];
TickTock 49:a3d2c5bb3cfa 784 mph[i]-=average;
TickTock 52:d5385fbf4ea1 785 mph[i]+=mph[0];
TickTock 52:d5385fbf4ea1 786 mpkWh[i]=average;
TickTock 49:a3d2c5bb3cfa 787 average=kW[i]/timeConstant[i];
TickTock 121:553faf139a20 788 if(!charging){ //Not charging - so include in efficiency data
TickTock 97:a25940fd7b5b 789 kW[i]-=average;
TickTock 97:a25940fd7b5b 790 kW[i]+=kW[0];
TickTock 97:a25940fd7b5b 791 }
TickTock 52:d5385fbf4ea1 792 mpkWh[i]/=average;
TickTock 49:a3d2c5bb3cfa 793 if (mpkWh[i]<0) {
TickTock 49:a3d2c5bb3cfa 794 mpkWh[i]=99;// negative means inf.
TickTock 49:a3d2c5bb3cfa 795 }
TickTock 49:a3d2c5bb3cfa 796 //mpkWh[i]=floor(mpkWh[i]*10+0.5)/10; // Round to nearest 10th
TickTock 52:d5385fbf4ea1 797 }
TickTock 49:a3d2c5bb3cfa 798 }
TickTock 108:29b5a760adc2 799 if(logCP&&usbEn){
TickTock 108:29b5a760adc2 800 if(logOnce){
TickTock 108:29b5a760adc2 801 tripLog();
TickTock 108:29b5a760adc2 802 logOnce=false;
TickTock 108:29b5a760adc2 803 }
garygid 69:6bfdfc002036 804 logPackVoltages(); // Turbo3, only call
TickTock 108:29b5a760adc2 805 }
TickTock 112:b41b35401eb6 806 if(!usbEn&&!waitasec){
TickTock 108:29b5a760adc2 807 usbEn=detectUSB(); // Keep looking if none found
TickTock 108:29b5a760adc2 808 }
TickTock 111:d1559bb25c43 809 waitasec=false; // work around to avoid hang when USB tries to init immediately
TickTock 121:553faf139a20 810 tock=true;
TickTock 121:553faf139a20 811 } // tick
TickTock 36:dbd39c315258 812
TickTock 39:eef8beac7411 813 display=display<1?display+1:0; // toggle display
TickTock 39:eef8beac7411 814 updateDisplay(display);
TickTock 39:eef8beac7411 815
TickTock 36:dbd39c315258 816 if(step){ // playback
TickTock 36:dbd39c315258 817 if(playbackOpen&&playbackEn){
TickTock 92:935adef49ea4 818 for(i=0;i<120;i++){
TickTock 109:3e6f0e8fca0d 819 if(!f_eof(&efile)){
TickTock 109:3e6f0e8fca0d 820 efr=f_read(&efile,&header,5,&bytesRW);
TickTock 109:3e6f0e8fca0d 821 efr=f_read(&efile,&data,8,&bytesRW);
garygid 69:6bfdfc002036 822 logCan(header[0],CANMessage(0x7ff&((header[4]<<8)+header[3]), data, 8)); // Playback
TickTock 86:d1c9e8ac1c4b 823 } else {
TickTock 109:3e6f0e8fca0d 824 f_close(&efile); // restart
TickTock 109:3e6f0e8fca0d 825 efr = f_open(&efile,"playback.alc",FA_READ|FA_OPEN_EXISTING);
TickTock 50:83d5864c64a0 826 lastDMode[whichTouched]=99;//force refresh
TickTock 36:dbd39c315258 827 spkr.beep(2000,0.25);
TickTock 36:dbd39c315258 828 }
TickTock 36:dbd39c315258 829 }
TickTock 36:dbd39c315258 830 }
TickTock 36:dbd39c315258 831 step=false;
TickTock 36:dbd39c315258 832 }
TickTock 37:fea2c1d52c5f 833
TickTock 2:71b1999a8ea5 834 } //while (true)
TickTock 0:1596b8644523 835 }