Skip to content

Add Caps Lock indicator LED config commands #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Vitnir wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add Caps Lock indicator LED config commands #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 115 additions & 2 deletions LEDManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@ const LEDManager::brightness_conf_t LEDManager::brightness_conf_default =
.is_valid = 0x00, /* The valid brightness config when is_valid == 0x00 */
};

const LEDManager::caps_lock_indicator_conf_t LEDManager::caps_lock_indicator_conf_default =
{
.enabled = 0,
.red = 255,
.green = 80,
.blue = 0,
.white = 0,
.is_valid = 0x00, /* The valid Caps Lock indicator config when is_valid == 0x00 */
};

result_t LEDManager::init( const LEDManager_init_config_t & config )
{
result_t result = RESULT_ERR;
Expand All @@ -84,6 +94,10 @@ result_t LEDManager::init( const LEDManager_init_config_t & config )
result = brightness_init();
EXIT_IF_ERR( result, "brightness_init failed" );

/* Initialize the Caps Lock LED indicator */
result = caps_lock_indicator_init();
EXIT_IF_ERR( result, "caps_lock_indicator_init failed" );

/* Initialize the keyscanner communication interface */
result = comks_init( );
EXIT_IF_ERR( result, "com_ks_init failed" );
Expand Down Expand Up @@ -270,6 +284,43 @@ void LEDManager::cfgmem_brightness_wireless_underglow_save( uint8_t wireless_und
UNUSED( result );
}

void LEDManager::cfgmem_caps_lock_indicator_config_save( const caps_lock_indicator_conf_t * p_new_conf )
{
result_t result = RESULT_ERR;

result = ConfigManager.config_item_update( p_caps_lock_indicator_conf, p_new_conf, sizeof( caps_lock_indicator_conf_t) );
ASSERT_DYGMA( result == RESULT_OK, "ConfigManager.config_item_update failed" );

UNUSED( result );
}

void LEDManager::cfgmem_caps_lock_indicator_enabled_save( uint8_t enabled )
{
result_t result = RESULT_ERR;

result = ConfigManager.config_item_update( &p_caps_lock_indicator_conf->enabled, &enabled, sizeof( p_caps_lock_indicator_conf->enabled) );
ASSERT_DYGMA( result == RESULT_OK, "ConfigManager.config_item_update failed" );

UNUSED( result );
}

void LEDManager::cfgmem_caps_lock_indicator_color_save( uint8_t red, uint8_t green, uint8_t blue )
{
result_t result = RESULT_ERR;
caps_lock_indicator_conf_t new_conf = *p_caps_lock_indicator_conf;

new_conf.red = red;
new_conf.green = green;
new_conf.blue = blue;
new_conf.white = 0;
new_conf.is_valid = 0x00;

result = ConfigManager.config_item_update( p_caps_lock_indicator_conf, &new_conf, sizeof( caps_lock_indicator_conf_t) );
ASSERT_DYGMA( result == RESULT_OK, "ConfigManager.config_item_update failed" );

UNUSED( result );
}

/****************************************************/
/* LED Control */
/****************************************************/
Expand Down Expand Up @@ -740,7 +791,9 @@ kbdapi_event_result_t LEDManager::command_led_process( const char * p_command )
BRIGHTNESS_UG_WIRED,
BRIGHTNESS_WIRELESS,
BRIGHTNESS_UG_WIRELESS,
FADE_EFFECT
FADE_EFFECT,
CAPS_LOCK_INDICATOR_ENABLED,
CAPS_LOCK_INDICATOR_COLOR
} subCommand;

if ( LEDLayers.leds_count_get() == 0 ) return KBDAPI_EVENT_RESULT_IGNORED;
Expand All @@ -750,7 +803,9 @@ kbdapi_event_result_t LEDManager::command_led_process( const char * p_command )
"led.brightnessUG\n"
"led.brightness.wireless\n"
"led.brightnessUG.wireless\n"
"led.fade\n"))
"led.fade\n"
"led.capsLockIndicator.enabled\n"
"led.capsLockIndicator.color\n"))
return KBDAPI_EVENT_RESULT_IGNORED;

