|
|
@@ -21,9 +21,9 @@ |
|
|
|
|
|
|
|
// Project Includes |
|
|
|
#include <cli.h> |
|
|
|
#include <kll.h> |
|
|
|
#include <led.h> |
|
|
|
#include <print.h> |
|
|
|
#include <led_conf.h> // Located with scan_loop.c |
|
|
|
|
|
|
|
// Local Includes |
|
|
|
#include "led_scan.h" |
|
|
@@ -57,12 +57,13 @@ typedef struct LED_Buffer { |
|
|
|
// ----- Function Declarations ----- |
|
|
|
|
|
|
|
// CLI Functions |
|
|
|
void cliFunc_i2cRecv( char* args ); |
|
|
|
void cliFunc_i2cSend( char* args ); |
|
|
|
void cliFunc_ledPage( char* args ); |
|
|
|
void cliFunc_i2cRecv ( char* args ); |
|
|
|
void cliFunc_i2cSend ( char* args ); |
|
|
|
void cliFunc_ledRPage( char* args ); |
|
|
|
void cliFunc_ledStart( char* args ); |
|
|
|
void cliFunc_ledTest( char* args ); |
|
|
|
void cliFunc_ledZero( char* args ); |
|
|
|
void cliFunc_ledTest ( char* args ); |
|
|
|
void cliFunc_ledWPage( char* args ); |
|
|
|
void cliFunc_ledZero ( char* args ); |
|
|
|
|
|
|
|
uint8_t I2C_TxBufferPop(); |
|
|
|
void I2C_BufferPush( uint8_t byte, I2C_Buffer *buffer ); |
|
|
@@ -76,17 +77,19 @@ uint8_t I2C_Send( uint8_t *data, uint8_t sendLen, uint8_t recvLen ); |
|
|
|
// Scan Module command dictionary |
|
|
|
CLIDict_Entry( i2cRecv, "Send I2C sequence of bytes and expect a reply of 1 byte on the last sequence." NL "\t\tUse |'s to split sequences with a stop." ); |
|
|
|
CLIDict_Entry( i2cSend, "Send I2C sequence of bytes. Use |'s to split sequences with a stop." ); |
|
|
|
CLIDict_Entry( ledPage, "Read the given register page." ); |
|
|
|
CLIDict_Entry( ledRPage, "Read the given register page." ); |
|
|
|
CLIDict_Entry( ledStart, "Disable software shutdown." ); |
|
|
|
CLIDict_Entry( ledTest, "Test out the led pages." ); |
|
|
|
CLIDict_Entry( ledWPage, "Write to given register page starting at address. i.e. 0x2 0x24 0xF0 0x12" ); |
|
|
|
CLIDict_Entry( ledZero, "Zero out LED register pages (non-configuration)." ); |
|
|
|
|
|
|
|
CLIDict_Def( ledCLIDict, "ISSI LED Module Commands" ) = { |
|
|
|
CLIDict_Item( i2cRecv ), |
|
|
|
CLIDict_Item( i2cSend ), |
|
|
|
CLIDict_Item( ledPage ), |
|
|
|
CLIDict_Item( ledRPage ), |
|
|
|
CLIDict_Item( ledStart ), |
|
|
|
CLIDict_Item( ledTest ), |
|
|
|
CLIDict_Item( ledWPage ), |
|
|
|
CLIDict_Item( ledZero ), |
|
|
|
{ 0, 0, 0 } // Null entry for dictionary end |
|
|
|
}; |
|
|
@@ -103,92 +106,18 @@ volatile I2C_Buffer I2C_RxBuffer = { 0, 0, 0, I2C_RxBufferLength, (uint8_t*)I2C_ |
|
|
|
|
|
|
|
LED_Buffer LED_pageBuffer; |
|
|
|
|
|
|
|
/* |
|
|
|
// A bit mask determining which LEDs are enabled in the ISSI chip |
|
|
|
// All channel mask example |
|
|
|
// 0x00 -> 0x11 |
|
|
|
const uint8_t LED_ledEnableMask[] = { |
|
|
|
0xE8, // I2C address |
|
|
|
0x00, // Starting register address |
|
|
|
0xFF, 0xFF, // C1-1 -> C1-16 |
|
|
|
0xFF, 0xFF, // C2-1 -> C2-16 |
|
|
|
0xFF, 0xFF, // C3-1 -> C3-16 |
|
|
|
0xFF, 0xFF, // C4-1 -> C4-16 |
|
|
|
0xFF, 0xFF, // C5-1 -> C5-16 |
|
|
|
0xFF, 0xFF, // C6-1 -> C6-16 |
|
|
|
0xFF, 0xFF, // C7-1 -> C7-16 |
|
|
|
0xFF, 0xFF, // C8-1 -> C8-16 |
|
|
|
0xFF, 0xFF, // C9-1 -> C9-16 |
|
|
|
}; |
|
|
|
*/ |
|
|
|
|
|
|
|
/* |
|
|
|
// A bit mask determining which LEDs are enabled in the ISSI chip |
|
|
|
// Infinity ErgoDox full mask |
|
|
|
// 0x00 -> 0x11 |
|
|
|
const uint8_t LED_ledEnableMask[] = { |
|
|
|
0xE8, // I2C address |
|
|
|
0x00, // Starting register address |
|
|
|
0xFC, 0xFC, // C1-1 -> C1-16 |
|
|
|
0xFB, 0xFB, // C2-1 -> C2-16 |
|
|
|
0xFF, 0xFF, // C3-1 -> C3-16 |
|
|
|
0xFE, 0xFE, // C4-1 -> C4-16 |
|
|
|
0x7F, 0x7F, // C5-1 -> C5-16 |
|
|
|
0xFF, 0xFF, // C6-1 -> C6-16 |
|
|
|
0xCF, 0xCF, // C7-1 -> C7-16 |
|
|
|
0xC7, 0xC7, // C8-1 -> C8-16 |
|
|
|
0x43, 0x43, // C9-1 -> C9-16 |
|
|
|
}; |
|
|
|
*/ |
|
|
|
|
|
|
|
/* |
|
|
|
const uint8_t LED_ledEnableMask[] = { |
|
|
|
0xE8, // I2C address |
|
|
|
0x00, // Starting register address |
|
|
|
0x00, 0x00, // C1-1 -> C1-16 |
|
|
|
//0xEC, 0xEC, // C1-1 -> C1-16 |
|
|
|
0x00, 0x00, // C2-1 -> C2-16 |
|
|
|
0x00, 0x00, // C3-1 -> C3-16 |
|
|
|
0x00, 0x00, // C4-1 -> C4-16 |
|
|
|
0x00, 0x00, // C5-1 -> C5-16 |
|
|
|
0x00, 0x00, // C6-1 -> C6-16 |
|
|
|
0x08, 0x08, // C7-1 -> C7-16 |
|
|
|
0x00, 0x00, // C8-1 -> C8-16 |
|
|
|
0x00, 0x00, // C9-1 -> C9-16 |
|
|
|
}; |
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
/* |
|
|
|
// XXX Pre-fill example of buffers |
|
|
|
const uint8_t examplePage[] = { |
|
|
|
0xE8, // I2C address |
|
|
|
0x24, // Starting register address |
|
|
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C1-1 -> C1-16 |
|
|
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C2-1 -> C2-16 |
|
|
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C3-1 -> C3-16 |
|
|
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C4-1 -> C4-16 |
|
|
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C5-1 -> C5-16 |
|
|
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C6-1 -> C6-16 |
|
|
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C7-1 -> C7-16 |
|
|
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C8-1 -> C8-16 |
|
|
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // C9-1 -> C9-16 |
|
|
|
const uint8_t LED_ledEnableMask1[] = { |
|
|
|
0xE8, // I2C address |
|
|
|
0x00, // Starting register address |
|
|
|
ISSILedMask1_define |
|
|
|
}; |
|
|
|
*/ |
|
|
|
|
|
|
|
// XXX Pre-fill example of buffers |
|
|
|
const uint8_t examplePage[] = { |
|
|
|
0xE8, // I2C address |
|
|
|
0x24, // Starting register address |
|
|
|
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, // C1-1 -> C1-16 |
|
|
|
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, // C2-1 -> C2-16 |
|
|
|
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, // C3-1 -> C3-16 |
|
|
|
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, // C4-1 -> C4-16 |
|
|
|
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, // C5-1 -> C5-16 |
|
|
|
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, // C6-1 -> C6-16 |
|
|
|
0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, // C7-1 -> C7-16 |
|
|
|
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, // C8-1 -> C8-16 |
|
|
|
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, // C9-1 -> C9-16 |
|
|
|
// Default LED brightness |
|
|
|
const uint8_t LED_defaultBrightness1[] = { |
|
|
|
0xE8, // I2C address |
|
|
|
0x24, // Starting register address |
|
|
|
ISSILedBrightness1_define |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
@@ -446,7 +375,10 @@ inline void LED_setup() |
|
|
|
LED_zeroPages( 0x00, 8, 0x00, 0xB4 ); // LED Registers |
|
|
|
|
|
|
|
// Enable LEDs based upon mask |
|
|
|
LED_sendPage( (uint8_t*)LED_ledEnableMask, sizeof( LED_ledEnableMask ), 0 ); |
|
|
|
LED_sendPage( (uint8_t*)LED_ledEnableMask1, sizeof( LED_ledEnableMask1 ), 0 ); |
|
|
|
|
|
|
|
// Set default brightness |
|
|
|
LED_sendPage( (uint8_t*)LED_defaultBrightness1, sizeof( LED_defaultBrightness1 ), 0 ); |
|
|
|
|
|
|
|
// Disable Software shutdown of ISSI chip |
|
|
|
LED_writeReg( 0x0A, 0x01, 0x0B ); |
|
|
@@ -785,7 +717,7 @@ void cliFunc_i2cRecv( char* args ) |
|
|
|
I2C_Send( buffer, bufferLen, 1 ); // Only 1 byte is ever read at a time with the ISSI chip |
|
|
|
} |
|
|
|
|
|
|
|
void cliFunc_ledPage( char* args ) |
|
|
|
void cliFunc_ledRPage( char* args ) |
|
|
|
{ |
|
|
|
// Parse number from argument |
|
|
|
// NOTE: Only first argument is used |
|
|
@@ -807,20 +739,68 @@ void cliFunc_ledPage( char* args ) |
|
|
|
LED_readPage( 0xB4, page ); |
|
|
|
} |
|
|
|
|
|
|
|
void cliFunc_ledWPage( 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[] = { 0xE8, 0xFD, numToInt( arg1Ptr ) }; |
|
|
|
|
|
|
|
curArgs = arg2Ptr; |
|
|
|
CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
|
|
|
|
|
|
|
// Stop processing args if no more are found |
|
|
|
if ( *arg1Ptr == '\0' ) |
|
|
|
return; |
|
|
|
uint8_t data[] = { 0xE8, numToInt( arg1Ptr ), 0 }; |
|
|
|
|
|
|
|
// Set the register page |
|
|
|
while ( I2C_Send( page, sizeof( page ), 0 ) == 0 ) |
|
|
|
delay(1); |
|
|
|
|
|
|
|
// Process all args |
|
|
|
for ( ;; ) |
|
|
|
{ |
|
|
|
curArgs = arg2Ptr; |
|
|
|
CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
|
|
|
|
|
|
|
// Stop processing args if no more are found |
|
|
|
if ( *arg1Ptr == '\0' ) |
|
|
|
break; |
|
|
|
|
|
|
|
data[2] = numToInt( arg1Ptr ); |
|
|
|
|
|
|
|
// Write register location and data to I2C |
|
|
|
while ( I2C_Send( data, sizeof( data ), 0 ) == 0 ) |
|
|
|
delay(1); |
|
|
|
|
|
|
|
// Increment address |
|
|
|
data[1]++; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
void cliFunc_ledStart( char* args ) |
|
|
|
{ |
|
|
|
print( NL ); // No \r\n by default after the command is entered |
|
|
|
LED_zeroPages( 0x0B, 1, 0x00, 0x0C ); // Control Registers |
|
|
|
//LED_zeroPages( 0x00, 8, 0x00, 0xB4 ); // LED Registers |
|
|
|
LED_writeReg( 0x0A, 0x01, 0x0B ); |
|
|
|
LED_sendPage( (uint8_t*)LED_ledEnableMask, sizeof( LED_ledEnableMask ), 0 ); |
|
|
|
LED_sendPage( (uint8_t*)LED_ledEnableMask1, sizeof( LED_ledEnableMask1 ), 0 ); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
void cliFunc_ledTest( char* args ) |
|
|
|
{ |
|
|
|
print( NL ); // No \r\n by default after the command is entered |
|
|
|
LED_sendPage( (uint8_t*)examplePage, sizeof( examplePage ), 0 ); |
|
|
|
LED_sendPage( (uint8_t*)LED_defaultBrightness1, sizeof( LED_defaultBrightness1 ), 0 ); |
|
|
|
} |
|
|
|
|
|
|
|
void cliFunc_ledZero( char* args ) |