Revision 4:8d7759f4fe7a, committed 2013-02-17

Comitter:

TickTock

Date:

Sun Feb 17 16:44:59 2013 +0000

Parent:

3:3e879b043bc5

Child:

5:ebf6fa994b78

Commit message:

Added configuration menu and sticky log screen

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CANary.h	Sun Feb 17 16:44:59 2013 +0000
@@ -0,0 +1,103 @@
+//CANary
+
+#include "mbed.h"
+#include "CAN.h"
+#include "beep.h"
+#include "MSCFileSystem.h"
+#include "SPI_TFTx2.h"
+#include "Arial12x12.h"
+#include "Arial12x12_prop.h"
+#include "Arial28x28.h"
+#include "TOUCH_TFTx2.h"
+#include "PowerControl.h"
+#include "EthernetPowerControl.h"
+#define upLine "\033[1A"
+#define maxBufLen 1536
+#define canTimeout 500
+#define userTimeout 5
+#define maxModes 6
+#define offMode 0
+#define logMode 1
+#define dteMode 2
+#define brakeMode 3
+#define powerMode 4
+#define controlMode 5
+#define monitorMode 6
+#define btn31x1 12
+#define btn31x2 101
+#define btn32x1 115
+#define btn32x2 204
+#define btn33x1 218
+#define btn33x2 307
+#define btn11y1 180
+#define btn11y2 229
+
+//LEAF OBD
+//1:
+//2:
+//3:    AVCAN-L     White/Blue
+//4:
+//5:    VSS         Brown,White/Brown
+//6:    CARCAN-H    Green
+//7:
+//8:    12V-SW      Orange,White/Orange
+//9:
+//10:
+//11:   AVCAN-H     Blue
+//12:   EVCAN-L     White/Grey
+//13:   EVCAN-H     Grey
+//14:   CARCAN-L    White/Green
+//15:
+//16:   12V-AON     Red/Blue,Blue/Red
+
+//VP230
+//1:D   
+//2:GND 
+//3:VCC 
+//4:R   
+//5:Vref
+//6:CANL
+//7:CANH
+//8:RS
+
+//LPC1768
+//1:    VSS
+//2:        NC:VIN  (4.5-9V supply)
+//3:        NC:VB
+//4:        NC:nR
+//5:    SPI:CS0
+//6:    SPI:CS1
+//7:    SPI:Reset
+//8:    CAN1:Sleep -->  8:CAN1:RS
+//9:    CAN1:RX    -->  4:CAN1:R
+//10:   CAN1:TX    -->  1:CAN1:D
+//11:   SPI:MOSI
+//12:   SPI:MISO
+//13:   SPI:SCLK
+//14:       NC:Ain
+//15:   MON12V     -->  4K to 12V, 1K to VSS  (To be implemented)
+//16:   TOUCH_X+
+//17:   TOUCH_X-
+//18:       NC:Aout
+//19:   TOUCH_Y+
+//20:   TOUCH_Y-
+//21:   Spkr+
+//22:   Spkr-           (optional complimentary output for more volume)
+//23:       NC:pwm
+//24:       LED
+//25:       NC:pwm
+//26:       NC:pwm
+//27:       NC
+//28:   CAN2:Sleep -->  8:CAN2:RS
+//29:   CAN2:TX    -->  1:CAN2:D
+//30:   CAN2:RX    -->  4:CAN2:R
+//31:   USB_D+
+//32:   USB_D-
+//33:       NC:Eth_TD+
+//34:       NC:Eth_TD-
+//35:       NC:Eth_RD+
+//36:       NC:Eth_RD-
+//37:       NC:IF+
+//38:       NC:IF-
+//39:       NC:5Vout (only available when connected as USB device)
+//40:   VCC3.3

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/PowerControl/EthernetPowerControl.cpp	Sun Feb 17 16:44:59 2013 +0000
@@ -0,0 +1,138 @@
+#include "EthernetPowerControl.h"
+
+static void write_PHY (unsigned int PhyReg, unsigned short Value) {
+   /* Write a data 'Value' to PHY register 'PhyReg'. */
+   unsigned int tout;
+   /* Hardware MII Management for LPC176x devices. */
+   LPC_EMAC->MADR = DP83848C_DEF_ADR | PhyReg;
+   LPC_EMAC->MWTD = Value;
+
+   /* Wait utill operation completed */
+   for (tout = 0; tout < MII_WR_TOUT; tout++) {
+      if ((LPC_EMAC->MIND & MIND_BUSY) == 0) {
+         break;
+      }
+   }
+}
+
+static unsigned short read_PHY (unsigned int PhyReg) {
+   /* Read a PHY register 'PhyReg'. */
+   unsigned int tout, val;
+
+   LPC_EMAC->MADR = DP83848C_DEF_ADR | PhyReg;
+   LPC_EMAC->MCMD = MCMD_READ;
+
+   /* Wait until operation completed */
+   for (tout = 0; tout < MII_RD_TOUT; tout++) {
+      if ((LPC_EMAC->MIND & MIND_BUSY) == 0) {
+         break;
+      }
+   }
+   LPC_EMAC->MCMD = 0;
+   val = LPC_EMAC->MRDD;
+   
+   return (val);
+}
+
+void EMAC_Init()
+{
+  unsigned int tout,regv;
+  /* Power Up the EMAC controller. */
+  Peripheral_PowerUp(LPC1768_PCONP_PCENET);
+  
+  LPC_PINCON->PINSEL2 = 0x50150105;
+  LPC_PINCON->PINSEL3 &= ~0x0000000F;
+  LPC_PINCON->PINSEL3 |= 0x00000005;
+
+  /* Reset all EMAC internal modules. */
+  LPC_EMAC->MAC1 = MAC1_RES_TX | MAC1_RES_MCS_TX | MAC1_RES_RX | MAC1_RES_MCS_RX |
+             MAC1_SIM_RES | MAC1_SOFT_RES;
+  LPC_EMAC->Command = CR_REG_RES | CR_TX_RES | CR_RX_RES;
+
+  /* A short delay after reset. */
+  for (tout = 100; tout; tout--);
+
+  /* Initialize MAC control registers. */
+  LPC_EMAC->MAC1 = MAC1_PASS_ALL;
+  LPC_EMAC->MAC2 = MAC2_CRC_EN | MAC2_PAD_EN;
+  LPC_EMAC->MAXF = ETH_MAX_FLEN;
+  LPC_EMAC->CLRT = CLRT_DEF;
+  LPC_EMAC->IPGR = IPGR_DEF;
+
+  /* Enable Reduced MII interface. */
+  LPC_EMAC->Command = CR_RMII | CR_PASS_RUNT_FRM;
+
+  /* Reset Reduced MII Logic. */
+  LPC_EMAC->SUPP = SUPP_RES_RMII;
+  for (tout = 100; tout; tout--);
+  LPC_EMAC->SUPP = 0;
+
+  /* Put the DP83848C in reset mode */
+  write_PHY (PHY_REG_BMCR, 0x8000);
+
+  /* Wait for hardware reset to end. */
+  for (tout = 0; tout < 0x100000; tout++) {
+    regv = read_PHY (PHY_REG_BMCR);
+    if (!(regv & 0x8000)) {
+      /* Reset complete */
+      break;
+    }
+  }
+}
+
+
+void PHY_PowerDown()
+{
+    if (!Peripheral_GetStatus(LPC1768_PCONP_PCENET))
+        EMAC_Init(); //init EMAC if it is not already init'd
+    
+    unsigned int regv;
+    regv = read_PHY(PHY_REG_BMCR);
+    write_PHY(PHY_REG_BMCR, regv | (1 << PHY_REG_BMCR_POWERDOWN));
+    regv = read_PHY(PHY_REG_BMCR);
+    
+    //shouldn't need the EMAC now.
+    Peripheral_PowerDown(LPC1768_PCONP_PCENET);
+    
+    //and turn off the PHY OSC
+     LPC_GPIO1->FIODIR |= 0x8000000;
+     LPC_GPIO1->FIOCLR = 0x8000000;
+}
+
+void PHY_PowerUp()
+{   
+    if (!Peripheral_GetStatus(LPC1768_PCONP_PCENET))
+        EMAC_Init(); //init EMAC if it is not already init'd
+        
+    LPC_GPIO1->FIODIR |= 0x8000000;
+    LPC_GPIO1->FIOSET = 0x8000000;
+    
+    //wait for osc to be stable
+    wait_ms(200);
+    
+    unsigned int regv;
+    regv = read_PHY(PHY_REG_BMCR);
+    write_PHY(PHY_REG_BMCR, regv & ~(1 << PHY_REG_BMCR_POWERDOWN));
+    regv = read_PHY(PHY_REG_BMCR);
+}
+
+void PHY_EnergyDetect_Enable()
+{
+    if (!Peripheral_GetStatus(LPC1768_PCONP_PCENET))
+        EMAC_Init(); //init EMAC if it is not already init'd
+        
+    unsigned int regv;
+    regv = read_PHY(PHY_REG_EDCR);
+    write_PHY(PHY_REG_BMCR, regv | (1 << PHY_REG_EDCR_ENABLE));
+    regv = read_PHY(PHY_REG_EDCR);   
+}
+
+void PHY_EnergyDetect_Disable()
+{
+    if (!Peripheral_GetStatus(LPC1768_PCONP_PCENET))
+        EMAC_Init(); //init EMAC if it is not already init'd
+    unsigned int regv;
+    regv = read_PHY(PHY_REG_EDCR);
+    write_PHY(PHY_REG_BMCR, regv & ~(1 << PHY_REG_EDCR_ENABLE));
+    regv = read_PHY(PHY_REG_EDCR);   
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/PowerControl/EthernetPowerControl.h	Sun Feb 17 16:44:59 2013 +0000
@@ -0,0 +1,299 @@
+/* mbed PowerControl Library
+  * Copyright (c) 2010 Michael Wei
+  */ 
+  
+#ifndef MBED_POWERCONTROL_ETH_H 
+#define MBED_POWERCONTROL_ETH_H 
+
+#include "mbed.h"
+#include "PowerControl.h"
+
+#define PHY_REG_BMCR_POWERDOWN    0xB
+#define PHY_REG_EDCR_ENABLE       0xF
+
+
+void EMAC_Init();
+static unsigned short read_PHY (unsigned int PhyReg);
+static void write_PHY (unsigned int PhyReg, unsigned short Value);
+
+void PHY_PowerDown(void);
+void PHY_PowerUp(void);
+void PHY_EnergyDetect_Enable(void);
+void PHY_EnergyDetect_Disable(void);
+
+//From NXP Sample Code .... Probably from KEIL sample code
+/* EMAC Memory Buffer configuration for 16K Ethernet RAM. */
+#define NUM_RX_FRAG         4           /* Num.of RX Fragments 4*1536= 6.0kB */
+#define NUM_TX_FRAG         3           /* Num.of TX Fragments 3*1536= 4.6kB */
+#define ETH_FRAG_SIZE       1536        /* Packet Fragment size 1536 Bytes   */
+
+#define ETH_MAX_FLEN        1536        /* Max. Ethernet Frame Size          */
+
+/* EMAC variables located in 16K Ethernet SRAM */
+#define RX_DESC_BASE        0x20080000
+#define RX_STAT_BASE        (RX_DESC_BASE + NUM_RX_FRAG*8)
+#define TX_DESC_BASE        (RX_STAT_BASE + NUM_RX_FRAG*8)
+#define TX_STAT_BASE        (TX_DESC_BASE + NUM_TX_FRAG*8)
+#define RX_BUF_BASE         (TX_STAT_BASE + NUM_TX_FRAG*4)
+#define TX_BUF_BASE         (RX_BUF_BASE  + NUM_RX_FRAG*ETH_FRAG_SIZE)
+
+/* RX and TX descriptor and status definitions. */
+#define RX_DESC_PACKET(i)   (*(unsigned int *)(RX_DESC_BASE   + 8*i))
+#define RX_DESC_CTRL(i)     (*(unsigned int *)(RX_DESC_BASE+4 + 8*i))
+#define RX_STAT_INFO(i)     (*(unsigned int *)(RX_STAT_BASE   + 8*i))
+#define RX_STAT_HASHCRC(i)  (*(unsigned int *)(RX_STAT_BASE+4 + 8*i))
+#define TX_DESC_PACKET(i)   (*(unsigned int *)(TX_DESC_BASE   + 8*i))
+#define TX_DESC_CTRL(i)     (*(unsigned int *)(TX_DESC_BASE+4 + 8*i))
+#define TX_STAT_INFO(i)     (*(unsigned int *)(TX_STAT_BASE   + 4*i))
+#define RX_BUF(i)           (RX_BUF_BASE + ETH_FRAG_SIZE*i)
+#define TX_BUF(i)           (TX_BUF_BASE + ETH_FRAG_SIZE*i)
+
+/* MAC Configuration Register 1 */
+#define MAC1_REC_EN         0x00000001  /* Receive Enable                    */
+#define MAC1_PASS_ALL       0x00000002  /* Pass All Receive Frames           */
+#define MAC1_RX_FLOWC       0x00000004  /* RX Flow Control                   */
+#define MAC1_TX_FLOWC       0x00000008  /* TX Flow Control                   */
+#define MAC1_LOOPB          0x00000010  /* Loop Back Mode                    */
+#define MAC1_RES_TX         0x00000100  /* Reset TX Logic                    */
+#define MAC1_RES_MCS_TX     0x00000200  /* Reset MAC TX Control Sublayer     */
+#define MAC1_RES_RX         0x00000400  /* Reset RX Logic                    */
+#define MAC1_RES_MCS_RX     0x00000800  /* Reset MAC RX Control Sublayer     */
+#define MAC1_SIM_RES        0x00004000  /* Simulation Reset                  */
+#define MAC1_SOFT_RES       0x00008000  /* Soft Reset MAC                    */
+
+/* MAC Configuration Register 2 */
+#define MAC2_FULL_DUP       0x00000001  /* Full Duplex Mode                  */
+#define MAC2_FRM_LEN_CHK    0x00000002  /* Frame Length Checking             */
+#define MAC2_HUGE_FRM_EN    0x00000004  /* Huge Frame Enable                 */
+#define MAC2_DLY_CRC        0x00000008  /* Delayed CRC Mode                  */
+#define MAC2_CRC_EN         0x00000010  /* Append CRC to every Frame         */
+#define MAC2_PAD_EN         0x00000020  /* Pad all Short Frames              */
+#define MAC2_VLAN_PAD_EN    0x00000040  /* VLAN Pad Enable                   */
+#define MAC2_ADET_PAD_EN    0x00000080  /* Auto Detect Pad Enable            */
+#define MAC2_PPREAM_ENF     0x00000100  /* Pure Preamble Enforcement         */
+#define MAC2_LPREAM_ENF     0x00000200  /* Long Preamble Enforcement         */
+#define MAC2_NO_BACKOFF     0x00001000  /* No Backoff Algorithm              */
+#define MAC2_BACK_PRESSURE  0x00002000  /* Backoff Presurre / No Backoff     */
+#define MAC2_EXCESS_DEF     0x00004000  /* Excess Defer                      */
+
+/* Back-to-Back Inter-Packet-Gap Register */
+#define IPGT_FULL_DUP       0x00000015  /* Recommended value for Full Duplex */
+#define IPGT_HALF_DUP       0x00000012  /* Recommended value for Half Duplex */
+
+/* Non Back-to-Back Inter-Packet-Gap Register */
+#define IPGR_DEF            0x00000012  /* Recommended value                 */
+
+/* Collision Window/Retry Register */
+#define CLRT_DEF            0x0000370F  /* Default value                     */
+
+/* PHY Support Register */
+#define SUPP_SPEED          0x00000100  /* Reduced MII Logic Current Speed   */
+#define SUPP_RES_RMII       0x00000800  /* Reset Reduced MII Logic           */
+
+/* Test Register */
+#define TEST_SHCUT_PQUANTA  0x00000001  /* Shortcut Pause Quanta             */
+#define TEST_TST_PAUSE      0x00000002  /* Test Pause                        */
+#define TEST_TST_BACKP      0x00000004  /* Test Back Pressure                */
+
+/* MII Management Configuration Register */
+#define MCFG_SCAN_INC       0x00000001  /* Scan Increment PHY Address        */
+#define MCFG_SUPP_PREAM     0x00000002  /* Suppress Preamble                 */
+#define MCFG_CLK_SEL        0x0000001C  /* Clock Select Mask                 */
+#define MCFG_RES_MII        0x00008000  /* Reset MII Management Hardware     */
+
+/* MII Management Command Register */
+#define MCMD_READ           0x00000001  /* MII Read                          */
+#define MCMD_SCAN           0x00000002  /* MII Scan continuously             */
+
+#define MII_WR_TOUT         0x00050000  /* MII Write timeout count           */
+#define MII_RD_TOUT         0x00050000  /* MII Read timeout count            */
+
+/* MII Management Address Register */
+#define MADR_REG_ADR        0x0000001F  /* MII Register Address Mask         */
+#define MADR_PHY_ADR        0x00001F00  /* PHY Address Mask                  */
+
+/* MII Management Indicators Register */
+#define MIND_BUSY           0x00000001  /* MII is Busy                       */
+#define MIND_SCAN           0x00000002  /* MII Scanning in Progress          */
+#define MIND_NOT_VAL        0x00000004  /* MII Read Data not valid           */
+#define MIND_MII_LINK_FAIL  0x00000008  /* MII Link Failed                   */
+
+/* Command Register */
+#define CR_RX_EN            0x00000001  /* Enable Receive                    */
+#define CR_TX_EN            0x00000002  /* Enable Transmit                   */
+#define CR_REG_RES          0x00000008  /* Reset Host Registers              */
+#define CR_TX_RES           0x00000010  /* Reset Transmit Datapath           */
+#define CR_RX_RES           0x00000020  /* Reset Receive Datapath            */
+#define CR_PASS_RUNT_FRM    0x00000040  /* Pass Runt Frames                  */
+#define CR_PASS_RX_FILT     0x00000080  /* Pass RX Filter                    */
+#define CR_TX_FLOW_CTRL     0x00000100  /* TX Flow Control                   */
+#define CR_RMII             0x00000200  /* Reduced MII Interface             */
+#define CR_FULL_DUP         0x00000400  /* Full Duplex                       */
+
+/* Status Register */
+#define SR_RX_EN            0x00000001  /* Enable Receive                    */
+#define SR_TX_EN            0x00000002  /* Enable Transmit                   */
+
+/* Transmit Status Vector 0 Register */
+#define TSV0_CRC_ERR        0x00000001  /* CRC error                         */
+#define TSV0_LEN_CHKERR     0x00000002  /* Length Check Error                */
+#define TSV0_LEN_OUTRNG     0x00000004  /* Length Out of Range               */
+#define TSV0_DONE           0x00000008  /* Tramsmission Completed            */
+#define TSV0_MCAST          0x00000010  /* Multicast Destination             */
+#define TSV0_BCAST          0x00000020  /* Broadcast Destination             */
+#define TSV0_PKT_DEFER      0x00000040  /* Packet Deferred                   */
+#define TSV0_EXC_DEFER      0x00000080  /* Excessive Packet Deferral         */
+#define TSV0_EXC_COLL       0x00000100  /* Excessive Collision               */
+#define TSV0_LATE_COLL      0x00000200  /* Late Collision Occured            */
+#define TSV0_GIANT          0x00000400  /* Giant Frame                       */
+#define TSV0_UNDERRUN       0x00000800  /* Buffer Underrun                   */
+#define TSV0_BYTES          0x0FFFF000  /* Total Bytes Transferred           */
+#define TSV0_CTRL_FRAME     0x10000000  /* Control Frame                     */
+#define TSV0_PAUSE          0x20000000  /* Pause Frame                       */
+#define TSV0_BACK_PRESS     0x40000000  /* Backpressure Method Applied       */
+#define TSV0_VLAN           0x80000000  /* VLAN Frame                        */
+
+/* Transmit Status Vector 1 Register */
+#define TSV1_BYTE_CNT       0x0000FFFF  /* Transmit Byte Count               */
+#define TSV1_COLL_CNT       0x000F0000  /* Transmit Collision Count          */
+
+/* Receive Status Vector Register */
+#define RSV_BYTE_CNT        0x0000FFFF  /* Receive Byte Count                */
+#define RSV_PKT_IGNORED     0x00010000  /* Packet Previously Ignored         */
+#define RSV_RXDV_SEEN       0x00020000  /* RXDV Event Previously Seen        */
+#define RSV_CARR_SEEN       0x00040000  /* Carrier Event Previously Seen     */
+#define RSV_REC_CODEV       0x00080000  /* Receive Code Violation            */
+#define RSV_CRC_ERR         0x00100000  /* CRC Error                         */
+#define RSV_LEN_CHKERR      0x00200000  /* Length Check Error                */
+#define RSV_LEN_OUTRNG      0x00400000  /* Length Out of Range               */
+#define RSV_REC_OK          0x00800000  /* Frame Received OK                 */
+#define RSV_MCAST           0x01000000  /* Multicast Frame                   */
+#define RSV_BCAST           0x02000000  /* Broadcast Frame                   */
+#define RSV_DRIB_NIBB       0x04000000  /* Dribble Nibble                    */
+#define RSV_CTRL_FRAME      0x08000000  /* Control Frame                     */
+#define RSV_PAUSE           0x10000000  /* Pause Frame                       */
+#define RSV_UNSUPP_OPC      0x20000000  /* Unsupported Opcode                */
+#define RSV_VLAN            0x40000000  /* VLAN Frame                        */
+
+/* Flow Control Counter Register */
+#define FCC_MIRR_CNT        0x0000FFFF  /* Mirror Counter                    */
+#define FCC_PAUSE_TIM       0xFFFF0000  /* Pause Timer                       */
+
+/* Flow Control Status Register */
+#define FCS_MIRR_CNT        0x0000FFFF  /* Mirror Counter Current            */
+
+/* Receive Filter Control Register */
+#define RFC_UCAST_EN        0x00000001  /* Accept Unicast Frames Enable      */
+#define RFC_BCAST_EN        0x00000002  /* Accept Broadcast Frames Enable    */
+#define RFC_MCAST_EN        0x00000004  /* Accept Multicast Frames Enable    */
+#define RFC_UCAST_HASH_EN   0x00000008  /* Accept Unicast Hash Filter Frames */
+#define RFC_MCAST_HASH_EN   0x00000010  /* Accept Multicast Hash Filter Fram.*/
+#define RFC_PERFECT_EN      0x00000020  /* Accept Perfect Match Enable       */
+#define RFC_MAGP_WOL_EN     0x00001000  /* Magic Packet Filter WoL Enable    */
+#define RFC_PFILT_WOL_EN    0x00002000  /* Perfect Filter WoL Enable         */
+
+/* Receive Filter WoL Status/Clear Registers */
+#define WOL_UCAST           0x00000001  /* Unicast Frame caused WoL          */
+#define WOL_BCAST           0x00000002  /* Broadcast Frame caused WoL        */
+#define WOL_MCAST           0x00000004  /* Multicast Frame caused WoL        */
+#define WOL_UCAST_HASH      0x00000008  /* Unicast Hash Filter Frame WoL     */
+#define WOL_MCAST_HASH      0x00000010  /* Multicast Hash Filter Frame WoL   */
+#define WOL_PERFECT         0x00000020  /* Perfect Filter WoL                */
+#define WOL_RX_FILTER       0x00000080  /* RX Filter caused WoL              */
+#define WOL_MAG_PACKET      0x00000100  /* Magic Packet Filter caused WoL    */
+
+/* Interrupt Status/Enable/Clear/Set Registers */
+#define INT_RX_OVERRUN      0x00000001  /* Overrun Error in RX Queue         */
+#define INT_RX_ERR          0x00000002  /* Receive Error                     */
+#define INT_RX_FIN          0x00000004  /* RX Finished Process Descriptors   */
+#define INT_RX_DONE         0x00000008  /* Receive Done                      */
+#define INT_TX_UNDERRUN     0x00000010  /* Transmit Underrun                 */
+#define INT_TX_ERR          0x00000020  /* Transmit Error                    */
+#define INT_TX_FIN          0x00000040  /* TX Finished Process Descriptors   */
+#define INT_TX_DONE         0x00000080  /* Transmit Done                     */
+#define INT_SOFT_INT        0x00001000  /* Software Triggered Interrupt      */
+#define INT_WAKEUP          0x00002000  /* Wakeup Event Interrupt            */
+
+/* Power Down Register */
+#define PD_POWER_DOWN       0x80000000  /* Power Down MAC                    */
+
+/* RX Descriptor Control Word */
+#define RCTRL_SIZE          0x000007FF  /* Buffer size mask                  */
+#define RCTRL_INT           0x80000000  /* Generate RxDone Interrupt         */
+
+/* RX Status Hash CRC Word */
+#define RHASH_SA            0x000001FF  /* Hash CRC for Source Address       */
+#define RHASH_DA            0x001FF000  /* Hash CRC for Destination Address  */
+
+/* RX Status Information Word */
+#define RINFO_SIZE          0x000007FF  /* Data size in bytes                */
+#define RINFO_CTRL_FRAME    0x00040000  /* Control Frame                     */
+#define RINFO_VLAN          0x00080000  /* VLAN Frame                        */
+#define RINFO_FAIL_FILT     0x00100000  /* RX Filter Failed                  */
+#define RINFO_MCAST         0x00200000  /* Multicast Frame                   */
+#define RINFO_BCAST         0x00400000  /* Broadcast Frame                   */
+#define RINFO_CRC_ERR       0x00800000  /* CRC Error in Frame                */
+#define RINFO_SYM_ERR       0x01000000  /* Symbol Error from PHY             */
+#define RINFO_LEN_ERR       0x02000000  /* Length Error                      */
+#define RINFO_RANGE_ERR     0x04000000  /* Range Error (exceeded max. size)  */
+#define RINFO_ALIGN_ERR     0x08000000  /* Alignment Error                   */
+#define RINFO_OVERRUN       0x10000000  /* Receive overrun                   */
+#define RINFO_NO_DESCR      0x20000000  /* No new Descriptor available       */
+#define RINFO_LAST_FLAG     0x40000000  /* Last Fragment in Frame            */
+#define RINFO_ERR           0x80000000  /* Error Occured (OR of all errors)  */
+
+#define RINFO_ERR_MASK     (RINFO_FAIL_FILT | RINFO_CRC_ERR   | RINFO_SYM_ERR | \
+                            RINFO_LEN_ERR   | RINFO_ALIGN_ERR | RINFO_OVERRUN)
+
+/* TX Descriptor Control Word */
+#define TCTRL_SIZE          0x000007FF  /* Size of data buffer in bytes      */
+#define TCTRL_OVERRIDE      0x04000000  /* Override Default MAC Registers    */
+#define TCTRL_HUGE          0x08000000  /* Enable Huge Frame                 */
+#define TCTRL_PAD           0x10000000  /* Pad short Frames to 64 bytes      */
+#define TCTRL_CRC           0x20000000  /* Append a hardware CRC to Frame    */
+#define TCTRL_LAST          0x40000000  /* Last Descriptor for TX Frame      */
+#define TCTRL_INT           0x80000000  /* Generate TxDone Interrupt         */
+
+/* TX Status Information Word */
+#define TINFO_COL_CNT       0x01E00000  /* Collision Count                   */
+#define TINFO_DEFER         0x02000000  /* Packet Deferred (not an error)    */
+#define TINFO_EXCESS_DEF    0x04000000  /* Excessive Deferral                */
+#define TINFO_EXCESS_COL    0x08000000  /* Excessive Collision               */
+#define TINFO_LATE_COL      0x10000000  /* Late Collision Occured            */
+#define TINFO_UNDERRUN      0x20000000  /* Transmit Underrun                 */
+#define TINFO_NO_DESCR      0x40000000  /* No new Descriptor available       */
+#define TINFO_ERR           0x80000000  /* Error Occured (OR of all errors)  */
+
+/* DP83848C PHY Registers */
+#define PHY_REG_BMCR        0x00        /* Basic Mode Control Register       */
+#define PHY_REG_BMSR        0x01        /* Basic Mode Status Register        */
+#define PHY_REG_IDR1        0x02        /* PHY Identifier 1                  */
+#define PHY_REG_IDR2        0x03        /* PHY Identifier 2                  */
+#define PHY_REG_ANAR        0x04        /* Auto-Negotiation Advertisement    */
+#define PHY_REG_ANLPAR      0x05        /* Auto-Neg. Link Partner Abitily    */
+#define PHY_REG_ANER        0x06        /* Auto-Neg. Expansion Register      */
+#define PHY_REG_ANNPTR      0x07        /* Auto-Neg. Next Page TX            */
+
+/* PHY Extended Registers */
+#define PHY_REG_STS         0x10        /* Status Register                   */
+#define PHY_REG_MICR        0x11        /* MII Interrupt Control Register    */
+#define PHY_REG_MISR        0x12        /* MII Interrupt Status Register     */
+#define PHY_REG_FCSCR       0x14        /* False Carrier Sense Counter       */
+#define PHY_REG_RECR        0x15        /* Receive Error Counter             */
+#define PHY_REG_PCSR        0x16        /* PCS Sublayer Config. and Status   */
+#define PHY_REG_RBR         0x17        /* RMII and Bypass Register          */
+#define PHY_REG_LEDCR       0x18        /* LED Direct Control Register       */
+#define PHY_REG_PHYCR       0x19        /* PHY Control Register              */
+#define PHY_REG_10BTSCR     0x1A        /* 10Base-T Status/Control Register  */
+#define PHY_REG_CDCTRL1     0x1B        /* CD Test Control and BIST Extens.  */
+#define PHY_REG_EDCR        0x1D        /* Energy Detect Control Register    */
+
+#define PHY_FULLD_100M      0x2100      /* Full Duplex 100Mbit               */
+#define PHY_HALFD_100M      0x2000      /* Half Duplex 100Mbit               */
+#define PHY_FULLD_10M       0x0100      /* Full Duplex 10Mbit                */
+#define PHY_HALFD_10M       0x0000      /* Half Duplex 10MBit                */
+#define PHY_AUTO_NEG        0x3000      /* Select Auto Negotiation           */
+
+#define DP83848C_DEF_ADR    0x0100      /* Default PHY device address        */
+#define DP83848C_ID         0x20005C90  /* PHY Identifier                    */
+#endif
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/PowerControl/PowerControl.h	Sun Feb 17 16:44:59 2013 +0000
@@ -0,0 +1,192 @@
+/* mbed PowerControl Library
+  * Copyright (c) 2010 Michael Wei
+  */ 
+  
+#ifndef MBED_POWERCONTROL_H 
+#define MBED_POWERCONTROL_H 
+
+//shouldn't have to include, but fixes weird problems with defines
+#include "LPC1768/LPC17xx.h"
+
+//System Control Register
+// bit 0: Reserved
+// bit 1: Sleep on Exit
+#define LPC1768_SCR_SLEEPONEXIT     0x2
+// bit 2: Deep Sleep
+#define LPC1768_SCR_SLEEPDEEP       0x4
+// bit 3: Resereved
+// bit 4: Send on Pending
+#define LPC1768_SCR_SEVONPEND        0x10
+// bit 5-31: Reserved
+
+//Power Control Register
+// bit 0: Power mode control bit 0 (power-down mode)
+#define LPC1768_PCON_PM0            0x1
+// bit 1: Power mode control bit 1 (deep power-down mode)
+#define LPC1768_PCON_PM1            0x2
+// bit 2: Brown-out reduced power mode
+#define LPC1768_PCON_BODRPM         0x4
+// bit 3: Brown-out global disable
+#define LPC1768_PCON_BOGD           0x8
+// bit 4: Brown-out reset disable
+#define LPC1768_PCON_BORD           0x10
+// bit 5-7 : Reserved
+// bit 8: Sleep Mode Entry Flag
+#define LPC1768_PCON_SMFLAG         0x100
+// bit 9: Deep Sleep Entry Flag
+#define LPC1768_PCON_DSFLAG         0x200
+// bit 10: Power Down Entry Flag
+#define LPC1768_PCON_PDFLAG         0x400
+// bit 11: Deep Power Down Entry Flag
+#define LPC1768_PCON_DPDFLAG        0x800
+// bit 12-31: Reserved
+
+//"Sleep Mode" (WFI).
+inline void Sleep(void)
+{
+    __WFI();
+}
+
+//"Deep Sleep" Mode
+inline void DeepSleep(void)
+{
+   SCB->SCR |= LPC1768_SCR_SLEEPDEEP;
+   __WFI();
+}
+
+//"Power-Down" Mode
+inline void PowerDown(void)
+{
+   SCB->SCR |= LPC1768_SCR_SLEEPDEEP;
+   LPC_SC->PCON &= ~LPC1768_PCON_PM1;
+   LPC_SC->PCON |= LPC1768_PCON_PM0;
+   __WFI();
+   //reset back to normal
+  LPC_SC->PCON &= ~(LPC1768_PCON_PM1 | LPC1768_PCON_PM0);
+}
+
+//"Deep Power-Down" Mode
+inline void DeepPowerDown(void)
+{
+   SCB->SCR |= LPC1768_SCR_SLEEPDEEP;
+   LPC_SC->PCON |= LPC1768_PCON_PM1 | LPC1768_PCON_PM0;
+   __WFI();
+   //reset back to normal
+  LPC_SC->PCON &= ~(LPC1768_PCON_PM1 | LPC1768_PCON_PM0);
+}
+
+//shut down BOD during power-down/deep sleep
+inline void BrownOut_ReducedPowerMode_Enable(void)
+{
+    LPC_SC->PCON |= LPC1768_PCON_BODRPM;
+}
+
+//turn on BOD during power-down/deep sleep
+inline void BrownOut_ReducedPowerMode_Disable(void)
+{
+    LPC_SC->PCON &= ~LPC1768_PCON_BODRPM;
+}
+
+//turn off brown out circutry
+inline void BrownOut_Global_Disable(void)
+{
+    LPC_SC->PCON |= LPC1768_PCON_BOGD;
+}
+
+//turn on brown out circutry
+inline void BrownOut_Global_Enable(void)
+{
+    LPC_SC->PCON &= !LPC1768_PCON_BOGD;
+}
+
+//turn off brown out reset circutry
+inline void BrownOut_Reset_Disable(void)
+{
+    LPC_SC->PCON |= LPC1768_PCON_BORD;
+}
+
+//turn on brown outreset  circutry
+inline void BrownOut_Reset_Enable(void)
+{
+    LPC_SC->PCON &= ~LPC1768_PCON_BORD;
+}
+//Peripheral Control Register
+// bit 0: Reserved
+// bit 1: PCTIM0: Timer/Counter 0 power/clock enable
+#define LPC1768_PCONP_PCTIM0        0x2
+// bit 2: PCTIM1: Timer/Counter 1 power/clock enable
+#define LPC1768_PCONP_PCTIM1        0x4
+// bit 3: PCUART0: UART 0 power/clock enable
+#define LPC1768_PCONP_PCUART0       0x8
+// bit 4: PCUART1: UART 1 power/clock enable
+#define LPC1768_PCONP_PCUART1       0x10
+// bit 5: Reserved
+// bit 6: PCPWM1: PWM 1 power/clock enable
+#define LPC1768_PCONP_PCPWM1        0x40
+// bit 7: PCI2C0: I2C interface 0 power/clock enable
+#define LPC1768_PCONP_PCI2C0        0x80
+// bit 8: PCSPI: SPI interface power/clock enable
+#define LPC1768_PCONP_PCSPI         0x100
+// bit 9: PCRTC: RTC power/clock enable
+#define LPC1768_PCONP_PCRTC         0x200
+// bit 10: PCSSP1: SSP interface 1 power/clock enable
+#define LPC1768_PCONP_PCSSP1        0x400
+// bit 11: Reserved
+// bit 12: PCADC: A/D converter power/clock enable
+#define LPC1768_PCONP_PCADC         0x1000
+// bit 13: PCCAN1: CAN controller 1 power/clock enable
+#define LPC1768_PCONP_PCCAN1        0x2000
+// bit 14: PCCAN2: CAN controller 2 power/clock enable
+#define LPC1768_PCONP_PCCAN2        0x4000
+// bit 15: PCGPIO: GPIOs power/clock enable
+#define LPC1768_PCONP_PCGPIO        0x8000
+// bit 16: PCRIT: Repetitive interrupt timer power/clock enable
+#define LPC1768_PCONP_PCRIT         0x10000
+// bit 17: PCMCPWM: Motor control PWM power/clock enable
+#define LPC1768_PCONP_PCMCPWM       0x20000
+// bit 18: PCQEI: Quadrature encoder interface power/clock enable
+#define LPC1768_PCONP_PCQEI         0x40000
+// bit 19: PCI2C1: I2C interface 1 power/clock enable
+#define LPC1768_PCONP_PCI2C1        0x80000
+// bit 20: Reserved
+// bit 21: PCSSP0: SSP interface 0 power/clock enable
+#define LPC1768_PCONP_PCSSP0        0x200000
+// bit 22: PCTIM2: Timer 2 power/clock enable
+#define LPC1768_PCONP_PCTIM2        0x400000
+// bit 23: PCTIM3: Timer 3 power/clock enable
+#define LPC1768_PCONP_PCQTIM3       0x800000
+// bit 24: PCUART2: UART 2 power/clock enable
+#define LPC1768_PCONP_PCUART2       0x1000000
+// bit 25: PCUART3: UART 3 power/clock enable
+#define LPC1768_PCONP_PCUART3       0x2000000
+// bit 26: PCI2C2: I2C interface 2 power/clock enable
+#define LPC1768_PCONP_PCI2C2        0x4000000
+// bit 27: PCI2S: I2S interface power/clock enable
+#define LPC1768_PCONP_PCI2S         0x8000000
+// bit 28: Reserved
+// bit 29: PCGPDMA: GP DMA function power/clock enable
+#define LPC1768_PCONP_PCGPDMA       0x20000000
+// bit 30: PCENET: Ethernet block power/clock enable
+#define LPC1768_PCONP_PCENET        0x40000000
+// bit 31: PCUSB: USB interface power/clock enable
+#define LPC1768_PCONP_PCUSB         0x80000000
+
+//Powers Up specified Peripheral(s)
+inline unsigned int Peripheral_PowerUp(unsigned int bitMask)
+{
+    return LPC_SC->PCONP |= bitMask;
+}   
+
+//Powers Down specified Peripheral(s) 
+inline unsigned int Peripheral_PowerDown(unsigned int bitMask)
+{
+    return LPC_SC->PCONP &= ~bitMask;
+}
+
+//returns if the peripheral is on or off
+inline bool Peripheral_GetStatus(unsigned int peripheral)
+{
+    return (LPC_SC->PCONP & peripheral) ? true : false;
+}
+
+#endif
\ No newline at end of file

