Merged Tectu/ugfx into master

9 files changed, 165 insertions, 111 deletions

diff --git a/boards/addons/gdisp/board_SSD1306_spi.h b/boards/addons/gdisp/board_SSD1306_spi.h
index 56e1abae..5b647578 100644
--- a/boards/addons/gdisp/board_SSD1306_spi.h
+++ b/boards/addons/gdisp/board_SSD1306_spi.h
@@ -16,65 +16,60 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-// The command byte to put on the front of each page line
-#define SSD1306_PAGE_PREFIX		0x40			 		// Co = 0, D/C = 1
-
-// For a multiple display configuration we would put all this in a structure and then
-//	set g->board to that structure.
-#define SSD1306_RESET_PORT		GPIOB
-#define SSD1306_RESET_PIN		5
-#define SSD1306_MISO_PORT		GPIOB
-#define SSD1306_MISO_PIN		8
-#define SSD1306_MOSI_PORT		GPIOB
-#define SSD1306_MOSI_PIN		7
-#define SSD1306_SCK_PORT		GPIOB
-#define SSD1306_SCK_PIN			6
-#define SSD1306_CS_PORT			GPIOB
-#define SSD1306_CS_PIN			5
-#define SET_RST					palSetPad(SSD1306_RESET_PORT, SSD1306_RESET_PIN);
-#define CLR_RST					palClearPad(SSD1306_RESET_PORT, SSD1306_RESET_PIN);
+// Pin & SPI setup
 
