st7565r-reel: Indentation fixed

1 files changed, 96 insertions, 112 deletions

diff --git a/glcddrivers/st7565r-reel.c b/glcddrivers/st7565r-reel.c
index 577e6fb..baca40a 100644
--- a/glcddrivers/st7565r-reel.c
+++ b/glcddrivers/st7565r-reel.c
@@ -57,26 +57,19 @@ int cDriverST7565RReel::Init(void)
 {
     width = config->width;
     if (width < 0)
-                width = 128;
-        height = config->height;
+        width = 128;
+    height = config->height;
     if (height < 0)
-                height = 64;
-
-    for (unsigned int i = 0; i < config->options.size(); i++)
-    {
-        if (config->options[i].name == "")
-        {
-        }
-    }
+        height = 64;
 
     // setup lcd array
     LCD = new uint32_t *[width];
     if (LCD)
     {
         for (int x = 0; x < width; x++)
-	{
-	    LCD[x] = new uint32_t[height];
-	}
+        {
+            LCD[x] = new uint32_t[height];
+        }
     }
 
     int bdflag=B115200;
@@ -99,7 +92,7 @@ int cDriverST7565RReel::Init(void)
     *oldConfig = *config;
     set_displaymode(0);
     set_clock();
-  // clear display
+    // clear display
     Clear();
 
     syslog(LOG_INFO, "%s: ST7565R initialized.\n", config->name.c_str());
@@ -108,23 +101,21 @@ int cDriverST7565RReel::Init(void)
 
 int cDriverST7565RReel::DeInit(void)
 {
-    // free lcd array
-
     if (fd>0)
     {
-//	clear_display();
-//	set_displaymode(1); // Clock
-//	syslog(LOG_INFO, "deint.\n");
-	close(fd);
+        // clear_display();
+        // set_displaymode(1); // Clock
+        // syslog(LOG_INFO, "deint.\n");
+        close(fd);
     }
 
     // free lcd array
     if (LCD)
     {
-	for (int x = 0; x < width; x++)
-	{
+        for (int x = 0; x < width; x++)
+        {
             delete[] LCD[x];
-	}
+        }
         delete[] LCD;
     }
 
@@ -138,28 +129,31 @@ int cDriverST7565RReel::CheckSetup(void)
         config->width != oldConfig->width ||
         config->height != oldConfig->height)
     {
-	DeInit();
-	Init();
+        DeInit();
+        Init();
         return 0;
     }
+
     if (config->brightness != oldConfig->brightness)
     {
-	oldConfig->brightness = config->brightness;
-                SetBrightness(config->brightness);
-	usleep(500000);
+        oldConfig->brightness = config->brightness;
+        SetBrightness(config->brightness);
+        usleep(500000);
     }
+
     if (config->contrast != oldConfig->contrast)
     {
-	oldConfig->contrast = config->contrast;
-                SetContrast(config->contrast);
+        oldConfig->contrast = config->contrast;
+        SetContrast(config->contrast);
     }
+
     if (config->upsideDown != oldConfig->upsideDown ||
-            config->invert != oldConfig->invert)
-        {
-                oldConfig->upsideDown = config->upsideDown;
-                oldConfig->invert = config->invert;
-                return 1;
-        }
+        config->invert != oldConfig->invert)
+    {
+        oldConfig->upsideDown = config->upsideDown;
+        oldConfig->invert = config->invert;
+        return 1;
+    }
     return 0;
 }
 
@@ -174,23 +168,11 @@ void cDriverST7565RReel::Clear(void)
         }
     }
 //    syslog(LOG_INFO, "Clear.\n");
-
 }
 
 void cDriverST7565RReel::SetPixel(int x, int y, uint32_t data)
-/*{
-    if (x > width || y > height)
-        return;
-    if (config->upsideDown)
-    {
-        // upside down orientation
-        x = width - 1 - x;
-        y = height - 1 - y;
-    }
-//    syslog(LOG_INFO, "setpixel.\n");
-    LCD[x][y] = data;*/
 {
-   if (x >= width || y >= height)
+    if (x >= width || y >= height)
         return;
 
     int pos = x % 8;
@@ -198,9 +180,9 @@ void cDriverST7565RReel::SetPixel(int x, int y, uint32_t data)
     {
         x = width - 1 - x;
         y = height - 1 - y;
-    } else {
-        pos = 7 - pos; // reverse bit position
     }
+    else
+        pos = 7 - pos; // reverse bit position
 
     if (data == GRAPHLCD_White)
         LCD[x / 8][y] |= (1 << pos);
@@ -217,107 +199,109 @@ void cDriverST7565RReel::Refresh(bool refreshAll)
     int invert;
 
     CheckSetup();
+
     if (!LCD)
-	return;
+        return;
+
     invert=(config->invert != 0) ? 0xff : 0x00;
-    if (fd>=0)
+    if (fd >= 0)
     {
-	for (y = 0; y < (height); y+=8)
-	{
-	    display_cmd( 0xb0+((y/8)&15));
-	    for (x = 0; x < width / 8; x+=4)
-	    {
-		unsigned char d[32]={0};
-
-		for(yy=0;yy<8;yy++)
-		{
-		    for (xx=0;xx<4;xx++)
-		    {
-			c = (LCD[x+xx][y+yy])^invert;
-
-			for (i = 0; i < 8; i++)
-			{
-			    d[i+xx*8]>>=1;
-			    if (c & 0x80)
-				d[i+xx*8]|=0x80;
-			    c<<=1;
-			}
-		    }
-		}
-		rx=4+x*8;
-//				printf("X %i, y%i\n",rx,y);
-
-		display_cmd( 0x10+((rx>>4)&15));
-		display_cmd( 0x00+(rx&15));
-		    display_data( d,32);
-	    }
-	}
+        for (y = 0; y < (height); y+=8)
+        {
+            display_cmd( 0xb0+((y/8)&15));
+            for (x = 0; x < width / 8; x+=4)
+            {
+                unsigned char d[32]={0};
+
+                for(yy=0;yy<8;yy++)
+                {
+                    for (xx=0;xx<4;xx++)
+                    {
+                        c = (LCD[x+xx][y+yy])^invert;
+
+                        for (i = 0; i < 8; i++)
+                        {
+                            d[i+xx*8]>>=1;
+                            if (c & 0x80)
+                                d[i+xx*8]|=0x80;
+                            c<<=1;
+                        }
+                    }
+                }
+
+                rx=4+x*8;
+                //    printf("X %i, y%i\n",rx,y);
+
+                display_cmd( 0x10+((rx>>4)&15));
+                display_cmd( 0x00+(rx&15));
+                display_data( d,32);
+            }
         }
-//	syslog(LOG_INFO, "refresh.\n");
+    }
+// syslog(LOG_INFO, "refresh.\n");
 }
