Version 2.5.0

Author: gavinlyonsrepo

README.md

@@ -30,7 +30,7 @@
 
 0. A C++ Library to connect electronic displays to linux based single board computers.
 1. Dynamic install-able Linux C++ library.
-2. 16 fonts included, new Fonts can easily be added by user
+2. 16 fonts included, new fonts can easily be added by user
 3. Common graphics + print class included
 4. Dependency: [lgpio C Library](https://abyz.me.uk/lg/lgpio.html), Provides SPI,I2C, and GPIO control.
 5. Mutiple displays supported, see supported-devices, new components can be added.
@@ -56,14 +56,14 @@ sudo make install
 	* Run following command to download latest release from github.
 
 ```sh
-curl -sL https://github.com/gavinlyonsrepo/Display_Lib_RPI/archive/2.4.2.tar.gz | tar xz
+curl -sL https://github.com/gavinlyonsrepo/Display_Lib_RPI/archive/2.5.0.tar.gz | tar xz
 ```
 
 3. Install library : Run 'make' and 'sudo make install' to run the makefile to build and then install library. 
 	* It will be installed to usr/local/lib and usr/local/include by default. 
 
 ```sh
-cd Display_Lib_RPI-2.4.2
+cd Display_Lib_RPI-2.5.0
 make
 sudo make install
 ```
@@ -98,6 +98,7 @@ make run
 | ST7789 |16 bit Colour Graphic TFT LCD|SPI HW & SW| [Readme](extra/doc/st7789/README.md)|
 | ST7735 |16 bit Colour Graphic TFT LCD|SPI HW & SW| [Readme](extra/doc/st7735/README.md)|
 | GC9A01A |16 bit Colour Graphic TFT LCD|SPI HW & SW| [Readme](extra/doc/gc9a01a/README.md)|
+| GC9D01N |16 bit Colour Graphic TFT LCD|SPI HW & SW| [Readme](extra/doc/gd901n/README.md)|
 | SSD1331 |16 bit Colour Graphic OLED|SPI HW & SW| [Readme](extra/doc/ssd1331/README.md)|
 | ERM19264 UC1609|Bi colour Graphic LCD|SPI HW & SW| [Readme](extra/doc/erm19264/README.md) |
 | PCD8544|Bi colour Graphic LCD|SPI HW & SW| [Readme](extra/doc/nokia5110/README.md) |

examples/Makefile

@@ -20,6 +20,7 @@
 # Display 13 = ILI9341  TFT LCD SPI
 # Display 14 = SSD1331  OLED SPI
 # Display 15 = GC9A01A  TFT LCD SPI
+# Display 16 = GC9D01N  TFT LCD SPI
 # ==================================
 
 # ***********************************************
@@ -95,18 +96,15 @@
 
 # =============== ST7735 TFT LCD SPI =============
 #SRC=st7735/hello_world
-#SRC=st7735/hello_world_swspi
-#SRC=st7735/hello_world_128x160
 #SRC=st7735/text_graphics_functions
 #SRC=st7735/bitmap_tests
-#SRC=st7735/framerate_test
 #SRC=st7735/demos
+#SRC=st7735/framerate_test
 #SRC=st7735/advanced_screen_buffer_mode
 #=================================================
 
 # =============== ST7789 TFT LCD SPI =============
 #SRC=st7789/hello_world
-#SRC=st7789/hello_world_swspi
 #SRC=st7789/bitmap_tests
 #SRC=st7789/text_graphics_functions
 #SRC=st7789/framerate_test
@@ -119,26 +117,27 @@
 #SRC=ili9341/text_graphics_functions
 #SRC=ili9341/demos
 #SRC=ili9341/touch_screen
-#SRC=ili9341/hello_world_swspi
 #SRC=ili9341/read_diagnostic_swspi
 #=================================================
 
 # =============== SSD1331 TFT LCD SPI ============
 #SRC=ssd1331/hello_world
-#SRC=ssd1331/hello_world_swspi
-#SRC=ssd1331/bitmap_tests
-#SRC=ssd1331/text_graphics_functions
+#SRC=ssd1331/tests
 #SRC=ssd1331/demos
 #=================================================
 
-# =============== GC9A01A TFT LCD SPI =============
+# =============== GC9A01A TFT LCD SPI ============
 #SRC=gc9a01/hello_world
-#SRC=gc9a01/hello_world_swspi
-#SRC=gc9a01/bitmap_tests
-#SRC=gc9a01/text_graphics_functions
+#SRC=gc9a01/tests
 #SRC=gc9a01/demos
 #=================================================
 
+# =============== GC9D01N TFT LCD SPI ============
+#SRC=gc9d01/hello_world
+#SRC=gc9d01/tests
+#SRC=gc9d01/demos
+#=================================================
+
 # =========== XPT2046 touchscreen basic test =====
 #SRC=xpt2046/xpt_test
 #=================================================

examples/gc9a01/bitmap_tests/main.cpp

@@ -14,12 +14,11 @@
 */
 
 // Section ::  libraries
-#include <ctime> // for test301
 #include <iostream> // cout
 #include "Bitmap_test_data.hpp" // Data for test 301-302
 #include "GC9A01_TFT_LCD_RDL.hpp"
-
-/// @cond
+
+/// @cond
 
 // Section :: Defines
 //  Test timing related defines
@@ -47,12 +46,11 @@ int HWSPI_FLAGS = 0; // last 2 LSB bits define SPI mode, see readme, mode 0 for
 //  Section ::  Function Headers
 uint8_t Setup(void); // setup + user options
 void Test300(void); // Sprite 
-void Test301(void); // "clock demo" icons, small bi-color bitmaps
+void Test301(void); // icons, small bi-color bitmaps
 void Test302(void); // 2 color bitmap
 void Test303(void); // 24 color bitmap
 void Test304(void); // 16 color bitmap
 void Test305(void); // 16 color bitmap (from data)
-std::string UTC_string(void); // for clock demo
 void EndTests(void);
 
 //  Section ::  MAIN loop
@@ -299,15 +297,6 @@ void Test304(void)
 } // end of test 
 
 