-/*
- * SPI1 configuration structure.
- * Speed 42MHz, CPHA=0, CPOL=0, 8bits frames, MSb transmitted first.
- * The slave select line is the pin 4 on the port GPIOA.
- */
-static const SPIConfig spi1config = {
-	0,
-	/* HW dependent part.*/
-	SSD1306_MISO_PORT,
-	SSD1306_MISO_PIN,
-	0
-	//SPI_CR1_BR_0
-};
-
-#if GFX_USE_OS_CHIBIOS
-	static int32_t thdPriority = 0;
-#endif
+#define SPI_DRIVER (&SPID2)
+#define SPI_PORT GPIOB
+#define SCK_PAD  13
+#define MISO_PAD 14
+#define MOSI_PAD 15
+
+#define CS_PORT     GPIOC
+#define RESET_PORT  GPIOC
+#define DNC_PORT    GPIOC
+#define CS_PAD     7        // 0 = chip selected
+#define RESET_PAD  8        // 0 = reset
+#define DNC_PAD    9        // control=0, data=1
+
+static SPIConfig spi_cfg = { NULL, CS_PORT, CS_PAD, 0 };
 
 static inline void init_board(GDisplay *g) {
-	unsigned	i;
-
-	// As we are not using multiple displays we set g->board to NULL as we don't use it.
-	g->board = 0;
-
-
-	switch(g->controllerdisplay) {
-	case 0:											// Set up for Display 0
-		// RESET pin.
-		palSetPadMode(SSD1306_RESET_PORT, SSD1306_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL);
-
-		palSetPadMode(SSD1306_MISO_PORT, SSD1306_MISO_PIN, 	PAL_MODE_ALTERNATE(1)|
-															PAL_STM32_OSPEED_HIGHEST);
-		palSetPadMode(SSD1306_MOSI_PORT, SSD1306_MOSI_PIN, 	PAL_MODE_ALTERNATE(1)|
-															PAL_STM32_OSPEED_HIGHEST);
-		palSetPadMode(SSD1306_SCK_PORT,  SSD1306_SCK_PIN,  	PAL_MODE_ALTERNATE(1)|
-															PAL_STM32_OSPEED_HIGHEST);
-		palSetPad(SSD1306_CS_PORT, SSD1306_CS_PIN);
-		palSetPadMode(SSD1306_CS_PORT,   SSD1306_CS_PIN,   	PAL_MODE_ALTERNATE(1)|
-															PAL_STM32_OSPEED_HIGHEST);
-		spiInit();
-		break;
+	(void) g;
+	g->board = 0; 
+	// Maximum speed of SSD1306 is 10Mhz, so set SPI speed less or = to that.  
+	//
+	// STM32 specific setup
+	// STM32_PCLK1 is APB1 frequence in hertz.
+	// STM32_PCLK2 is APB2 frequence in hertz.
+	// See manual clock diagram to determine APB1 or APB2 for spi in use. 
+	// SPI2 uses APB1 clock on stm32151
+	// BR bits divide PCLK as follows
+	// 000  /2   =   16 MHz
+	// 001  /4   =   8 MHz
+	// 010  /8   =   4 MHz
+	// 011  /16  =   2 MHz
+	// 100  /32  =   1 MHz
+	// 101  /64  =   500 kHz
+	// 110  /128 =   250 kHz
+	// 111  /256 =   125 kHz
+	unsigned long spi_clk = STM32_PCLK1 / 2;
+	unsigned code = 0;
+	while (spi_clk > 10000000) {
+		code++;
+		spi_clk /= 2;
+	}
+	spi_cfg.cr1 |= (code << 3);
+	
+	if (g->controllerdisplay == 0) {
+		palSetPadMode(SPI_PORT, SCK_PAD, PAL_MODE_ALTERNATE(5)|PAL_STM32_OTYPE_PUSHPULL|PAL_STM32_OSPEED_MID2);
+		palSetPadMode(SPI_PORT, MOSI_PAD, PAL_MODE_ALTERNATE(5)|PAL_STM32_OTYPE_PUSHPULL|PAL_STM32_OSPEED_MID2);
+		palSetPadMode(SPI_PORT, MISO_PAD, PAL_MODE_ALTERNATE(5));
+		palSetPadMode(RESET_PORT, RESET_PAD, PAL_MODE_OUTPUT_PUSHPULL);
+		palSetPadMode(CS_PORT, CS_PAD, PAL_MODE_OUTPUT_PUSHPULL);
+		palSetPadMode(DNC_PORT, DNC_PAD, PAL_MODE_OUTPUT_PUSHPULL);
+		palSetPad(CS_PORT, CS_PAD);
+		palSetPad(RESET_PORT, RESET_PAD);
+		palClearPad(DNC_PORT, DNC_PAD); 
 	}
 }
 
@@ -82,55 +77,39 @@ static inline void post_init_board(GDisplay *g) {
 	(void) g;
 }
 
+
 static inline void setpin_reset(GDisplay *g, bool_t state) {
 	(void) g;
-	if(state)
-		CLR_RST
-	else
-		SET_RST
+	palWritePad(RESET_PORT, RESET_PAD, !state);
 }
 
 static inline void acquire_bus(GDisplay *g) {
 	(void) g;
-	#if GFX_USE_OS_CHIBIOS
-		thdPriority = (int32_t)chThdGetPriority();
-		chThdSetPriority(HIGHPRIO);
-	#endif
-	spiAcquireBus(&SPID1);
+	spiAcquireBus(SPI_DRIVER);
+	spiStart(SPI_DRIVER, &spi_cfg); 
+	spiSelect(SPI_DRIVER);
 }
 
 static inline void release_bus(GDisplay *g) {
 	(void) g;
-	#if GFX_USE_OS_CHIBIOS
-		chThdSetPriority(thdPriority);
-	#endif
-	spiReleaseBus(&SPID1);
+	spiUnselect(SPI_DRIVER);
+	spiStop(SPI_DRIVER);
+	spiReleaseBus(SPI_DRIVER);
 }
 
 static inline void write_cmd(GDisplay *g, uint8_t cmd) {
-	uint8_t command[2];
-	(void)	g;
-
-	command[0] = 0x00;		// Co = 0, D/C = 0
-	command[1] = cmd;
-
-	spiStart(&SPID1, &spi1config);
-	spiSelect(&SPID1);
-	spiStartSend(&SPID1, 2, command);
-	spiUnselect(&SPID1);
-	spiStop(&SPID1);
+	(void) g;
+	static uint8_t buf;
+	palClearPad(DNC_PORT, DNC_PAD);
+	buf = cmd;
+	spiSend(SPI_DRIVER, 1, &buf);
 }
 
 static inline void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
 	(void) g;
-
-	spiStart(&SPID1, &spi1config);
-	spiSelect(&SPID1);
-	spiStartSend(&SPID1, length, data);
-	spiUnselect(&SPID1);
-	spiStop(&SPID1);
+	palSetPad(DNC_PORT, DNC_PAD);
+	spiSend(SPI_DRIVER, length, data);
 }
 
 
 #endif /* _GDISP_LLD_BOARD_H */
