power management implemented; net protocol change

5 files changed, 177 insertions, 127 deletions

diff --git a/code/fe310/eos/eve/eve.c b/code/fe310/eos/eve/eve.c
index 1a51891..47b07c9 100644
--- a/code/fe310/eos/eve/eve.c
+++ b/code/fe310/eos/eve/eve.c
@@ -9,6 +9,8 @@
 static char _cmd_burst;
 static uint16_t _cmd_offset;
 static uint32_t _dl_addr;
+static uint32_t *_touch_calib;
+static uint8_t _brigtness;
 
 void eve_command(uint8_t command, uint8_t parameter) {
     eve_spi_cs_set();
@@ -67,16 +69,8 @@ void eve_write32(uint32_t addr, uint32_t data) {
     eve_spi_cs_clear();
 }
 
-void eve_active(void) {
-    eve_command(EVE_ACTIVE, 0);
-}
-
-void eve_brightness(uint8_t b) {
-	eve_write8(REG_PWM_DUTY, b);
-}
-
 static void _dl_inc(uint32_t i) {
-	_dl_addr += i;
+    _dl_addr += i;
 }
 
 void eve_dl_start(uint32_t addr) {
@@ -97,8 +91,8 @@ uint32_t eve_dl_get_addr(void) {
 }
 
 static void _cmd_inc(uint16_t i) {
-	_cmd_offset += i;
-	_cmd_offset &= 0x0fff;
+    _cmd_offset += i;
+    _cmd_offset &= 0x0fff;
 }
 
 static void _cmd_begin(uint32_t command) {
@@ -107,7 +101,7 @@ static void _cmd_begin(uint32_t command) {
     if (_cmd_burst) {
         flags = EVE_SPI_FLAG_TX;
     } else {
-    	uint32_t addr = EVE_RAM_CMD + _cmd_offset;
+        uint32_t addr = EVE_RAM_CMD + _cmd_offset;
         eve_spi_cs_set();
         eve_spi_xchg24(addr | EVE_MEM_WRITE, 0);
     }
@@ -177,17 +171,17 @@ void eve_cmd(uint32_t cmd, const char *fmt, ...) {
         }
         i++;
     }
-	va_end(argv);
+    va_end(argv);
     /* padding */
-	i = _cmd_offset & 3;  /* equivalent to _cmd_offset % 4 */
+    i = _cmd_offset & 3;  /* equivalent to _cmd_offset % 4 */
     if (i) {
-    	i = 4 - i;  /* 3, 2 or 1 */
+        i = 4 - i;  /* 3, 2 or 1 */
         _cmd_inc(i);
 
-    	while (i > 0) {
+        while (i > 0) {
             eve_spi_xchg8(0, flags);
-    		i--;
-    	}
+            i--;
+        }
     }
     _cmd_end();
 }
@@ -202,14 +196,14 @@ void eve_cmd_dl(uint32_t dl) {
 }
 
 int eve_cmd_done(void) {
-	uint16_t r = eve_read16(REG_CMD_READ);
+    uint16_t r = eve_read16(REG_CMD_READ);
     if (r == 0xfff) {
-		_cmd_offset = 0;
-		eve_write8(REG_CPURESET, 1);
-		eve_write16(REG_CMD_READ, 0);
-		eve_write16(REG_CMD_WRITE, 0);
-		eve_write16(REG_CMD_DL, 0);
-		eve_write8(REG_CPURESET, 0);
+        _cmd_offset = 0;
+        eve_write8(REG_CPURESET, 1);
+        eve_write16(REG_CMD_READ, 0);
+        eve_write16(REG_CMD_WRITE, 0);
+        eve_write16(REG_CMD_DL, 0);
+        eve_write8(REG_CPURESET, 0);
         return -1;
     }
     return (r == _cmd_offset);
@@ -228,7 +222,7 @@ int eve_cmd_exec(int w) {
 }
 
 void eve_cmd_burst_start(void) {
-	uint32_t addr = EVE_RAM_CMD + _cmd_offset;
+    uint32_t addr = EVE_RAM_CMD + _cmd_offset;
     eve_spi_cs_set();
     eve_spi_xchg24(addr | EVE_MEM_WRITE, EVE_SPI_FLAG_TX);
     _cmd_burst = 1;
@@ -240,69 +234,108 @@ void eve_cmd_burst_end(void) {
     _cmd_burst = 0;
 }
 
-int eve_init(uint32_t *touch_transform) {
-	uint8_t chipid = 0;
-	uint16_t timeout = 0;
+void eve_active(void){
+    eve_command(EVE_ACTIVE, 0);
+}
+
+void eve_standby(void) {
+    eve_command(EVE_STANDBY, 0);
+}
+
+void eve_sleep(void) {
+    _brigtness = eve_read8(REG_PWM_DUTY);
+    eve_write8(REG_PWM_DUTY, 0x0);
+
+    eve_write8(REG_CTOUCH_EXTENDED, 0x01);
+    eve_write8(REG_TOUCH_MODE, EVE_TMODE_OFF);
+
+    eve_time_sleep(500);
+    eve_command(EVE_SLEEP, 0);
+}
+
+void eve_wake(void) {
+    eve_command(EVE_ACTIVE, 0);         /* start EVE */
+    eve_time_sleep(40);
+
+    eve_write8(REG_TOUCH_MODE, EVE_TMODE_CONTINUOUS);
+    eve_write8(REG_CTOUCH_EXTENDED, 0x00);
+
+    eve_write8(REG_PWM_DUTY, _brigtness);
+}
+
+void eve_brightness(uint8_t b) {
+    eve_write8(REG_PWM_DUTY, b);
+}
+
+void eve_set_touch_calibration(uint32_t *matrix) {
+    _touch_calib = matrix;
+}
+
+static int _init(void) {
+    uint8_t chipid = 0;
+    uint16_t timeout = 0;
 
     eve_command(EVE_RST_PULSE, 0);
     eve_command(EVE_CLKEXT, 0);
     eve_command(EVE_ACTIVE, 0);         /* start EVE */
 
     while (chipid != 0x7C) {            /* if chipid is not 0x7c, continue to read it until it is, EVE needs a moment for it's power on self-test and configuration */
-		eve_sleep(1);
-		chipid = eve_read8(REG_ID);
-		timeout++;
-		if (timeout > 400) return EVE_ERR;
-	}
+        eve_time_sleep(1);
+        chipid = eve_read8(REG_ID);
+        timeout++;
+        if (timeout > 400) return EVE_ERR;
+    }
 
     eve_write8(REG_PWM_DUTY, 0);
+    eve_write16(REG_GPIOX, 0);
 
     /* Initialize Display */
-	eve_write16(REG_HCYCLE,  EVE_HCYCLE);   /* total number of clocks per line, incl front/back porch */
-	eve_write16(REG_HOFFSET, EVE_HOFFSET);  /* start of active line */
-	eve_write16(REG_HSYNC0,  EVE_HSYNC0);   /* start of horizontal sync pulse */
-	eve_write16(REG_HSYNC1,  EVE_HSYNC1);   /* end of horizontal sync pulse */
-	eve_write16(REG_VCYCLE,  EVE_VCYCLE);   /* total number of lines per screen, including pre/post */
-	eve_write16(REG_VOFFSET, EVE_VOFFSET);  /* start of active screen */
-	eve_write16(REG_VSYNC0,  EVE_VSYNC0);   /* start of vertical sync pulse */
-	eve_write16(REG_VSYNC1,  EVE_VSYNC1);   /* end of vertical sync pulse */
-	eve_write8(REG_SWIZZLE,  EVE_SWIZZLE);  /* FT8xx output to LCD - pin order */
-	eve_write8(REG_PCLK_POL, EVE_PCLKPOL);  /* LCD data is clocked in on this PCLK edge */
-	eve_write8(REG_CSPREAD,	 EVE_CSPREAD);  /* helps with noise, when set to 1 fewer signals are changed simultaneously, reset-default: 1 */
-	eve_write16(REG_HSIZE,   EVE_HSIZE);    /* active display width */
-	eve_write16(REG_VSIZE,   EVE_VSIZE);    /* active display height */
-
-	/* do not set PCLK yet - wait for just after the first display list */
-
-	/* configure Touch */
-	eve_write8(REG_TOUCH_MODE, EVE_TMODE_CONTINUOUS);       /* enable touch */
-	eve_write16(REG_TOUCH_RZTHRESH, EVE_TOUCH_RZTHRESH);    /* eliminate any false touches */
-
-	/* disable Audio for now */
-	eve_write8(REG_VOL_PB, 0x00);       /* turn recorded audio volume down */
-	eve_write8(REG_VOL_SOUND, 0x00);    /* turn synthesizer volume off */
-	eve_write16(REG_SOUND, 0x6000);     /* set synthesizer to mute */
-
-	/* write a basic display-list to get things started */
+    eve_write16(REG_HCYCLE,  EVE_HCYCLE);   /* total number of clocks per line, incl front/back porch */
+    eve_write16(REG_HOFFSET, EVE_HOFFSET);  /* start of active line */
+    eve_write16(REG_HSYNC0,  EVE_HSYNC0);   /* start of horizontal sync pulse */
+    eve_write16(REG_HSYNC1,  EVE_HSYNC1);   /* end of horizontal sync pulse */
+    eve_write16(REG_VCYCLE,  EVE_VCYCLE);   /* total number of lines per screen, including pre/post */
+    eve_write16(REG_VOFFSET, EVE_VOFFSET);  /* start of active screen */
+    eve_write16(REG_VSYNC0,  EVE_VSYNC0);   /* start of vertical sync pulse */
+    eve_write16(REG_VSYNC1,  EVE_VSYNC1);   /* end of vertical sync pulse */
+    eve_write8(REG_SWIZZLE,  EVE_SWIZZLE);  /* FT8xx output to LCD - pin order */
+    eve_write8(REG_PCLK_POL, EVE_PCLKPOL);  /* LCD data is clocked in on this PCLK edge */
+    eve_write8(REG_CSPREAD,  EVE_CSPREAD);  /* helps with noise, when set to 1 fewer signals are changed simultaneously, reset-default: 1 */
+    eve_write16(REG_HSIZE,   EVE_HSIZE);    /* active display width */
+    eve_write16(REG_VSIZE,   EVE_VSIZE);    /* active display height */
+
+    /* do not set PCLK yet - wait for just after the first display list */
+
+    /* disable Audio */
+    eve_write8(REG_VOL_PB, 0x00);           /* turn recorded audio volume down */
+    eve_write8(REG_VOL_SOUND, 0x00);        /* turn synthesizer volume off */
+    eve_write16(REG_SOUND, 0x6000);         /* set synthesizer to mute */
+
+    /* write a basic display-list to get things started */
     eve_dl_start(EVE_RAM_DL);
     eve_dl_write(CLEAR_COLOR_RGB(0,0,0));
-	eve_dl_write(CLEAR(1,1,1));
+    eve_dl_write(CLEAR(1,1,1));
     eve_dl_write(DISPLAY());
     eve_dl_swap();
 
-	/* nothing is being displayed yet... the pixel clock is still 0x00 */
-	eve_write8(REG_GPIO, 0x80);         /* enable the DISP signal to the LCD panel, it is set to output in REG_GPIO_DIR by default */
-	eve_write8(REG_PCLK, EVE_PCLK);     /* now start clocking data to the LCD panel */
-
-    if (touch_transform) {
-        eve_write32(REG_TOUCH_TRANSFORM_A, touch_transform[0]);
-        eve_write32(REG_TOUCH_TRANSFORM_B, touch_transform[1]);
-        eve_write32(REG_TOUCH_TRANSFORM_C, touch_transform[2]);
-        eve_write32(REG_TOUCH_TRANSFORM_D, touch_transform[3]);
-        eve_write32(REG_TOUCH_TRANSFORM_E, touch_transform[4]);
-        eve_write32(REG_TOUCH_TRANSFORM_F, touch_transform[5]);
+    /* nothing is being displayed yet... the pixel clock is still 0x00 */
+    eve_write16(REG_GPIOX, 0x8000);         /* enable the DISP signal to the LCD panel, it is set to output in REG_GPIOX_DIR by default */
+    eve_write8(REG_PCLK, EVE_PCLK);         /* now start clocking data to the LCD panel */
+
+    /* configure Touch */
+    eve_write16(REG_TOUCH_CONFIG, 0xb81);                   /* enable touch low power mode: 0xb81 - default: 0x381 */
+    eve_write8(REG_TOUCH_MODE, EVE_TMODE_CONTINUOUS);       /* enable touch */
+    eve_write16(REG_TOUCH_RZTHRESH, EVE_TOUCH_RZTHRESH);    /* eliminate any false touches */
+
+    if (_touch_calib) {
+        eve_write32(REG_TOUCH_TRANSFORM_A, _touch_calib[0]);
+        eve_write32(REG_TOUCH_TRANSFORM_B, _touch_calib[1]);
+        eve_write32(REG_TOUCH_TRANSFORM_C, _touch_calib[2]);
+        eve_write32(REG_TOUCH_TRANSFORM_D, _touch_calib[3]);
+        eve_write32(REG_TOUCH_TRANSFORM_E, _touch_calib[4]);
+        eve_write32(REG_TOUCH_TRANSFORM_F, _touch_calib[5]);
     } else {
-        uint32_t touch_transform[6];
+        uint32_t touch_calib[6];
         eve_cmd_dl(CMD_DLSTART);
         eve_cmd_dl(CLEAR_COLOR_RGB(0,0,0));
         eve_cmd_dl(CLEAR(1,1,1));
@@ -312,25 +345,37 @@ int eve_init(uint32_t *touch_transform) {
         eve_cmd_dl(CMD_SWAP);
         eve_cmd_exec(1);
 
-        touch_transform[0] = eve_read32(REG_TOUCH_TRANSFORM_A);
-        touch_transform[1] = eve_read32(REG_TOUCH_TRANSFORM_B);
-        touch_transform[2] = eve_read32(REG_TOUCH_TRANSFORM_C);
-        touch_transform[3] = eve_read32(REG_TOUCH_TRANSFORM_D);
-        touch_transform[4] = eve_read32(REG_TOUCH_TRANSFORM_E);
-        touch_transform[5] = eve_read32(REG_TOUCH_TRANSFORM_F);
+        touch_calib[0] = eve_read32(REG_TOUCH_TRANSFORM_A);
+        touch_calib[1] = eve_read32(REG_TOUCH_TRANSFORM_B);
+        touch_calib[2] = eve_read32(REG_TOUCH_TRANSFORM_C);
+        touch_calib[3] = eve_read32(REG_TOUCH_TRANSFORM_D);
+        touch_calib[4] = eve_read32(REG_TOUCH_TRANSFORM_E);
+        touch_calib[5] = eve_read32(REG_TOUCH_TRANSFORM_F);
 
-        printf("TOUCH TRANSFORM:{0x%x,0x%x,0x%x,0x%x,0x%x,0x%x}\n", touch_transform[0], touch_transform[1], touch_transform[2], touch_transform[3], touch_transform[4], touch_transform[5]);
+        printf("TOUCH TRANSFORM:{0x%x,0x%x,0x%x,0x%x,0x%x,0x%x}\n", touch_calib[0], touch_calib[1], touch_calib[2], touch_calib[3], touch_calib[4], touch_calib[5]);
     }
 
-    eve_write32(REG_CTOUCH_EXTENDED, 0x00);
+    eve_write8(REG_CTOUCH_EXTENDED, 0x00);
+
     eve_cmd(CMD_SETROTATE, "w", 2);
     eve_cmd_exec(1);
 
+    return EVE_OK;
+}
+
+int eve_init(int pwr_on) {
+    if (pwr_on) {
+        int rv = _init();
+        if (rv) return rv;
+    } else {
+        eve_wake();
+    }
+
     eve_init_touch();
     eve_init_track();
     eve_init_platform();
 
-    eve_sleep(500);
+    eve_time_sleep(500);
     eve_command(EVE_STANDBY, 0);
 
     return EVE_OK;
diff --git a/code/fe310/eos/eve/eve.h b/code/fe310/eos/eve/eve.h
index 38310f6..2fb2fb5 100644
--- a/code/fe310/eos/eve/eve.h
+++ b/code/fe310/eos/eve/eve.h
@@ -18,9 +18,6 @@ void eve_write8(uint32_t addr, uint8_t data);
 void eve_write16(uint32_t addr, uint16_t data);
 void eve_write32(uint32_t addr, uint32_t data);
 
-void eve_active(void);
-void eve_brightness(uint8_t b);
-
 void eve_dl_start(uint32_t addr);
 void eve_dl_write(uint32_t dl);
 void eve_dl_swap(void);
@@ -33,4 +30,12 @@ int eve_cmd_done(void);
 int eve_cmd_exec(int w);
 void eve_cmd_burst_start(void);
 void eve_cmd_burst_end(void);
-int eve_init(uint32_t *touch_transform);
+
+void eve_active(void);
+void eve_standby(void);
+void eve_sleep(void);
+void eve_wake(void);
+void eve_brightness(uint8_t b);
+void eve_set_touch_calibration(uint32_t *matrix);
+
+int eve_init(int pwr_on);
diff --git a/code/fe310/eos/eve/eve_config.h b/code/fe310/eos/eve/eve_config.h
index a7d3c42..882ea89 100755
--- a/code/fe310/eos/eve/eve_config.h
+++ b/code/fe310/eos/eve/eve_config.h
@@ -1,39 +1,39 @@
-#ifndef EVE_CONFIG_H_

-#define EVE_CONFIG_H_

-

-/* my display */

-

-#define EVE_TH      1200L

-#define EVE_THD     800L

-#define EVE_THF     210L

-#define EVE_THP     20L

-#define EVE_THB     46L

-

-#define EVE_TV      650L

-#define EVE_TVD     480L

-#define EVE_TVF     22L

-#define EVE_TVP     12L

-#define EVE_TVB     23L

-

-

-#define EVE_HSIZE	(EVE_THD)                       /* Thd Length of visible part of line (in PCLKs) - display width */

-#define EVE_HSYNC0	(EVE_THF)                       /* Thf Horizontal Front Porch */

-#define EVE_HSYNC1	(EVE_THF + EVE_THP)             /* Thf + Thp Horizontal Front Porch plus Hsync Pulse width */

-#define EVE_HOFFSET	(EVE_THF + EVE_THP + EVE_THB)   /* Thf + Thp + Thb Length of non-visible part of line (in PCLK cycles) */

-#define EVE_HCYCLE 	(EVE_TH)                        /* Th Total length of line (visible and non-visible) (in PCLKs) */

-

-#define EVE_VSIZE	(EVE_TVD)                       /* Tvd Number of visible lines (in lines) - display height */

-#define EVE_VSYNC0	(EVE_TVF)                       /* Tvf Vertical Front Porch */

-#define EVE_VSYNC1	(EVE_TVF + EVE_TVP)             /* Tvf + Tvp Vertical Front Porch plus Vsync Pulse width */

-#define EVE_VOFFSET	(EVE_TVF + EVE_TVP + EVE_TVB)	/* Tvf + Tvp + Tvb Number of non-visible lines (in lines) */

-#define EVE_VCYCLE	(EVE_TV)                        /* Tv Total number of lines (visible and non-visible) (in lines) */

-

-#define EVE_PCLKPOL	(1L)                            /* PCLK polarity (0 = rising edge, 1 = falling edge) */

-#define EVE_SWIZZLE	(0L)                            /* Defines the arrangement of the RGB pins of the FT800 */

-#define EVE_PCLK	(2L)                            /* 60MHz / REG_PCLK = PCLK frequency - 30 MHz */

-#define EVE_CSPREAD	(1L)                            /* helps with noise, when set to 1 fewer signals are changed simultaneously, reset-default: 1 */

-#define EVE_TOUCH_RZTHRESH (1200L)                  /* touch-sensitivity */

-#define EVE_HAS_CRYSTAL

-#define FT81X_ENABLE

-

-#endif /* EVE_CONFIG_H */

+#ifndef EVE_CONFIG_H_
+#define EVE_CONFIG_H_
+
+/* my display */
+
+#define EVE_TH      1200L
+#define EVE_THD     800L
+#define EVE_THF     210L
+#define EVE_THP     20L
+#define EVE_THB     46L
+
+#define EVE_TV      650L
+#define EVE_TVD     480L
+#define EVE_TVF     22L
+#define EVE_TVP     12L
+#define EVE_TVB     23L
+
+
+#define EVE_HSIZE           (EVE_THD)                       /* Thd Length of visible part of line (in PCLKs) - display width */
+#define EVE_HSYNC0          (EVE_THF)                       /* Thf Horizontal Front Porch */
+#define EVE_HSYNC1          (EVE_THF + EVE_THP)             /* Thf + Thp Horizontal Front Porch plus Hsync Pulse width */
+#define EVE_HOFFSET         (EVE_THF + EVE_THP + EVE_THB)   /* Thf + Thp + Thb Length of non-visible part of line (in PCLK cycles) */
+#define EVE_HCYCLE          (EVE_TH)                        /* Th Total length of line (visible and non-visible) (in PCLKs) */
+
+#define EVE_VSIZE           (EVE_TVD)                       /* Tvd Number of visible lines (in lines) - display height */
+#define EVE_VSYNC0          (EVE_TVF)                       /* Tvf Vertical Front Porch */
+#define EVE_VSYNC1          (EVE_TVF + EVE_TVP)             /* Tvf + Tvp Vertical Front Porch plus Vsync Pulse width */
+#define EVE_VOFFSET         (EVE_TVF + EVE_TVP + EVE_TVB)   /* Tvf + Tvp + Tvb Number of non-visible lines (in lines) */
+#define EVE_VCYCLE          (EVE_TV)                        /* Tv Total number of lines (visible and non-visible) (in lines) */
+
+#define EVE_PCLKPOL         (1L)                            /* PCLK polarity (0 = rising edge, 1 = falling edge) */
+#define EVE_SWIZZLE         (0L)                            /* Defines the arrangement of the RGB pins of the FT800 */
+#define EVE_PCLK            (1L)                            /* 60MHz / REG_PCLK = PCLK frequency - 30 MHz */
+#define EVE_CSPREAD         (0L)                            /* helps with noise, when set to 1 fewer signals are changed simultaneously, reset-default: 1 */
+#define EVE_TOUCH_RZTHRESH  (1200L)                         /* touch-sensitivity */
+#define EVE_HAS_CRYSTAL
+#define FT81X_ENABLE
+
+#endif /* EVE_CONFIG_H */
diff --git a/code/fe310/eos/eve/eve_platform.c b/code/fe310/eos/eve/eve_platform.c
index ab9157e..2c6c319 100644
--- a/code/fe310/eos/eve/eve_platform.c
+++ b/code/fe310/eos/eve/eve_platform.c
@@ -31,7 +31,7 @@ static void handle_intr(void) {
     return;
 }
 
-void eve_sleep(uint32_t ms) {
+void eve_time_sleep(uint32_t ms) {
     eos_time_sleep(ms);
 }
 
diff --git a/code/fe310/eos/eve/eve_platform.h b/code/fe310/eos/eve/eve_platform.h
index baa48cd..5d67020 100644
--- a/code/fe310/eos/eve/eve_platform.h
+++ b/code/fe310/eos/eve/eve_platform.h
@@ -19,7 +19,7 @@
 #define eve_spi_xchg24      eos_spi_xchg24
 #define eve_spi_xchg32      eos_spi_xchg32
 
-void eve_sleep(uint32_t ms);
+void eve_time_sleep(uint32_t ms);
 void eve_timer_set(uint32_t ms);
 void eve_timer_clear(void);
 uint64_t eve_time_get_tick(void);