+
 void cDriverST7565RReel::Set8Pixels(int x, int y, unsigned char data)
 {
     if (!LCD)
-	return;
+        return;
 
     clip(x, 0, width - 1);
     clip(y, 0, height - 1);
 
-    if (1) // !config->upsideDown)
+    if (!config->upsideDown)
     {
-	// normal orientation
-//    syslog(LOG_INFO, "%s: set8pixel normal.\n");
-	LCD[x / 8][y] = LCD[x / 8][y] | data;
+        // normal orientation
+        //    syslog(LOG_INFO, "%s: set8pixel normal.\n");
+        LCD[x / 8][y] = LCD[x / 8][y] | data;
     }
     else
     {
-	// upside down orientation
-	x = width - 1 - x;
-	y = height - 1 - y;
-//    syslog(LOG_INFO, "%s: set8pixel flip.\n", LCD);
-    LCD[x /8][y] = LCD[x / 8][y] | ReverseBits(data);
+        // upside down orientation
+        x = width - 1 - x;
+        y = height - 1 - y;
+        //    syslog(LOG_INFO, "%s: set8pixel flip.\n", LCD);
+        LCD[x /8][y] = LCD[x / 8][y] | ReverseBits(data);
     }
 }
 
 void cDriverST7565RReel::display_cmd( unsigned char cmd)
 {
     unsigned char buf[]={0xa5, 0x05, 3, 0, cmd};
-        write(fd,buf,5);
+    write(fd,buf,5);
 //    syslog(LOG_INFO, "%s: display cmd.\n", cmd);
 }
 
 void cDriverST7565RReel::display_data( unsigned char *data, int l)
 {
-        unsigned char buf[64]={0xa5,0x05,l+2,+1};
-        memcpy(buf+4,data,l);
-        write(fd,buf,l+4);
+    unsigned char buf[64]={0xa5,0x05,l+2,+1};
+    memcpy(buf+4,data,l);
+    write(fd,buf,l+4);
 //    syslog(LOG_INFO, "%s: display data.\n", data);
 }
 void cDriverST7565RReel::set_displaymode(int m)
 {
     unsigned char buf[]={0xa5,0x09,m};
-        write(fd,buf,3);
+    write(fd,buf,3);
 //    syslog(LOG_INFO, "displaymode.\n");
 }
 
 void cDriverST7565RReel::set_clock(void)
 {
-        time_t t;
-        struct tm tm;
-        t=time(0);
-        localtime_r(&t,&tm);
-    {
-    unsigned char buf[]={0xa5,0x7,tm.tm_hour,tm.tm_min,tm.tm_sec,
-	        t>>24,t>>16,t>>8,t};
-	write(fd,buf,9);
-    } 
+    time_t t;
+    struct tm tm;
+    t=time(0);
+    localtime_r(&t,&tm);
+
+    unsigned char buf[]={0xa5,0x7,tm.tm_hour,tm.tm_min,tm.tm_sec,t>>24,t>>16,t>>8,t};
+    write(fd,buf,9);
 //    syslog(LOG_INFO, "set_clock cmd.\n");
 }
 
 void cDriverST7565RReel::clear_display(void)
 {
     unsigned char buf[]={0xa5,0x04};
-        write(fd,buf,2);
+    write(fd,buf,2);
 //    syslog(LOG_INFO, "clear_display cmd.\n");
 }
 
@@ -326,16 +310,16 @@ void cDriverST7565RReel::SetBrightness(unsigned int percent)
     unsigned char buf[]={0xa5,0x02, 0x00, 0x00};
     int n=static_cast<int>(percent*2.5);
     if (n>255)
-	n=255;
+        n=255;
     buf[2]=(char)(n);
-        write(fd,buf,4);
+    write(fd,buf,4);
 }
 
 void cDriverST7565RReel::SetContrast(unsigned int val)
 {
     unsigned char buf[]={0xa5,0x03, 0x00, 0x00};
     buf[2]=(char)(val*25);
-        write(fd,buf,4);
+    write(fd,buf,4);
 }