draw line & graphics test

cppsrc/U8g2lib.h

@@ -161,6 +161,10 @@ class U8G2 : public Print
     void drawEllipse(u8g2_uint_t x0, u8g2_uint_t y0, u8g2_uint_t rx, u8g2_uint_t ry, uint8_t opt = U8G2_DRAW_ALL) { u8g2_DrawEllipse(&u8g2, x0, y0, rx, ry, opt); }
     void drawFilledEllipse(u8g2_uint_t x0, u8g2_uint_t y0, u8g2_uint_t rx, u8g2_uint_t ry, uint8_t opt = U8G2_DRAW_ALL) { u8g2_DrawFilledEllipse(&u8g2, x0, y0, rx, ry, opt); }    
 
+    /* u8g2_line.c */
+    void drawLine(u8g2_uint_t x1, u8g2_uint_t y1, u8g2_uint_t x2, u8g2_uint_t y2) 
+      { u8g2_DrawLine(&u8g2, x1, y1, x2, y2); }
+
     /* u8g2_bitmap.c */
     void drawBitmap(u8g2_uint_t x, u8g2_uint_t y, u8g2_uint_t cnt, u8g2_uint_t h, const uint8_t *bitmap)
       { u8g2_DrawBitmap(&u8g2, x, y, cnt, h, bitmap); }

csrc/u8g2.h

@@ -518,6 +518,10 @@ void u8g2_DrawDisc(u8g2_t *u8g2, u8g2_uint_t x0, u8g2_uint_t y0, u8g2_uint_t rad
 void u8g2_DrawEllipse(u8g2_t *u8g2, u8g2_uint_t x0, u8g2_uint_t y0, u8g2_uint_t rx, u8g2_uint_t ry, uint8_t option);
 void u8g2_DrawFilledEllipse(u8g2_t *u8g2, u8g2_uint_t x0, u8g2_uint_t y0, u8g2_uint_t rx, u8g2_uint_t ry, uint8_t option);
 
+/*==========================================*/
+/* u8g2_line.c */
+void u8g2_DrawLine(u8g2_t *u8g2, u8g2_uint_t x1, u8g2_uint_t y1, u8g2_uint_t x2, u8g2_uint_t y2);
+
 
 /*==========================================*/
 /* u8g2_box.c */

csrc/u8g2_line.c

@@ -0,0 +1,92 @@
+/*
+
+  u8g2_box.c
+
+  Universal 8bit Graphics Library (https://github.com/olikraus/u8g2/)
+
+  Copyright (c) 2016, olikraus@gmail.com
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without modification, 
+  are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this list 
+    of conditions and the following disclaimer.
+    
+  * Redistributions in binary form must reproduce the above copyright notice, this 
+    list of conditions and the following disclaimer in the documentation and/or other 
+    materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+  CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
+
+*/
+
+#include "u8g2.h"
+
+
+void u8g2_DrawLine(u8g2_t *u8g2, u8g2_uint_t x1, u8g2_uint_t y1, u8g2_uint_t x2, u8g2_uint_t y2)
+{
+  u8g2_uint_t tmp;
+  u8g2_uint_t x,y;
+  u8g2_uint_t dx, dy;
+  u8g2_int_t err;
+  u8g2_int_t ystep;
+
+  uint8_t swapxy = 0;
+  
+  /* no intersection check at the moment, should be added... */
+
+  if ( x1 > x2 ) dx = x1-x2; else dx = x2-x1;
+  if ( y1 > y2 ) dy = y1-y2; else dy = y2-y1;
+
+  if ( dy > dx ) 
+  {
+    swapxy = 1;
+    tmp = dx; dx =dy; dy = tmp;
+    tmp = x1; x1 =y1; y1 = tmp;
+    tmp = x2; x2 =y2; y2 = tmp;
+  }
+  if ( x1 > x2 ) 
+  {
+    tmp = x1; x1 =x2; x2 = tmp;
+    tmp = y1; y1 =y2; y2 = tmp;
+  }
+  err = dx >> 1;
+  if ( y2 > y1 ) ystep = 1; else ystep = -1;
+  y = y1;
+
+#ifndef  U8G2_16BIT
+  if ( x2 == 255 )
+    x2--;
+#else
+  if ( x2 == 0xffff )
+    x2--;
+#endif
+
+  for( x = x1; x <= x2; x++ )
+  {
+    if ( swapxy == 0 ) 
+      u8g2_DrawPixel(u8g2, x, y); 
+    else 
+      u8g2_DrawPixel(u8g2, y, x); 
+    err -= (uint8_t)dy;
+    if ( err < 0 ) 
+    {
+      y += (u8g2_uint_t)ystep;
+      err += (u8g2_uint_t)dx;
+    }
+  }
+}
+

sys/arduino/u8g2_page_buffer/GraphicsTest/GraphicsTest.ino

@@ -133,12 +133,10 @@ void u8g2_string(uint8_t a) {
 
 void u8g2_line(uint8_t a) {
   u8g2.drawStr( 0, 0, "drawLine");
-  /*
   u8g2.drawLine(7+a, 10, 40, 55);
   u8g2.drawLine(7+a*2, 10, 60, 55);
   u8g2.drawLine(7+a*3, 10, 80, 55);
   u8g2.drawLine(7+a*4, 10, 100, 55);
-  */
 }
 
 void u8g2_triangle(uint8_t a) {
@@ -202,8 +200,7 @@ uint8_t draw_state = 0;
 void draw(void) {
   u8g2_prepare();
   switch(draw_state >> 3) {
-    case 0: u8g2_extra_page(draw_state&7); break;
-    //case 0: u8g2_box_frame(draw_state&7); break;
+    case 0: u8g2_box_frame(draw_state&7); break;
     case 1: u8g2_disc_circle(draw_state&7); break;
     case 2: u8g2_r_frame(draw_state&7); break;
     case 3: u8g2_string(draw_state&7); break;
@@ -233,6 +230,6 @@ void loop(void) {
     draw_state = 0;
 
   // deley between each page
-  delay(150);
+  delay(100);
 
 }

sys/utf8/line_picture_loop/Makefile

@@ -0,0 +1,14 @@
+CC = gcc
+
+CFLAGS = -g -W -Wall -Wextra -Wcast-qual -Wno-overlength-strings -Wno-unused-parameter -I../../../csrc/. 
+
+SRC = $(shell ls ../../../csrc/*.c) $(shell ls ../common/*.c ) main.c 
+
+OBJ = $(SRC:.c=.o)
+
+u8g2_utf8: $(OBJ) 
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) -o u8g2_utf8
+
+clean:	
+	-rm $(OBJ) u8g2_utf8
+

sys/utf8/line_picture_loop/main.c

@@ -0,0 +1,32 @@
+
+#include "u8g2.h"
+#include <stdio.h>
+
+
+  
+u8g2_t u8g2;
+
+int main(void)
+{
+
+  u8g2_SetupBuffer_Utf8(&u8g2, U8G2_R0);
+  
+  
+  u8g2_InitDisplay(&u8g2);
+  u8g2_SetPowerSave(&u8g2, 0);  
+  
+  u8g2_SetFont(&u8g2, u8g2_font_6x13_tf);
+  u8g2_SetFontDirection(&u8g2, 0);
+  
+  u8g2_FirstPage(&u8g2);
+  do
+  {      
+    u8g2_DrawLine(&u8g2, 2, 3, 7, 9);
+    u8g2_DrawStr(&u8g2, 30, 10, "DrawLine");
+  } while( u8g2_NextPage(&u8g2) );
+    
+  utf8_show();
+  
+  return 0;
+}
+