Dual CANbus monitor and instrumentation cluster supporting ILI9341 display controller

Dependencies:   SPI_TFTx2_ILI9341 TOUCH_TFTx2_ILI9341 TFT_fonts mbed

Fork of CANary by Tick Tock

Committer:
TickTock
Date:
Sat Oct 19 15:38:44 2013 +0000
Revision:
155:f31006516956
Parent:
154:90ea16ca7475
Child:
156:4e5d30535cf9
// Added workaround to  spkr and dled pwn not being independently controlled in hw; // Added ambient temperature to trip log; // Save Resr in history file so it doesn't reset to 75mOhms on CANary reset; // Fixed Reser formatting to %4.3f;

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