-
diff --git a/demos/modules/gwin/slider/gfxconf.h b/demos/modules/gwin/slider/gfxconf.h
index cb9fc1db..9d55d29f 100644
--- a/demos/modules/gwin/slider/gfxconf.h
+++ b/demos/modules/gwin/slider/gfxconf.h
@@ -42,12 +42,14 @@
 #define GFX_USE_GINPUT			TRUE
 #define GFX_USE_GEVENT			TRUE
 #define GFX_USE_GTIMER			TRUE
+#define GFX_USE_GQUEUE			TRUE
 
 /* Features for the GDISP sub-system. */
 #define GDISP_NEED_VALIDATION	TRUE
 #define GDISP_NEED_CLIP			TRUE
 #define GDISP_NEED_CIRCLE		TRUE
 #define GDISP_NEED_TEXT			TRUE
+#define GDISP_NEED_MULTITHREAD	TRUE
 
 /* GDISP fonts to include */
 #define GDISP_INCLUDE_FONT_UI2	TRUE
@@ -61,5 +63,8 @@
 /* Features for the GINPUT subsystem. */
 #define GINPUT_NEED_MOUSE		TRUE
 
+/* Features for the GQUEUE subsystem. */
+#define GQUEUE_NEED_ASYNC		TRUE
+
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
index 781447b6..66cd7a1b 100644
--- a/demos/modules/gwin/slider/main.c
+++ b/demos/modules/gwin/slider/main.c
@@ -50,6 +50,11 @@ static void createWidgets(void) {
 	// Set slider 2 to return extended events
 	gwinSliderSendExtendedEvents(ghSlider2, TRUE);
 
+	// Some options to try
+	//gwinSliderSetRange(ghSlider1, 0, 70000);
+	//gwinSliderSetRange(ghSlider2, -4, 4);
+	//gwinSliderSetRange(ghSlider1, 4, -4);
+
 	// Console to display slider events
 	wi.g.y = 40; wi.g.x = 40; wi.g.width = gdispGetWidth()-50; wi.g.height = gdispGetHeight()-50;
 	ghConsole = gwinConsoleCreate(0, &wi.g);
@@ -90,7 +95,7 @@ int main(void) {
 				case GSLIDER_EVENT_START:	sAction = "START";		break;
 				default:					sAction = "????";		break;
 				}
-				gwinPrintf(ghConsole, "Slider %s = %d%% %s\n", gwinGetText(pe->gwin), pe->position, sAction);
+				gwinPrintf(ghConsole, "Slider %s = %d %s\n", gwinGetText(pe->gwin), pe->position, sAction);
 				break;
 
 			default:
diff --git a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
index abea8365..2386c2d4 100644
--- a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
+++ b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
@@ -14,6 +14,7 @@
 #include "src/gdisp/driver.h"
 
 #include "board_SSD1306.h"
+#include <string.h>   // for memset
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
@@ -136,16 +137,32 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 
 #if GDISP_HARDWARE_FLUSH
 	LLDSPEC void gdisp_lld_flush(GDisplay *g) {
-		unsigned	i;
+		uint8_t * ram;
+		unsigned pages;
 
 		// Don't flush if we don't need it.
 		if (!(g->flags & GDISP_FLG_NEEDFLUSH))
 			return;
+		ram = RAM(g);
+		pages = GDISP_SCREEN_HEIGHT/8;
 
+		acquire_bus(g);
 		write_cmd(g, SSD1306_SETSTARTLINE | 0);
 
-		for(i=0; i < GDISP_SCREEN_HEIGHT/8 * SSD1306_PAGE_WIDTH; i+=SSD1306_PAGE_WIDTH)
-			write_data(g, RAM(g)+i, SSD1306_PAGE_WIDTH);
+		while (pages--) {
+			write_data(g, ram, SSD1306_PAGE_WIDTH);
+			ram += SSD1306_PAGE_WIDTH;
+		}
+		release_bus(g);
+	}
+#endif
+
+#if GDISP_HARDWARE_CLEARS
+	LLDSPEC void gdisp_lld_clear(GDisplay *g) {
+		uint8_t fill = (g->p.color == Black) ? 0 : 0xff;
+		int bytes = GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT/8;
+		memset(RAM(g), fill, bytes);
+		g->flags |= GDISP_FLG_NEEDFLUSH;
 	}
 #endif
 
@@ -168,8 +185,8 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 			y = GDISP_SCREEN_HEIGHT-1 - g->p.y;
 			break;
 		case GDISP_ROTATE_270:
-			x = GDISP_SCREEN_HEIGHT-1 - g->p.y;
-			x = g->p.x;
+			x = GDISP_SCREEN_WIDTH-1 - g->p.y;
+			y = g->p.x;
 			break;
 		}
 		if (gdispColor2Native(g->p.color) != Black)
