X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Scan%2FSTLcd%2Flcd_scan.c;h=0c2c8b77b7b4ee8ee1691b762734d540cac96b17;hb=d7b7d31cc2a62c7a82a524301cd1f03e9d2024e3;hp=49a1b82e6f6ed547c0e3d2f66085d2f18c06c29a;hpb=64b232c87808fd2016831604f42cee9d30e10d8b;p=kiibohd-controller.git

diff --git a/Scan/STLcd/lcd_scan.c b/Scan/STLcd/lcd_scan.c
index 49a1b82..0c2c8b7 100644
--- a/Scan/STLcd/lcd_scan.c
+++ b/Scan/STLcd/lcd_scan.c
@@ -33,6 +33,7 @@
 // ----- Defines -----
 
 #define LCD_TOTAL_VISIBLE_PAGES 4
+#define LCD_TOTAL_PAGES 9
 #define LCD_PAGE_LEN 128
 
 
@@ -49,14 +50,19 @@
 // ----- Function Declarations -----
 
 // CLI Functions
-void cliFunc_lcdCmd( char* args );
-void cliFunc_lcdInit( char* args );
-void cliFunc_lcdTest( char* args );
+void cliFunc_lcdCmd  ( char* args );
+void cliFunc_lcdColor( char* args );
+void cliFunc_lcdDisp ( char* args );
+void cliFunc_lcdInit ( char* args );
+void cliFunc_lcdTest ( char* args );
 
 
 
 // ----- Variables -----
 
+// Default Image - Displays on startup
+const uint8_t STLcdDefaultImage[] = { STLcdDefaultImage_define };
+
 // Full Toggle State
 uint8_t cliFullToggleState = 0;
 
@@ -65,11 +71,15 @@ uint8_t cliNormalReverseToggleState = 0;
 
 // Scan Module command dictionary
 CLIDict_Entry( lcdCmd,      "Send byte via SPI, second argument enables a0. Defaults to control." );