if (strncmp(p_command, "led.", 4) != 0) return KBDAPI_EVENT_RESULT_IGNORED;
Expand All @@ -766,6 +821,10 @@ kbdapi_event_result_t LEDManager::command_led_process( const char * p_command )
subCommand = BRIGHTNESS_UG_WIRELESS;
else if (strcmp(p_command + 4, "fade") == 0)
subCommand = FADE_EFFECT;
else if (strcmp(p_command + 4, "capsLockIndicator.enabled") == 0)
subCommand = CAPS_LOCK_INDICATOR_ENABLED;
else if (strcmp(p_command + 4, "capsLockIndicator.color") == 0)
subCommand = CAPS_LOCK_INDICATOR_COLOR;
else
return KBDAPI_EVENT_RESULT_IGNORED;

Expand Down Expand Up @@ -857,6 +916,44 @@ kbdapi_event_result_t LEDManager::command_led_process( const char * p_command )

LEDLayers.fade_effect_setup( fade_effect_enable );
}
break;
}
case CAPS_LOCK_INDICATOR_ENABLED:
{
if (::Focus.isEOL())
{
::Focus.send( p_caps_lock_indicator_conf->enabled );
}
else
{
uint8_t enabled;

::Focus.read(enabled);
enabled = ( enabled == 0 ) ? 0 : 1;
cfgmem_caps_lock_indicator_enabled_save( enabled );
}
break;
}
case CAPS_LOCK_INDICATOR_COLOR:
{
if (::Focus.isEOL())
{
::Focus.send( p_caps_lock_indicator_conf->red,
p_caps_lock_indicator_conf->green,
p_caps_lock_indicator_conf->blue );
}
else
{
uint8_t red;
uint8_t green;
uint8_t blue;

::Focus.read(red);
::Focus.read(green);
::Focus.read(blue);
cfgmem_caps_lock_indicator_color_save( red, green, blue );
}
break;
}
case MODE:
{
Expand Down Expand Up @@ -1188,6 +1285,22 @@ INLINE result_t LEDManager::brightness_init( void )
return RESULT_OK;
}

INLINE result_t LEDManager::caps_lock_indicator_init( void )
{
result_t result = RESULT_ERR;

result = ConfigManager.config_item_request( ConfigManager::CFG_ITEM_TYPE_LEDS_CAPS_LOCK_INDICATOR, (const void **)&p_caps_lock_indicator_conf );
EXIT_IF_ERR( result, "ConfigManager.config_item_request failed" );

if( p_caps_lock_indicator_conf->is_valid != 0x00 )
{
cfgmem_caps_lock_indicator_config_save( &caps_lock_indicator_conf_default );
}

_EXIT:
return result;
}

/****************************************************/
/* Machine */
/****************************************************/
Expand Down
17 changes: 17 additions & 0 deletions LEDManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ class LEDManager {
uint8_t is_valid; /* The valid brightness config when is_valid == 0x00 */
} brightness_conf_t;

typedef struct PACK
{
uint8_t enabled;
uint8_t red;
uint8_t green;
uint8_t blue;
uint8_t white;
uint8_t is_valid; /* The valid Caps Lock indicator config when is_valid == 0x00 */
} caps_lock_indicator_conf_t;

typedef struct PACK
{
uint8_t fade_effect;
Expand Down Expand Up @@ -149,6 +159,10 @@ class LEDManager {
void cfgmem_brightness_wireless_backlight_save( uint8_t wireless_backlight );
void cfgmem_brightness_wireless_underglow_save( uint8_t wireless_underglow );

void cfgmem_caps_lock_indicator_config_save( const caps_lock_indicator_conf_t * p_new_conf );
void cfgmem_caps_lock_indicator_enabled_save( uint8_t enabled );
void cfgmem_caps_lock_indicator_color_save( uint8_t red, uint8_t green, uint8_t blue );

result_t comks_init( void );
void comks_connected( Packet packet );
void comks_retry_layers( Packet packet );
Expand Down Expand Up @@ -219,10 +233,13 @@ class LEDManager {
private:

static const brightness_conf_t brightness_conf_default;
static const caps_lock_indicator_conf_t caps_lock_indicator_conf_default;

const brightness_conf_t * p_brightness_conf;
const caps_lock_indicator_conf_t * p_caps_lock_indicator_conf;

INLINE result_t brightness_init( void );
INLINE result_t caps_lock_indicator_init( void );

/****************************************************/
/* Machine */
Expand Down