-//Return UTC time as a std:.string with format "yyyy-mm-dd hh:mm:ss".
-std::string UTC_string() 
-{
-	std::time_t time = std::time({});
-	char timeString[std::size("yyyy-mm-dd hh:mm:ss UTC")];
-	std::strftime(std::data(timeString), std::size(timeString), "%F %T UTC", std::gmtime(&time));
-	return timeString;
-}
-
 // bitmap 16 colour , Data from array as opposed to file system, When creating data flip image upside down
 void Test305(void)
 {
@@ -341,5 +330,5 @@ void EndTests(void)
 
 
 // *************** EOF ****************
-
-/// @endcond
+
+/// @endcond

examples/gc9a01/demos/main.cpp

@@ -16,33 +16,32 @@
 #include <iostream> // cout cin
 #include <algorithm> // For std::clamp
 #include <limits> // menu limits
-#include <csignal> //catch user Ctrl+C
 #include <termios.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/select.h>
+
+#include <atomic>  // Ctrl + C exit
+#include <csignal> // Ctrl + C exit
+#include <thread>  // Ctrl + C exit
+
 #include "GC9A01_TFT_LCD_RDL.hpp"
 
 /// @cond
 
 // Section :: Globals
 GC9A01_TFT myTFT;
-int8_t RST_TFT  = 25;
-int8_t DC_TFT   = 24;
-int  GPIO_CHIP_DEVICE = 0;
 uint16_t TFT_WIDTH = 240;// Screen width in pixels
 uint16_t TFT_HEIGHT = 240; // Screen height in pixels
-int HWSPI_DEVICE = 0; // A SPI device, >= 0. which SPI interface to use
-int HWSPI_CHANNEL = 0; // A SPI channel, >= 0. Which Chip enable pin to use
-int HWSPI_SPEED =  24000000; // The speed of serial communication in bits per second.
-int HWSPI_FLAGS = 0; // last 2 LSB bits define SPI mode, see readme, mode 0 for this device
+std::atomic<bool> stopRequested{false}; // Stop signal , Ctrl + c etc
 
 //  Section ::  Function Headers
 uint8_t SetupHWSPI(void); // setup + user options for hardware SPI
-std::string UTC_string(void);
-void signal_callback_handler(int signum);
 void displayMenu(void);
 void EndTests(void);
+void handleSignal(int){
+	stopRequested = true; // for CtrL +C
+}
 
 // === Demo 1 & 2 ===
 void gaugeDemo(uint16_t  countLimit = 50);  // demo1
@@ -55,6 +54,7 @@ void rotaryMenuDemo(void);
 int getchar_timeout(int timeout_ms);
 // === Demo 4 ===
 void analogClockDemo(uint16_t countLimit = 50);
+std::string UTC_string(void);
 // === Demo 5 ===
 void volumeKnobDemo(void);
 
@@ -63,8 +63,10 @@ int main()
 {
 	if(SetupHWSPI() != 0) return -1; //Hardware SPI
 	int choice;
-	signal(SIGINT, signal_callback_handler); //Ctrl+ c
+	std::signal(SIGINT, handleSignal); // for user press Ctrl+C
+	std::signal(SIGTERM, handleSignal);// for kill command
 	do {
+		if (stopRequested) break;
 		displayMenu();
 		std::cin >> choice;
 		// Check if input is valid
@@ -90,6 +92,8 @@ int main()
 		std::cout << std::endl;
 	} while (choice != 6);
 
+	if (stopRequested)
+		std::cout << "Ctrl+C pressed" << std::endl;
 	EndTests();
 	return 0;
 }
@@ -100,7 +104,14 @@ int main()
 // Hardware SPI setup
 uint8_t SetupHWSPI(void)
 {
-	std::cout << "TFT Start Test " << std::endl;
+	int8_t RST_TFT  = 25;
+	int8_t DC_TFT   = 24;
+	int  GPIO_CHIP_DEVICE = 0;
+	int HWSPI_DEVICE = 0; // A SPI device, >= 0. which SPI interface to use
+	int HWSPI_CHANNEL = 0; // A SPI channel, >= 0. Which Chip enable pin to use
+	int HWSPI_SPEED =  24000000; // The speed of serial communication in bits per second.
+	int HWSPI_FLAGS = 0; // last 2 LSB bits define SPI mode, see readme, mode 0 for this device
+	std::cout << "TFT Start Demo, Ctrl+c to quit " << std::endl;
 // ** USER OPTION 1 GPIO HW SPI **
 	myTFT.TFTSetupGPIO(RST_TFT, DC_TFT);
 //*********************************************
@@ -145,13 +156,6 @@ std::string UTC_string()
 	return timeString;
 }
 
-// Terminate program on ctrl + C
-void signal_callback_handler(int signum)
-{
-	EndTests();
-	exit(signum);
-}
-
 // === Demo 1 & 2 ===
 
 void gaugeDemo(uint16_t countLimit) // Demo 1
@@ -189,6 +193,7 @@ void gaugeDemo(uint16_t countLimit) // Demo 1
 		}
 		sprintf(buffer, "%03d", currentValue);
 		myTFT.print(buffer);