@@ -199,7 +216,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 			y = GDISP_SCREEN_HEIGHT-1 - g->p.y;
 			break;
 		case GDISP_ROTATE_270:
-			x = GDISP_SCREEN_HEIGHT-1 - g->p.y;
+			x = GDISP_SCREEN_WIDTH-1 - g->p.y;
 			y = g->p.x;
 			break;
 		}
diff --git a/drivers/gdisp/SSD1306/gdisp_lld_config.h b/drivers/gdisp/SSD1306/gdisp_lld_config.h
index 2b805e86..9c502157 100644
--- a/drivers/gdisp/SSD1306/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1306/gdisp_lld_config.h
@@ -17,7 +17,8 @@
 #define GDISP_HARDWARE_FLUSH			TRUE		// This controller requires flushing

 #define GDISP_HARDWARE_DRAWPIXEL		TRUE

 #define GDISP_HARDWARE_PIXELREAD		TRUE

-#define GDISP_HARDWARE_CONTROL			TRUE

+#define GDISP_HARDWARE_CONTROL      TRUE

+#define GDISP_HARDWARE_CLEARS       TRUE

 

 #define GDISP_LLD_PIXELFORMAT			GDISP_PIXELFORMAT_MONO

 

diff --git a/gfxconf.example.h b/gfxconf.example.h
index b679669b..ab56ff90 100644
--- a/gfxconf.example.h
+++ b/gfxconf.example.h
@@ -162,6 +162,9 @@
 //    #define GWIN_NEED_BUTTON                         FALSE
 //        #define GWIN_BUTTON_LAZY_RELEASE             FALSE
 //    #define GWIN_NEED_SLIDER                         FALSE
+//        #define GWIN_SLIDER_NOSNAP                   FALSE
+//        #define GWIN_SLIDER_DEAD_BAND                5
+//        #define GWIN_SLIDER_TOGGLE_INC               20
 //    #define GWIN_NEED_CHECKBOX                       FALSE
 //    #define GWIN_NEED_IMAGE                          FALSE
 //        #define GWIN_NEED_IMAGE_ANIMATION            FALSE
diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h
index a3aba712..2580b88e 100644
--- a/src/gos/gos_chibios.h
+++ b/src/gos/gos_chibios.h
@@ -29,7 +29,7 @@
  */
 
 #if CH_KERNEL_MAJOR == 3
-	typedef char	bool_t;
+	typedef bool	bool_t;
 #endif
 
 typedef systime_t	delaytime_t;
diff --git a/src/gwin/gwin_slider.c b/src/gwin/gwin_slider.c
index 9652e6df..33039a92 100644
--- a/src/gwin/gwin_slider.c
+++ b/src/gwin/gwin_slider.c
@@ -18,29 +18,29 @@
 
 #define GSLIDER_FLG_EXTENDED_EVENTS		(GWIN_FIRST_CONTROL_FLAG<<0)
 
-#ifndef GWIN_SLIDER_DEAD_BAND
-	#define GWIN_SLIDER_DEAD_BAND	5
-#endif
-
-#ifndef GWIN_SLIDER_TOGGLE_INC
-	#define GWIN_SLIDER_TOGGLE_INC	20			// How many toggles to go from minimum to maximum
-#endif
-
 // Calculate the slider position from the display position
 static int CalculatePosFromDPos(GSliderObject *gsw) {
+	int		halfbit;
+
 	// Set the new position
 	if (gsw->w.g.width < gsw->w.g.height) {
-		if (gsw->dpos > gsw->w.g.height-GWIN_SLIDER_DEAD_BAND)
+		if (gsw->dpos >= gsw->w.g.height-GWIN_SLIDER_DEAD_BAND)
 			return gsw->min;
 		if (gsw->dpos < GWIN_SLIDER_DEAD_BAND)
 			return gsw->max;
-		return ((int)(gsw->w.g.height-1-gsw->dpos-GWIN_SLIDER_DEAD_BAND))*(gsw->max-gsw->min)/(gsw->w.g.height-2*GWIN_SLIDER_DEAD_BAND) + gsw->min;
+		halfbit = gsw->w.g.height/2-GWIN_SLIDER_DEAD_BAND;
+		if (gsw->min > gsw->max)
+			halfbit = -halfbit;
+		return (((int)(gsw->w.g.height-(GWIN_SLIDER_DEAD_BAND+1)-gsw->dpos))*(gsw->max-gsw->min) + halfbit)/(gsw->w.g.height-(2*GWIN_SLIDER_DEAD_BAND+1)) + gsw->min;
 	}
-	if (gsw->dpos > gsw->w.g.width-GWIN_SLIDER_DEAD_BAND)
+	if (gsw->dpos >= gsw->w.g.width-GWIN_SLIDER_DEAD_BAND)
 		return gsw->max;
 	if (gsw->dpos < GWIN_SLIDER_DEAD_BAND)
 		return gsw->min;
-	return ((int)(gsw->dpos-GWIN_SLIDER_DEAD_BAND))*(gsw->max-gsw->min)/(gsw->w.g.width-2*GWIN_SLIDER_DEAD_BAND) + gsw->min;
+	halfbit = gsw->w.g.width/2-GWIN_SLIDER_DEAD_BAND;
+	if (gsw->min > gsw->max)
+		halfbit = -halfbit;
+	return (((int)gsw->dpos-GWIN_SLIDER_DEAD_BAND)*(gsw->max-gsw->min) + halfbit)/(gsw->w.g.width-(2*GWIN_SLIDER_DEAD_BAND+1)) + gsw->min;
 }
 
 // Send the slider event