+CLIDict_Entry( lcdColor,    "Set backlight color. 3 16-bit numbers: R G B. i.e. 0xFFF 0x1444 0x32" );
+CLIDict_Entry( lcdDisp,     "Write byte(s) to given page starting at given address. i.e. 0x1 0x5 0xFF 0x00" );
 CLIDict_Entry( lcdInit,     "Re-initialize the LCD display." );
 CLIDict_Entry( lcdTest,     "Test out the LCD display." );
 
 CLIDict_Def( lcdCLIDict, "ST LCD Module Commands" ) = {
 	CLIDict_Item( lcdCmd ),
+	CLIDict_Item( lcdColor ),
+	CLIDict_Item( lcdDisp ),
 	CLIDict_Item( lcdInit ),
 	CLIDict_Item( lcdTest ),
 	{ 0, 0, 0 } // Null entry for dictionary end
@@ -198,7 +208,7 @@ inline void LCD_clearPage( uint8_t page )
 void LCD_clear()
 {
 	// Setup each page
-	for ( uint8_t page = 0; page < LCD_TOTAL_VISIBLE_PAGES; page++ )
+	for ( uint8_t page = 0; page < LCD_TOTAL_PAGES; page++ )
 	{
 		LCD_clearPage( page );
 	}
@@ -275,8 +285,11 @@ inline void LCD_setup()
 	// Run LCD intialization sequence
 	LCD_initialize();
 
+	// Write default image to LCD
+	for ( uint8_t page = 0; page < LCD_TOTAL_VISIBLE_PAGES; page++ )
+		LCD_writeDisplayReg( page, (uint8_t*)&STLcdDefaultImage[page * LCD_PAGE_LEN], LCD_PAGE_LEN );
+
 	// Setup Backlight
-	// TODO Expose default settings
 	SIM_SCGC6 |= SIM_SCGC6_FTM0;
 	FTM0_CNT = 0; // Reset counter
 
@@ -290,25 +303,23 @@ inline void LCD_setup()
 	FTM0_C2SC = 0x24;
 
 	// Base FTM clock selection (72 MHz system clock)
+	// @ 0xFFFF period, 72 MHz / (0xFFFF * 2) = Actual period
+	// Higher pre-scalar will use the most power (also look the best)
 	// Pre-scalar calculations
-	// 0 -      72 MHz - Highest power usage/best result
-	// 1 -      36 MHz
-	// 2 -      18 MHz
-	// 3 -       9 MHz - Slightly visible flicker (peripheral vision)
-	// 4 -   4 500 kHz - Visible flickering
-	// 5 -   2 250 kHz
-	// 6 -   1 125 kHz
-	// 7 - 562 500  Hz
+	// 0 -      72 MHz -> 549 Hz
+	// 1 -      36 MHz -> 275 Hz
+	// 2 -      18 MHz -> 137 Hz
+	// 3 -       9 MHz ->  69 Hz (Slightly visible flicker)
+	// 4 -   4 500 kHz ->  34 Hz (Visible flickering)
+	// 5 -   2 250 kHz ->  17 Hz
+	// 6 -   1 125 kHz ->   9 Hz
+	// 7 - 562 500  Hz ->   4 Hz
+	// Using a higher pre-scalar without flicker is possible but FTM0_MOD will need to be reduced
+	// Which will reduce the brightness range
+
 	// System clock, /w prescalar setting
 	FTM0_SC = FTM_SC_CLKS(1) | FTM_SC_PS( STLcdBacklightPrescalar_define );
 
-	/* Write frequency TODO API
-	FTM0_SC = 0;
-	FTM0_CNT = 0;
-	FTM0_MOD = mod;
-	FTM0_SC = FTM_SC_CLKS(1) | FTM_SC_PS(prescale);
-	*/
-
 	// Red
 	FTM0_C0V = STLcdBacklightRed_define;
 	PORTC_PCR1 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(4);
@@ -326,8 +337,6 @@ inline void LCD_setup()
 // LCD State processing loop
 inline uint8_t LCD_scan()
 {
-	// NOP - Screen Refresh
-	//LCD_writeControlReg( 0xE3 );
 	return 0;
 }
 
@@ -337,34 +346,14 @@ inline uint8_t LCD_scan()
 
 void cliFunc_lcdInit( char* args )
 {
-	print( NL ); // No \r\n by default after the command is entered
 	LCD_initialize();
 }
 
 void cliFunc_lcdTest( char* args )
 {
-	print( NL ); // No \r\n by default after the command is entered
-
-	//LCD_initialize();
-	// Test pattern
-	uint8_t pattern[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-
-
-uint8_t logo[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-	//uint8_t pattern[] = { 0xFF, 0x00, 0x96, 0xFF, 0x00, 0xFF, 0x00 };
-
-	// Write to page D0
-	//LCD_writeDisplayReg( 0, pattern, sizeof( pattern ) );
-
+	// Write default image
 	for ( uint8_t page = 0; page < LCD_TOTAL_VISIBLE_PAGES; page++ )
-	{
-		LCD_writeDisplayReg( page, &logo[page * LCD_PAGE_LEN], LCD_PAGE_LEN );
-	}
+		LCD_writeDisplayReg( page, (uint8_t *)&STLcdDefaultImage[page * LCD_PAGE_LEN], LCD_PAGE_LEN );
 }
 
 void cliFunc_lcdCmd( char* args )
@@ -400,3 +389,79 @@ cmd:
 	LCD_writeControlReg( cmd );
 }
 
+void cliFunc_lcdColor( char* args )
+{
+	char* curArgs;
+	char* arg1Ptr;
+	char* arg2Ptr = args;
+
+	// Colors
+	uint16_t rgb[3]; // Red, Green, Blue
+
+	// Parse integers from 3 arguments
+	for ( uint8_t color = 0; color < 3; color++ )
+	{
+		curArgs = arg2Ptr;
+		CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
+
+		// Give up if not enough args given
+		if ( *arg1Ptr == '\0' )
+			return;
+
+		// Convert argument to integer
+		rgb[ color ] = numToInt( arg1Ptr );
+	}
+
+	// Set PWM channels
+	FTM0_C0V = rgb[0];
+	FTM0_C1V = rgb[1];
+	FTM0_C2V = rgb[2];
+}
+
+void cliFunc_lcdDisp( char* args )
+{
+	char* curArgs;
+	char* arg1Ptr;
+	char* arg2Ptr = args;
+
+	// First process page and starting address
+	curArgs = arg2Ptr;
+	CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
+
+	// Stop processing args if no more are found
+	if ( *arg1Ptr == '\0' )
+		return;
+	uint8_t page = numToInt( arg1Ptr );
+
+	curArgs = arg2Ptr;
+	CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
+
+	// Stop processing args if no more are found
+	if ( *arg1Ptr == '\0' )
+		return;
+	uint8_t address = numToInt( arg1Ptr );
+
+	// Set the register page
+	LCD_writeControlReg( 0xB0 | ( 0x0F & page ) );
+
+	// Set starting address
+	LCD_writeControlReg( 0x10 | ( ( 0xF0 & address ) >> 4 ) );
+	LCD_writeControlReg( 0x00 | ( 0x0F & address ));
+
+	// Process all args
+	for ( ;; )
+	{
+		curArgs = arg2Ptr;
+		CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
+
+		// Stop processing args if no more are found
+		if ( *arg1Ptr == '\0' )
+			break;
+
+		uint8_t value = numToInt( arg1Ptr );
+
+		// Write buffer to SPI
+		SPI_write( &value, 1 );
+	}
+}
+