--- a/SPI_TFTx2.lib	Tue Feb 12 04:08:05 2013 +0000
+++ b/SPI_TFTx2.lib	Sun Feb 17 16:44:59 2013 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/TickTock/code/SPI_TFTx2/#a71243b666f9
+http://mbed.org/users/TickTock/code/SPI_TFTx2/#130716c1a3cd

--- a/TOUCH_TFTx2.lib	Tue Feb 12 04:08:05 2013 +0000
+++ b/TOUCH_TFTx2.lib	Sun Feb 17 16:44:59 2013 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/TickTock/code/TOUCH_TFTx2/#a3cd26c97b76
+http://mbed.org/users/TickTock/code/TOUCH_TFTx2/#a91b668b058a

--- a/main.cpp	Tue Feb 12 04:08:05 2013 +0000
+++ b/main.cpp	Sun Feb 17 16:44:59 2013 +0000
@@ -1,95 +1,12 @@
-//CANary.cpp
-
-//LEAF OBD
-//1:
-//2:
-//3:    AVCAN-L     White/Blue
-//4:
-//5:    VSS         Brown,White/Brown
-//6:    CARCAN-H    Green
-//7:
-//8:    12V-SW      Orange,White/Orange
-//9:
-//10:
-//11:   AVCAN-H     Blue
-//12:   EVCAN-L     White/Grey
-//13:   EVCAN-H     Grey
-//14:   CARCAN-L    White/Green
-//15:
-//16:   12V-AON     Red/Blue,Blue/Red
-
-//VP230
-//1:D   
-//2:GND 
-//3:VCC 
-//4:R   
-//5:Vref
-//6:CANL
-//7:CANH
-//8:RS
-
-//LPC1768
-//1:    VSS
-//2:        NC:VIN  (4.5-9V supply)
-//3:        NC:VB
-//4:        NC:nR
-//5:    SPI:CS0
-//6:    SPI:CS1
-//7:    SPI:Reset
-//8:    CAN1:Sleep -->  8:CAN1:RS
-//9:    CAN1:RX    -->  4:CAN1:R
-//10:   CAN1:TX    -->  1:CAN1:D
-//11:   SPI:MOSI
-//12:   SPI:MISO
-//13:   SPI:SCLK
-//14:       NC:Ain
-//15:   MON12V     -->  4K to 12V, 1K to VSS  (To be implemented)
-//16:   TOUCH_X+
-//17:   TOUCH_X-
-//18:       NC:Aout
-//19:   TOUCH_Y+
-//20:   TOUCH_Y-
-//21:   Spkr+
-//22:   Spkr-           (optional complimentary output for more volume)
-//23:       NC:pwm
-//24:       LED
-//25:       NC:pwm
-//26:       NC:pwm
-//27:       NC
-//28:   CAN2:Sleep -->  8:CAN2:RS
-//29:   CAN2:TX    -->  1:CAN2:D
-//30:   CAN2:RX    -->  4:CAN2:R
-//31:   USB_D+
-//32:   USB_D-
-//33:       NC:Eth_TD+
-//34:       NC:Eth_TD-
-//35:       NC:Eth_RD+
-//36:       NC:Eth_RD-
-//37:       NC:IF+
-//38:       NC:IF-
-//39:       NC:5Vout (only available when connected as USB device)
-//40:   VCC3.3
-#include "mbed.h"
-#include "CAN.h"
-#include "beep.h"
-#include "MSCFileSystem.h"
-#include "SPI_TFTx2.h"
-#include "Arial12x12.h"
-#include "Arial12x12_prop.h"
-#include "Arial28x28.h"
-#include "TOUCH_TFTx2.h"
-#define upLine "\033[1A"
-#define maxBufLen 1536
-#define canTimeout 5
-
+//To Do:
+// USB device detec
+#include "CANary.h"
 // write and read the Mode Data
 LocalFileSystem local("local"); // test the local file system to write files
 
 // to write to USB Flash Drives, or equivalent (SD card in Reader/Writer)
 MSCFileSystem fs("fs"); // to write to a USB Flash Drive
 