@@ -87,9 +87,9 @@ static void SendSliderEvent(GSliderObject *gsw, uint8_t action) {
 // Reset the display position back to the value predicted by the saved slider position
 static void ResetDisplayPos(GSliderObject *gsw) {
 	if (gsw->w.g.width < gsw->w.g.height)
-		gsw->dpos = gsw->w.g.height-1-((gsw->w.g.height-1)*(gsw->pos-gsw->min))/(gsw->max-gsw->min);
+		gsw->dpos = gsw->w.g.height-1-(gsw->w.g.height-1)*(gsw->pos-gsw->min)/(gsw->max-gsw->min);
 	else
-		gsw->dpos = ((gsw->w.g.width-1)*(gsw->pos-gsw->min))/(gsw->max-gsw->min);
+		gsw->dpos = (gsw->w.g.width-1)*(gsw->pos-gsw->min)/(gsw->max-gsw->min);
 }
 
 #if GINPUT_NEED_MOUSE
@@ -121,7 +121,22 @@ static void ResetDisplayPos(GSliderObject *gsw) {
 		gsw->pos = CalculatePosFromDPos(gsw);
 
 		// Update the display
-		ResetDisplayPos(gsw);
+		#if GWIN_SLIDER_NOSNAP
+			//only adjust dpos if it equals one of the end values.
+			if (gsw->w.g.width < gsw->w.g.height) {
+				if (gsw->pos == gsw->min)
+					gsw->dpos = gsw->w.g.height-1;
+				else if (gsw->pos == gsw->max)
+					gsw->dpos = 0;
+			} else {
+				if (gsw->pos == gsw->max)
+					gsw->dpos = gsw->w.g.width-1;
+				else if (gsw->pos == gsw->min)
+					gsw->dpos = 0;
+			}
+		#else
+			ResetDisplayPos(gsw);
+		#endif
 		_gwinUpdate(&gsw->w.g);
 
 		// Generate the event
@@ -413,6 +428,7 @@ void gwinSliderDraw_Image(GWidgetObject *gw, void *param) {
 	gdispGDrawStringBox(gw->g.display, gw->g.x+1, gw->g.y+1, gw->g.width-2, gw->g.height-2, gw->text, gw->g.font, pcol->text, justifyCenter);
 
 	#undef gsw
+	#undef gi
 }
 #endif /* GDISP_NEED_IMAGE */
 
diff --git a/src/gwin/sys_options.h b/src/gwin/sys_options.h
index 199cad5b..bb7e3598 100644
--- a/src/gwin/sys_options.h
+++ b/src/gwin/sys_options.h
@@ -286,6 +286,34 @@
 	#ifndef GWIN_PROGRESSBAR_AUTO
 	 	#define GWIN_PROGRESSBAR_AUTO			FALSE
 	#endif
+	/**
+	 * @brief	Should the slider avoid snapping to a fixed position when the mouse is released
+	 * @details	Defaults to FALSE
+	 * @note	If FALSE the slider will snap to the closest set-able position when the
+	 * 			mouse is released. If TRUE it will maintain the position the
+	 * 			mouse was released at, except when at the minimum and maximum slider values.
+	 */
+	#ifndef GWIN_SLIDER_NOSNAP
+	 	#define GWIN_SLIDER_NOSNAP				FALSE
+	#endif
+	/**
+	 * @brief	The number of pixels of dead-band at each end of the slider
+	 * @details	Defaults to 5
+	 * @note	A dead-band is required because fingers can often cannot
+	 * 			accurately control the slider peg at the edges of the slider
+	 */
+	#ifndef GWIN_SLIDER_DEAD_BAND
+		#define GWIN_SLIDER_DEAD_BAND			5
+	#endif
+	/**
+	 * @brief	How many toggles it takes to go from minimum to maximum value on a slider
+	 * @details	Defaults to 20
+	 * @note	When the slider is being operated by a toggle device this setting describes
+	 * 			how many toggles are required to go from end to end.
+	 */
+	#ifndef GWIN_SLIDER_TOGGLE_INC
+		#define GWIN_SLIDER_TOGGLE_INC			20
+	#endif
 /** @} */
 
 #endif /* _GWIN_OPTIONS_H */