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

Dependencies:   SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2_ILI9341 mbed

Fork of CANary_corrupt by Tick Tock

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

User Guide

Eagle Schematic and Board design

/media/uploads/TickTock/canaryr6.zip

/media/uploads/TickTock/canary_sch.jpg

/media/uploads/TickTock/canaryr6brd.jpg

For LCD Rev 1.01:

/media/uploads/TickTock/lcdsch.jpg

For VCD Rev 2.00:

/media/uploads/TickTock/lcdr2.jpg

Parts List

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

Assembly

1) LCD Displays

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

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

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

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

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

Examples of REV1.01 boards:

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

Examples of REV2.00:

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

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

2) PCB

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

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

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

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

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

3) Testing

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

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

4) Enclosure

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

5) Final Assembly

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

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

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

Who changed what in which revision?

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