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