merged czetie vertical slider

OK, this version is actually worth looking at. Previous had more bugs
than you could shake a stick at.

vert_slider_test.ino illustrates the two slider styles, vertical
versions of the two existing styles

MicroView.cpp

@@ -1419,17 +1419,29 @@ size_t MicroView::write(uint8_t c) {
 
 /** \brief MicroViewSlider class initialisation with style. 
 
-    Initialise the MicroViewSlider widget with style WIDGETSTYLE0 or WIDGETSTYLE1.
+    Initialise the MicroViewSlider widget with style WIDGETSTYLE0 or WIDGETSTYLE1 or WIDGETSTYLE2 (like 0, but vertical) or WIDGETSTYLE3 (like 1, but vertical). If this list gets any longer, it might be better as a switch/case statement.
 */
 	MicroViewSlider::MicroViewSlider(uint8_t newx, uint8_t newy, int16_t min, int16_t max, uint8_t sty):MicroViewWidget(newx, newy, min, max) {
 		if (sty==WIDGETSTYLE0) {
 			style=0;
 			totalTicks=30;
 		}
-		else {
+		else if (sty==WIDGETSTYLE1) {
 			style=1;
 			totalTicks=60;
 		}
+		else if (sty==WIDGETSTYLE2) {
+			style=2;
+			totalTicks=20;
+		}
+		else if (sty==WIDGETSTYLE3) {
+			style=3;
+			totalTicks=40;
+		}
+		else {		//unrecognized style, so use default
+			style=0;
+			totalTicks=30;
+		}
 
 		needFirstDraw=true;
 		prevValue=getMinValue();
@@ -1446,31 +1458,39 @@ size_t MicroView::write(uint8_t c) {
 		offsetX=getX();
 		offsetY=getY();
 		
-		if(style>0)
-		majorLine=7;
-		else
-		majorLine=4;
-		
-		// Draw major tickers
-		for (uint8_t i=0; i<majorLine;i++) {
-			uView.lineV(offsetX+1+(i*10), offsetY+3, 5);
-		}
-		// Draw minor tickers
-		for (uint8_t i=0; i<4;i++) {
-			uView.lineV(offsetX+3+(i*2), offsetY+5, 3);
-		}
-		for (uint8_t i=0; i<4;i++) {
-			uView.lineV(offsetX+13+(i*2), offsetY+5, 3);
-		}
-		for (uint8_t i=0; i<4;i++) {
-			uView.lineV(offsetX+23+(i*2), offsetY+5, 3);
-		}
-		
-		if(style>0) {
-			for (uint8_t i=0; i<4;i++) {
-				uView.lineV(offsetX+33+(i*2), offsetY+5, 3);
+		if(style==0)	
+			majorLine=4;
+		else	if (style==1)	
+			majorLine=7;
+		else	if (style==2)
+			majorLine=3;
+		else if (style==3)
+			majorLine=5;
+
+
+
+//Horizontal styles, style 0 or 1
+
+		if (style==0 || style==1) {
+			// Draw major tickers
+			for (uint8_t i=0; i<majorLine;i++) {
+				uView.lineV(offsetX+1+(i*10), offsetY+3, 5);
 			}
-			if (style>0) {
+			// Draw minor tickers
+			for (uint8_t i=0; i<4;i++) {
+				uView.lineV(offsetX+3+(i*2), offsetY+5, 3);
+			}
+			for (uint8_t i=0; i<4;i++) {
+				uView.lineV(offsetX+13+(i*2), offsetY+5, 3);
+			}
+			for (uint8_t i=0; i<4;i++) {
+				uView.lineV(offsetX+23+(i*2), offsetY+5, 3);
+			}
+		
+			if(style==1) {			//Longer line, more minor ticks
+				for (uint8_t i=0; i<4;i++) {
+					uView.lineV(offsetX+33+(i*2), offsetY+5, 3);
+				}
 				for (uint8_t i=0; i<4;i++) {
 					uView.lineV(offsetX+43+(i*2), offsetY+5, 3);
 				}
@@ -1479,6 +1499,31 @@ size_t MicroView::write(uint8_t c) {
 				}
 			}
 		}
+//Vertical styles, style 2 or 3
+		else {
+			// Draw major tickers
+			for (uint8_t i=0; i<majorLine;i++) {
+				uView.lineH(offsetX, offsetY+1+(i*10), 5);
+			}
+			// Draw minor tickers
+			for (uint8_t i=0; i<4;i++) {
+				uView.lineH(offsetX, offsetY+3+(i*2), 3);
+			}
+			for (uint8_t i=0; i<4;i++) {
+				uView.lineH(offsetX, offsetY+13+(i*2), 3);
+			}
+		
+			if(style==3) {			//Explicit test for style
+				for (uint8_t i=0; i<4;i++) {
+					uView.lineH(offsetX, offsetY+23+(i*2), 3);
+				}
+				for (uint8_t i=0; i<4;i++) {
+					uView.lineH(offsetX, offsetY+33+(i*2), 3);
+				}
+
+			}
+		}
+
 		
 	}
 
@@ -1494,29 +1539,55 @@ size_t MicroView::write(uint8_t c) {
 		offsetY=getY();
 
 		if (needFirstDraw) {
-			uView.lineH(offsetX+tickPosition,offsetY, 3, WHITE, XOR);
-			uView.pixel(offsetX+1+tickPosition,offsetY+1, WHITE, XOR);
+			if (style==0 || style==1){		//Horizontal
+				uView.lineH(offsetX+tickPosition, offsetY, 3, WHITE, XOR);
+				uView.pixel(offsetX+1+tickPosition, offsetY+1, WHITE, XOR);
+			}
+			else {					//Vertical
+				uView.lineV(offsetX+7, offsetY+tickPosition, 3, WHITE, XOR);
+				uView.pixel(offsetX+6, offsetY+1+tickPosition, WHITE, XOR);
+			}
+
 			sprintf(strBuffer,"%4d", prevValue);	// we need to force 4 digit so that blank space will cover larger value
 			needFirstDraw=false;
 		}
 		else {
 			// Draw previous pointer in XOR mode to erase it
 			tickPosition= (((float)(prevValue-getMinValue())/(float)(getMaxValue()-getMinValue()))*totalTicks);
-			uView.lineH(offsetX+tickPosition,offsetY, 3, WHITE, XOR);
-			uView.pixel(offsetX+1+tickPosition,offsetY+1, WHITE, XOR);
+			if (style==0 || style==1){		//Horizontal
+				uView.lineH(offsetX+tickPosition,offsetY, 3, WHITE, XOR);
+				uView.pixel(offsetX+1+tickPosition,offsetY+1, WHITE, XOR);
+			}
+			else {					//Vertical
+				uView.lineV(offsetX+7, offsetY+tickPosition, 3, WHITE, XOR);
+				uView.pixel(offsetX+6, offsetY+1+tickPosition, WHITE, XOR);
+			}
+
 			// Draw current pointer
 			tickPosition= (((float)(getValue()-getMinValue())/(float)(getMaxValue()-getMinValue()))*totalTicks);
-			uView.lineH(offsetX+tickPosition,offsetY, 3, WHITE, XOR);
-			uView.pixel(offsetX+1+tickPosition,offsetY+1, WHITE, XOR);
+			if (style==0 || style==1){		//Horizontal
+				uView.lineH(offsetX+tickPosition,offsetY, 3, WHITE, XOR);
+				uView.pixel(offsetX+1+tickPosition,offsetY+1, WHITE, XOR);
+			}
+			else {					//Vertical
+				uView.lineV(offsetX+7, offsetY+tickPosition, 3, WHITE, XOR);
+				uView.pixel(offsetX+6, offsetY+1+tickPosition, WHITE, XOR);
+			}
+
 			sprintf(strBuffer,"%4d", getValue());	// we need to force 4 digit so that blank space will cover larger value
 			prevValue=getValue();
 		}
 
 		// Draw value
-		if(style>0) 
-		uView.setCursor(offsetX,offsetY+10);
-		else
-		uView.setCursor(offsetX+34,offsetY+1);
+		if(style==0)
+			uView.setCursor(offsetX+34,offsetY+1);
+		else	if (style==1)
+			uView.setCursor(offsetX,offsetY+10);
+		else if (style==2)
+			uView.setCursor(offsetX+1,offsetY+24);
+		else //style==3
+			uView.setCursor(offsetX+9,offsetY);
+
 		uView.print(strBuffer);
 	}
 
@@ -1642,7 +1713,7 @@ size_t MicroView::write(uint8_t c) {
 	}
 
 	// -------------------------------------------------------------------------------------
-	// Slider Widget - end
+	// Gauge Widget - end
 	// -------------------------------------------------------------------------------------
 
 /** \brief SPI Initialisation.

MicroView.h

@@ -78,6 +78,8 @@
 #define WIDGETSTYLE0			0
 #define WIDGETSTYLE1			1
 #define WIDGETSTYLE2			2
+//Added for Vertical slider styles
+#define WIDGETSTYLE3			3
 
 #define SETCONTRAST 		0x81
 #define DISPLAYALLONRESUME 	0xA4

README.md

@@ -91,7 +91,18 @@ void loop() {
 </code></pre>
 
 ## History
-**v1.14b: 26th July 2014 by JP Liew
+**v1.16b: 3rd August 2014 by czetie**
+* added vertical slider widget
+
+**v1.15b: 3rd August 2014 by Scott Allen**
+* improved lots of low level routines, Fast SPI
+* fixed some compilation warnings
+* reduced overdriving display inputs
+* added uVuew.end() to power off the display
+* improved speed of display() and clear() functions
+* fixed positionning of "3" on clock face
+
+**v1.14b: 26th July 2014 by JP Liew**
 * added Learning Kit Circuit Sketch
 
 **v1.13b: 13th June 2014 by JP Liew**

examples/MicroViewVSlider/MicroViewVSlider.ino

@@ -0,0 +1,43 @@
+/*
+	MicroView Arduino Library
+	Copyright (C) 2014 GeekAmmo
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include <MicroView.h>
+
+MicroViewWidget *vWidget1, *vWidget2;
+
+void setup() {
+	uView.begin();
+	uView.clear(PAGE);
+
+	vWidget1 = new MicroViewSlider(0, 0, 0, 255, WIDGETSTYLE2);
+	vWidget2 = new MicroViewSlider(31, 0, 0, 255, WIDGETSTYLE3);
+}
+
+void loop() {
+	for (int i=0;i<=255;i++) {
+		vWidget1->setValue(i);
+		vWidget2->setValue(255-i);
+		uView.display();
+	}
+
+	for(int i=255; i>=0;i--) {
+		vWidget1->setValue(i);		
+		vWidget2->setValue(255-i);
+		uView.display();
+	}
+}
+

keywords.txt

@@ -77,5 +77,6 @@ ALL	LITERAL1
 WIDGETSTYLE0	LITERAL1
 WIDGETSTYLE1	LITERAL1
 WIDGETSTYLE2	LITERAL1
+WIDGETSTYLE3	LITERAL1