+		if (stopRequested) break; // for Ctrl + C pressed?
 	}
 	myTFT.fillScreen(myTFT.RDLC_BLACK);
 	std::cout << "Gauge Demo Over " << std::endl;
@@ -239,6 +244,7 @@ void arcGauge(uint16_t countLimit) // demo 2
 		myTFT.print(" Value :: ");
 		sprintf(buffer, "%03d", currentValue);
 		myTFT.print(buffer);
+		if (stopRequested) break; // for Ctrl + C pressed?
 	}
 	myTFT.fillScreen(myTFT.RDLC_BLACK);
 	std::cout <<  "Arc Gauge Demo Over" << std::endl;
@@ -423,7 +429,7 @@ void rotaryMenuDemo()
 			drawItem(oldSelected, false);
 			// Draw new pointer and node
 			drawItem(selected, true);
-			drawointer(selected, myTFT.RDLC_YELLOW);
+			drawPointer(selected, myTFT.RDLC_YELLOW);
 			// Draw updated label below the new selection
 			myTFT.setFont(font_mega);
 			myTFT.setTextColor(myTFT.RDLC_RED, myTFT.RDLC_YELLOW);
@@ -432,6 +438,7 @@ void rotaryMenuDemo()
 			buf[sizeof(buf) - 1] = '\0';
 			myTFT.writeCharString(centerX - 50, centerY + radius + 35, buf);
 			myTFT.setFont(font_default);
+			if (stopRequested) break; // for Ctrl + C pressed?
 		}
 	}
 	myTFT.fillScreen(myTFT.RDLC_BLACK);
@@ -489,6 +496,7 @@ void analogClockDemo(uint16_t countLimit)
 			myTFT.drawLine(centerX, centerY, xSecond, ySecond, myTFT.RDLC_YELLOW);
 			lastSecond = second;
 			countLimit--;
+			if (stopRequested) break; // for Ctrl + C pressed?
 		}
 		delayMilliSecRDL(10);
 		std::cout<< utcTime << "\r" << std::flush;
@@ -511,6 +519,7 @@ void volumeKnobDemo(void)
 	bool running = true;
 	while (running)
 	{
+		if (stopRequested) break; // for Ctrl + C pressed?
 		char c = getchar_timeout(1000);
 		switch (c)
 		{