-void Log (char *message);
-void LogErr (char *message);
 extern "C" void mbed_reset();
 
 time_t seconds ;
@@ -101,6 +18,10 @@
 DigitalOut led2(LED2);
 DigitalOut led3(LED3);
 DigitalOut led4(LED4);
+PwmOut dled(p24);
+
+InterruptIn touchpad(p17);
+
 CAN can1(p9, p10);      // CAN1 uses pins 9 and 10 (rx, tx) and pin 27 (rs)
 DigitalOut can1_SleepMode(p8);     // Use pin 8 to control the sleep mode of can1
 CAN can2(p30, p29);     // CAN2 uses pins 30 and 29 (rx, tx) and pin 28 (rs)
@@ -115,16 +36,23 @@
 char ii = 0; // indexindex
 char c;
 volatile int writePointer = 0;
-volatile int secsIdle = 0;
-volatile bool canIdle = false;
-
+volatile int secsNoMsg = 0, secsNoTouch = 0;
+volatile bool canIdle = false, userIdle = false;
+point lastTouch;
 char counter = 0;
+int dMode[2] = {1,6}; //display mode
+int sMode = 0; // setup mode
+int lastDMode[2]; //last screen mode
+int lastSMode = 0;
+char displayLog[19][40];
+int displayLoc = 0;
 
 TOUCH_TFTx2 tt(p16, p17, p19, p20, p11, p12, p13, p6, p7, p5, "TFT"); // x+,x-,y+,y-,mosi, miso, sclk, cs0, cs1, reset
 
 extern "C" void RTC_IRQHandler() {
     timer.reset(); // zero ms at the-seconds-tic
-    canIdle=(++secsIdle>canTimeout);
+    canIdle=(++secsNoMsg>canTimeout);
+    userIdle=(++secsNoTouch>userTimeout);
     LPC_RTC->ILR |= (1<<0); // clear interrupt to prepare for next
 }
 
