X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Scan%2FSTLcd%2Flcd_scan.c;h=c4bf0805490e7e106950f88c58bb7591f5bd8021;hb=7e68e81f4757ffff2261ab4a887d4114318aa5b6;hp=639920b2ff5cf48276bf637befca0be621acbc4d;hpb=c0fb084eb4624b71d5761edd49a0dd987dbaf25f;p=kiibohd-controller.git diff --git a/Scan/STLcd/lcd_scan.c b/Scan/STLcd/lcd_scan.c index 639920b..c4bf080 100644 --- a/Scan/STLcd/lcd_scan.c +++ b/Scan/STLcd/lcd_scan.c @@ -25,6 +25,11 @@ #include #include +// Interconnect module if compiled in +#if defined(ConnectEnabled_define) +#include +#endif + // Local Includes #include "lcd_scan.h" @@ -344,26 +349,26 @@ inline uint8_t LCD_scan() // ----- Capabilities ----- -uint16_t LCD_layerStack_prevSize = 0; -void LCD_layerStack_capability( uint8_t state, uint8_t stateType, uint8_t *args ) +// Takes 1 8 bit length and 4 16 bit arguments, each corresponding to a layer index +// Ordered from top to bottom +// The first argument indicates how many numbers to display (max 4), set to 0 to load default image +uint16_t LCD_layerStackExact[4]; +uint8_t LCD_layerStackExact_size = 0; +typedef struct LCD_layerStackExact_args { + uint8_t numArgs; + uint16_t layers[4]; +} LCD_layerStackExact_args; +void LCD_layerStackExact_capability( uint8_t state, uint8_t stateType, uint8_t *args ) { // Display capability name if ( stateType == 0xFF && state == 0xFF ) { - print("LCD_layerStack_capability"); + print("LCD_layerStackExact_capability(num,layer1,layer2,layer3,layer4)"); return; } - // Parse the layer stack, top to bottom - extern uint16_t macroLayerIndexStack[]; - extern uint16_t macroLayerIndexStackSize; - - // Only process if the stack size has changed - if ( macroLayerIndexStackSize == LCD_layerStack_prevSize ) - { - return; - } - LCD_layerStack_prevSize = macroLayerIndexStackSize; + // Read arguments + LCD_layerStackExact_args *stack_args = (LCD_layerStackExact_args*)args; // Number data for LCD const uint8_t numbers[10][128] = { @@ -379,9 +384,28 @@ void LCD_layerStack_capability( uint8_t state, uint8_t stateType, uint8_t *args { STLcdNumber9_define }, }; + // Color data for numbers + const uint16_t colors[10][3] = { + { STLcdNumber0Color_define }, + { STLcdNumber1Color_define }, + { STLcdNumber2Color_define }, + { STLcdNumber3Color_define }, + { STLcdNumber4Color_define }, + { STLcdNumber5Color_define }, + { STLcdNumber6Color_define }, + { STLcdNumber7Color_define }, + { STLcdNumber8Color_define }, + { STLcdNumber9Color_define }, + }; + // Only display if there are layers active - if ( macroLayerIndexStackSize > 0 ) + if ( stack_args->numArgs > 0 ) { + // Set the color according to the "top-of-stack" layer + uint16_t layerIndex = stack_args->layers[0]; + FTM0_C0V = colors[ layerIndex ][0]; + FTM0_C1V = colors[ layerIndex ][1]; + FTM0_C2V = colors[ layerIndex ][2]; // Iterate through each of the pages // XXX Many of the values here are hard-coded @@ -396,9 +420,9 @@ void LCD_layerStack_capability( uint8_t state, uint8_t stateType, uint8_t *args LCD_writeControlReg( 0x00 ); // Write data - for ( uint16_t layer = 1; layer <= macroLayerIndexStackSize; layer++ ) + for ( uint16_t layer = 0; layer < stack_args->numArgs; layer++ ) { - uint16_t layerIndex = macroLayerIndexStack[ macroLayerIndexStackSize - layer ]; + layerIndex = stack_args->layers[ layer ]; // Default to 0, if over 9 if ( layerIndex > 9 ) @@ -412,7 +436,7 @@ void LCD_layerStack_capability( uint8_t state, uint8_t stateType, uint8_t *args // Blank out rest of display uint8_t data = 0; - for ( uint8_t c = 0; c < 4 - macroLayerIndexStackSize; c++ ) + for ( uint8_t c = 0; c < 4 - stack_args->numArgs; c++ ) { for ( uint8_t byte = 0; byte < 32; byte++ ) { @@ -423,12 +447,76 @@ void LCD_layerStack_capability( uint8_t state, uint8_t stateType, uint8_t *args } else { + // Set default backlight + FTM0_C0V = STLcdBacklightRed_define; + FTM0_C1V = STLcdBacklightGreen_define; + FTM0_C2V = STLcdBacklightBlue_define; + // Write default image for ( uint8_t page = 0; page < LCD_TOTAL_VISIBLE_PAGES; page++ ) LCD_writeDisplayReg( page, (uint8_t *)&STLcdDefaultImage[page * LCD_PAGE_LEN], LCD_PAGE_LEN ); } } +// Determines the current layer stack, and sets the LCD output accordingly +// Will only work on a master node when using the interconnect (use LCD_layerStackExact_capability instead) +uint16_t LCD_layerStack_prevSize = 0; +uint16_t LCD_layerStack_prevTop = 0; +void LCD_layerStack_capability( uint8_t state, uint8_t stateType, uint8_t *args ) +{ + // Display capability name + if ( stateType == 0xFF && state == 0xFF ) + { + print("LCD_layerStack_capability()"); + return; + } + + // Parse the layer stack, top to bottom + extern uint16_t macroLayerIndexStack[]; + extern uint16_t macroLayerIndexStackSize; + + // Ignore if the stack size hasn't changed and the top of the stack is the same + if ( macroLayerIndexStackSize == LCD_layerStack_prevSize + && macroLayerIndexStack[macroLayerIndexStackSize - 1] == LCD_layerStack_prevTop ) + { + return; + } + LCD_layerStack_prevSize = macroLayerIndexStackSize; + LCD_layerStack_prevTop = macroLayerIndexStack[macroLayerIndexStackSize - 1]; + + LCD_layerStackExact_args stack_args; + memset( stack_args.layers, 0, sizeof( stack_args.layers ) ); + + // Use the LCD_layerStackExact_capability to set the LCD using the determined stack + // Construct argument set for capability + stack_args.numArgs = macroLayerIndexStackSize; + for ( uint16_t layer = 1; layer <= macroLayerIndexStackSize; layer++ ) + { + stack_args.layers[ layer - 1 ] = macroLayerIndexStack[ macroLayerIndexStackSize - layer ]; + } + + // Only deal with the interconnect if it has been compiled in +#if defined(ConnectEnabled_define) + if ( Connect_master ) + { + // generatedKeymap.h + extern const Capability CapabilitiesList[]; + + // Broadcast layerStackExact remote capability (0xFF is the broadcast id) + Connect_send_RemoteCapability( + 0xFF, + LCD_layerStackExact_capability_index, + state, + stateType, + CapabilitiesList[ LCD_layerStackExact_capability_index ].argCount, + (uint8_t*)&stack_args + ); + } +#endif + // Call LCD_layerStackExact directly + LCD_layerStackExact_capability( state, stateType, (uint8_t*)&stack_args ); +} + // ----- CLI Command Functions -----