@@ -143,52 +71,32 @@
     return ((isecs<<10)+msec) ; // return the two byte time stamp
 }
 
-void readLog (){
-    unsigned char c;
-    int i=0;
-    char lastMsgNum[]={0,0};
-    char curMsgNum[]={0,0};
-    char canNum=0;
-    printf("printing file\n");
-    file = fopen(fileName, "r");
-    if (file == NULL) {
-        printf("no file found\n");
-    }
-    while (!feof(file)) {
-        c=fgetc(file);
-        printf("%02x ",c);
-        if (i==0){
-            canNum=c;
-        }else if (i==5){
-            curMsgNum[canNum]=c;
-        }
-        if (++i>12) {
-            if (curMsgNum[canNum]>(lastMsgNum[canNum]+1)) {
-                printf(" ***");
-            }
-            lastMsgNum[canNum]=curMsgNum[canNum];
-            printf("\n");
-            i=0;
-        }
-    }
-    printf("\n\n");
-    fclose(file);
-}
-
 void printLast (){
-    char i;
+    int i;
     CANMessage msg;
-    tt.set_display(1);     // select right display
     tt.locate(0,6);
-    tt.background(Yellow);
     tt.foreground(Red);
+    tt.set_font((unsigned char*) Arial12x12_prop);  // select the font
     for(i=0; i<19; i++){
         msg = lastMsg[i+1];
         printf("%03x : %02x %02x %02x %02x %02x %02x %02x %02x    \n",msg.id,msg.data[0],msg.data[1],msg.data[2],msg.data[3],msg.data[4],msg.data[5],msg.data[6],msg.data[7]);
     }
-    tt.set_display(0);     // select left display
-    tt.background(Black);
-    tt.foreground(Cyan);
+}
+
+void printLog (){
+    int i;
+    tt.locate(0,6);
+    tt.foreground(Amber);
+    tt.cls();
+    for(i=0; i<19; i++){
+        printf("%s",displayLog[displayLoc]);
+        displayLoc=displayLoc>17?0:displayLoc+1;
+    }
+}
+
+void logMsg (char *msg) {
+    strcpy(displayLog[displayLoc],msg);
+    displayLoc=displayLoc>17?0:displayLoc+1;
 }
 
 void logCan (char mtype, CANMessage canRXmsg) {
@@ -248,7 +156,7 @@
 
 void recieve1() {
     CANMessage msg1;
-    secsIdle=0; // reset deadman switch
+    secsNoMsg=0; // reset deadman switch
     can1.read(msg1);
     //printf("Can1 rxd: %d\n", msg1.data[0]);
     if(logOpen)
@@ -258,7 +166,7 @@
 
 void recieve2() {
     CANMessage msg2;
-    secsIdle=0; // reset deadman switch
+    secsNoMsg=0; // reset deadman switch
     can2.read(msg2);
     //printf("Can2 rxd: %d\n", msg2.data[0]);
     if(logOpen)
@@ -266,14 +174,103 @@
     led2 = !led2;
 }
 
+void touched(){
+    LPC_GPIOINT->IO2IntClr = (LPC_GPIOINT->IO2IntStatR | LPC_GPIOINT->IO2IntStatF);
+    lastTouch = tt.get_touch();       
+    lastTouch = tt.to_pixel(lastTouch);          // convert to pixel pos
+    //printf("X=%d Y=%d\n",lastTouch.x,lastTouch.y);
+    /*if (lastTouch.x > tt.width()){
+        tt.set_display(1);
+        tt.fillcircle(lastTouch.x-tt.width(),lastTouch.y,10,Blue);
+    }else{
+        tt.set_display(0);
+        tt.fillcircle(lastTouch.x,lastTouch.y,10,Blue);
+    }*/
+    secsNoTouch = 0;
+}
+
+void updateDisplay(){
+    static int lastDisplayLoc = 0;
+    for (int i=0; i<2; i++){
+        tt.set_display(i);
+        switch (dMode[i]) {
+            case logMode:
+                tt.background(Black);
+                if(dMode[i]!=lastDMode[i]||(lastSMode>0&&sMode==0)||(lastDisplayLoc!=displayLoc)){
+                    printLog();
+                    lastDisplayLoc=displayLoc;
+                }
+                break;
+            case dteMode:
+                tt.background(Black);
+                if(dMode[i]!=lastDMode[i]||(lastSMode>0&&sMode==0)) tt.cls();
+                tt.fillrect(10,10,300,50,Blue);
+               break;
+            case brakeMode:
+                tt.background(Black);
+                if(dMode[i]!=lastDMode[i]||(lastSMode>0&&sMode==0)) tt.cls();
+                tt.fillcircle(100,100,15,Red);
+                break;
+            case powerMode:
+                tt.background(Black);
+                if(dMode[i]!=lastDMode[i]||(lastSMode>0&&sMode==0)) tt.cls();
+                tt.fillrect(10,10,300,50,Green);
+                break;
+            case controlMode:
+                tt.background(Black);
+                if(dMode[i]!=lastDMode[i]||(lastSMode>0&&sMode==0)) tt.cls();
+                tt.fillcircle(100,100,15,Orange);
+                break;
+            case monitorMode:
+                tt.background(Yellow);
+                if(dMode[i]!=lastDMode[i]||(lastSMode>0&&sMode==0)) tt.cls();
+                printLast();
+                break;
+            default:
+                tt.background(Black);
+                if(dMode[i]!=lastDMode[i]||(lastSMode>0&&sMode==0)) tt.cls();
+                break;
+        }
+        lastDMode[i]=dMode[i];
+    } // for (i=0; i<1; i++)
+
+    switch (sMode) {
+        case 1:
+            tt.set_display(2); // select both displays
+            tt.foreground(Yellow);
+            tt.background(DarkCyan);
+            tt.set_font((unsigned char*) Arial12x12);
+            tt.fillrect(btn31x1,btn11y1,btn31x2,btn11y2,DarkCyan);
+            tt.locate(btn31x1+5,btn11y1+5);
+            printf("<-Prev\n");
+            tt.fillrect(btn32x1,btn11y1,btn32x2,btn11y2,DarkCyan);
+            tt.fillrect(btn33x1,btn11y1,btn33x2,btn11y2,DarkCyan);
+            tt.locate(btn33x2-50,btn11y1+5);
+            printf("Next->\n");
+            tt.set_display(0);
+            tt.locate(btn32x1+15,btn11y1+5);
+            printf("Select %d\n",dMode[0]);
+            tt.set_display(1);
+            tt.locate(btn32x1+15,btn11y1+5);
+            printf("Select %d\n",dMode[1]);
+            tt.background(Black);
+            break;
+        default:
+            break;
+    }
+    lastSMode=sMode;
+}
+
 int main() {
     int readPointer=0;
     int fmon;
     int fday;
     int ftime;
-    char sTemp[35];
+    char sTemp[40];
     unsigned long secs;
     bool bit = false;
+    int i,j;
+    
     can1.frequency(500000);
     can2.frequency(500000);
     //can1_SleepMode = 0;         // Enable TX
@@ -281,21 +278,21 @@
     can1_SleepMode = 1;         // Turn on Monitor_only Mode
     can2_SleepMode = 1;         // Turn on Monitor_only Mode
     //ticker.attach(&send1, 0.5);
-    ticker.attach(&printLast, 0.5); // Display messages
+    ticker.attach(&updateDisplay, 0.25); // Display messages
     can1.attach(&recieve1);
     can2.attach(&recieve2);
+    
     tt.set_orientation(1);
     tt.set_font((unsigned char*) Arial12x12_prop);  // select the font
-    tt.set_display(1);     // select right display
-    tt.background(Yellow);
+    tt.set_display(2);     // select right display
+    tt.background(Black);
     tt.cls();
     tt.set_display(0);       // select left display
-    tt.background(Black);    // set background to black
-    tt.foreground(Cyan);    // set chars to white
-    tt.cls();                // clear the screen
-
-    //tt.calibrate();           // calibrate the touch
+    tt.calibrate();           // calibrate the touch
     tt.claim(stdout);        // send stdout to the TFT display
+    touchpad.rise(&touched);
+    tt.wfi();               // enable interrupt on touch
+    dled = 1; // turn on display LED 80%
     timer.start() ;
     RTC_Init(); // start the RTC Interrupts that sync the timer
     struct tm t; // pointer to a static tm structure
@@ -305,8 +302,6 @@
     strftime(sTemp, 32, "%a %m/%d/%Y %X", &t);
     //tt.locate(0,0);
     //printf("\nCurrent time : %s\n", sTemp); // DAY MM/DD/YYYY HH:MM:SS
-    tt.set_display(0);     // select left display
-    tt.locate(0,0);
 
     // is it a date before 2012 ?
     if ((t.tm_year + 1900) < 2012 ) {
@@ -334,121 +329,152 @@
         //    printf("%s\n", sTemp); // DAY MM/DD/YYYY HH:MM:SS
     }
     while (true) {
-        if(1 == 1) {
-            if (!logOpen) { // Open new file if one is not already open
-                seconds = time(NULL);
-                t = *localtime(&seconds) ;
-                strftime(fileName, 32, "/fs/%m%d%H%M.alc", &t); //mmddhhmm.alc
+        if (!logOpen) { // Open new file if one is not already open
+            seconds = time(NULL);
+            t = *localtime(&seconds) ;
+            strftime(fileName, 32, "/fs/%m%d%H%M.alc", &t); //mmddhhmm.alc
 
-                printf("Using file %s\n",fileName);
-                file = fopen(fileName, "ab");
-                
-                if(file==NULL){
-                    printf("\nUnable to open %s\n\n\n\n",fileName);
-                    wait(10);
-                    mbed_reset();
-                } else {
-                    logOpen = true;
-                    readPointer=writePointer;
-                    printf("\nStarting Can Log %s\n",fileName);
-                    logTS();
-                    fclose(file);
-                    file = fopen("/fs/loglog.txt", "a");
-                    fprintf(file,"%s\r\n",fileName);
-                    fclose(file);
+            tt.set_display(0);     // select left display
+            tt.locate(0,0);
+            tt.foreground(Cyan);    // set chars to Cyan
+            //printf("Using file %s\n",fileName);
+            sprintf(sTemp,"Using file %s\n",fileName);
+            logMsg(sTemp);
+            file = fopen(fileName, "ab");
+            
+            if(file==NULL){
+                sprintf(sTemp,"\nUnable to open %s\n\n\n\n",fileName);
+                logMsg(sTemp);
+            } else {
+                logOpen = true;
+                readPointer=writePointer;
+                sprintf(sTemp,"Starting Can Log %s\n",fileName);
+                logMsg(sTemp);
+                logTS();
+                fclose(file);
+                file = fopen("/fs/loglog.txt", "a");
+                fprintf(file,"%s\r\n",fileName);
+                fclose(file);
+            }
+        } else { // if (!logOpen)
+            if (((writePointer+maxBufLen-readPointer)%maxBufLen)>(maxBufLen/2)||canIdle) {
+                // Dump buffer if > 1/2 full, canbus has stopped, or PB1 pressed
+                if (logOpen) {
+                    file = fopen(fileName, "ab");
+                    if (file == NULL) {
+                        logOpen = false;
+                        sprintf(sTemp,"Failed to append log file.\n\n");
+                        logMsg(sTemp);
+                    } else {
+                        while (readPointer != writePointer) {
+                            for (j = 0; j<13; j++){
+                                fprintf(file,"%c",writeBuffer[readPointer][j]);
+                            }
+                            if(++readPointer >= maxBufLen)
+                                readPointer=0;
+                        }
+                        led3 = !led3;
+                        fclose(file);
+                    }
+                } // if (logOpen)
+            } // if > 1/2 full, canbus has stopped, or PB1 pressed
+        } // if logOpen
+        if (canIdle&&userIdle) { // canbus idle --> sleep to save power
+            if (logOpen){
+                // First take advantage of the idle time to clear some room
+                bit = false;
+                rfile = fopen("/fs/loglog.txt", "r");
+                file = fopen("/fs/loglog.new", "w");
+                while (!feof(rfile)) {
+                    fscanf(rfile,"/fs/%2d%2d%4d.alc\r\n",&fmon,&fday,&ftime);
+                    //if ((fmon<t.tm_mon)&&(fday<=t.tm_mday)){ // Delete all files more than 1 month old
+                    if ((fmon < 12) || (t.tm_mon > 1)){
+                        fday = fday + fmon*31; //crude - february will store 3 extra days of data
+                    }
+                    if ((fday+14)<(t.tm_mday+t.tm_mon*31)){ // Delete all files more than ~14 days old
+                        bit=true;
+                        sprintf(sTemp,"/fs/%02d%02d%04d.alc",fmon,fday,ftime);
+                        if ((remove(sTemp)==NULL)) {
+                            sprintf(sTemp,"Removed file %s\n",sTemp);
+                            logMsg(sTemp);
+                        }
+                    }else{
+                        fprintf(file,"/fs/%02d%02d%04d.alc\r\n",fmon,fday,ftime);
+                    }
                 }
-            } // if (!logOpen)
-            do {
-                if (((writePointer+maxBufLen-readPointer)%maxBufLen)>(maxBufLen/2)||canIdle) {
-                    // Dump buffer if > 1/2 full, canbus has stopped, or PB1 pressed
-                    if (logOpen) {
-                        file = fopen(fileName, "ab");
-                        if (file == NULL) {
-                            logOpen = false;
-                            printf("Failed to append log file.\n\n");
-                        } else {
-                            while (readPointer != writePointer) {
-                                for (int j = 0; j<13; j++){
-                                    fprintf(file,"%c",writeBuffer[readPointer][j]);
-                                }
-                                if(++readPointer >= maxBufLen)
-                                    readPointer=0;
-                            }
-                            led3 = !led3;
-                            fclose(file);
-                        }
-                    } // if (logOpen)
-                } // if > 1/2 full, canbus has stopped, or PB1 pressed
-                if (canIdle) { // canbus idle --> sleep to save power
-                    // First take advantage of the idle time to clear some room
-                    
-                    bit = false;
-                    rfile = fopen("/fs/loglog.txt", "r");
-                    file = fopen("/fs/loglog.new", "w");
+                fclose (file);
+                fclose (rfile);
+                if (bit) {
+                    remove ("/fs/loglog.txt");
+                    //rename not working so do it the hard way
+                    //rename ("/fs/loglog.new","/fs/loglog.txt");
+                    rfile = fopen("/fs/loglog.new", "r");
+                    file = fopen("/fs/loglog.txt", "w");
                     while (!feof(rfile)) {
-                        fscanf(rfile,"/fs/%2d%2d%4d.alc\r\n",&fmon,&fday,&ftime);
-                        //if ((fmon<t.tm_mon)&&(fday<=t.tm_mday)){ // Delete all files more than 1 month old
-                        if ((fmon < 12) || (t.tm_mon > 1)){
-                            fday = fday + fmon*31; //crude - february will store 3 extra days of data
-                        }
-                        if ((fday+14)<(t.tm_mday+t.tm_mon*31)){ // Delete all files more than ~14 days old
-                            bit=true;
-                            sprintf(sTemp,"/fs/%02d%02d%04d.alc",fmon,fday,ftime);
-                            if ((remove(sTemp)==NULL)) {
-                                printf("Removed file %s\n",sTemp);
-                            }
-                        }else{
-                            fprintf(file,"/fs/%02d%02d%04d.alc\r\n",fmon,fday,ftime);
-                        }
+                        fscanf(rfile,"%s\r\n",&sTemp);
+                        fprintf(file,"%s\r\n",sTemp);
                     }
                     fclose (file);
                     fclose (rfile);
-                    if (bit) {
-                        remove ("/fs/loglog.txt");
-                        //rename not working so do it the hard way
-                        //rename ("/fs/loglog.new","/fs/loglog.txt");
-                        rfile = fopen("/fs/loglog.new", "r");
-                        file = fopen("/fs/loglog.txt", "w");
-                        while (!feof(rfile)) {
-                            fscanf(rfile,"%s\r\n",&sTemp);
-                            fprintf(file,"%s\r\n",sTemp);
-                        }
-                        fclose (file);
-                        fclose (rfile);
+                }
+                remove ("/fs/loglog.new");                    
+                wait(5); // wait a few seconds to ensure fsRAM is done
+            } // if (logOpen)
+            sprintf(sTemp,"Putting uC to sleep.\n");
+            logMsg(sTemp);
+            //LPC_RTC->CIIR=0x00; // block RTC interrupts
+            led1=0;
+            led2=0;
+            led3=0;
+            led4=0;
+            dled=0; // turn off display
+            secs = time(NULL); // seconds past 12:00:00 AM 1 Jan 1900
+            while (secsNoMsg>canTimeout && secsNoTouch>userTimeout) {
+                //DeepPowerDown();
+                tt.wfi(); //enable touchpad input
+                //__wfi(); // freeze CPU and wait for interrupt (from canbus or touch)
+                Sleep();
+                //DeepPowerDown();
+            }
+            canIdle=secsNoMsg>canTimeout;
+            userIdle=userIdle>userTimeout;
+            dled=1; // turn on display LED
+            sprintf(sTemp,"Waking uC.\n");
+            logMsg(sTemp);
+            if (time(NULL)>(secs+1800)) {
+                logOpen = false; // Start new file if asleep for more than 30 minutes
+                if (secsNoTouch>100) secsNoTouch = 100; // also mostly reset user Idle counter
+            } else { // insert timestamp on each wake
+                logTS();
+            }
+            //LPC_RTC->CIIR=0x01; // re-enable RTC interrupts
+        } // if idle
+        
+        if (!userIdle) {
+            if (secsNoTouch<2) {// Recently touched
+                secsNoTouch +=2; // increment to prevent double touch
+                sMode=1;
+                if (lastTouch.x>320){
+                    i=1;
+                    lastTouch.x-=320;
+                } else {
+                    i=0;
+                }
+                if (lastTouch.y>btn11y1 && lastTouch.y<btn11y2){
+                    if (lastTouch.x>btn31x1 && lastTouch.x<btn31x2) {
+                        dMode[i]=dMode[i]>0?dMode[i]-1:maxModes;
+                    } else if (lastTouch.x>btn33x1 && lastTouch.x<btn33x2) {
+                        dMode[i]=dMode[i]<maxModes?dMode[i]+1:0;
                     }
-                    remove ("/fs/loglog.new");                    
-                    wait(5); // wait a few seconds to ensure fsRAM is done
-
-                    printf("Putting uC to sleep.\n");
-                    //LPC_RTC->CIIR=0x00; // block RTC interrupts
-                    led1=0;
-                    led2=0;
-                    led3=0;
-                    led4=0;
-                    secs = time(NULL); // seconds past 12:00:00 AM 1 Jan 1900
-                    while (secsIdle>canTimeout) {
-                        //DeepPowerDown();
-                        __wfi(); // freeze CPU and wait for interrupt (from canbus)
-                    }
-                    canIdle=false;
-                    printf("Waking uC.\n");
-                    if (time(NULL)>(secs+1800)) {
-                        logOpen = false; // Start new file if asleep for more than 30 minutes
-                    } else { // insert timestamp on each wake
-                        logTS();
-                    }
-                    //LPC_RTC->CIIR=0x01; // re-enable RTC interrupts
+                } else {
+                    sprintf(sTemp,"missed button\n");
+                    logMsg(sTemp);
                 }
-                wait(0.2); // We get >2K messages per second
-            } while (logOpen); // keep going until button or fsram removed
-        } else {
-            printf("\nNo fUSB Inserted.\n\n");
-            logOpen=false;
-            led1=!led1;
-            led2=led1;
-            led3=led1;
-            led4=led1;
-            wait(5);
-        } //if (CD==1)
+            }
+        } else { // userIdle
+            sMode=0;
+        }
+        
+        wait(0.1); // We get >2K messages per second
     } //while (true)
 }
\ No newline at end of file