mirrors/clevo-keyboard
mirrors/clevo-keyboard
1
0
Fork 0
mirror of https://github.com/wessel-novacustom/clevo-keyboard.git synced 2024-11-15 03:34:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'charging-profile-state-fix' into 'master'

Browse source 
Remember last and re-set charging prio on barrel plug connect

See merge request tuxedocomputers/development/packages/tuxedo-keyboard!37
This commit is contained in:
Christoffer 2023-02-17 12:53:43 +00:00
parent 34117c7c68 334bff5f30
commit 3b4dcdca9c
1 changed files with 120 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
src/uniwill_keyboard.h
View file

@ -57,6 +57,9 @@
#define UNIWILL_BRIGHTNESS_DEFAULT UNIWILL_BRIGHTNESS_MAX * 0.30 #define UNIWILL_BRIGHTNESS_DEFAULT UNIWILL_BRIGHTNESS_MAX * 0.30
#define UNIWILL_COLOR_DEFAULT 0xffffff #define UNIWILL_COLOR_DEFAULT 0xffffff
static void uw_charging_priority_write_state(void);
static void uw_charging_profile_write_state(void);
struct tuxedo_keyboard_driver uniwill_keyboard_driver; struct tuxedo_keyboard_driver uniwill_keyboard_driver;
struct kbd_led_state_uw_t { struct kbd_led_state_uw_t {
@ -380,12 +383,19 @@ void uniwill_event_callb(u32 code)
kbd_led_state_uw.brightness = 0xc8; kbd_led_state_uw.brightness = 0xc8;
uniwill_write_kbd_bl_state(); uniwill_write_kbd_bl_state();
break; break;
// Also refresh keyboard state on cable switch event // Refresh keyboard state on cable switch event
case UNIWILL_OSD_DC_ADAPTER_CHANGE: case UNIWILL_OSD_DC_ADAPTER_CHANGE:
uniwill_write_kbd_bl_state(); uniwill_write_kbd_bl_state();
break; break;
} }
} }
switch (code) {
case UNIWILL_OSD_DC_ADAPTER_CHANGE:
msleep(50);
uw_charging_priority_write_state();
break;
}
} }
static ssize_t uw_brightness_show(struct device *child, static ssize_t uw_brightness_show(struct device *child,
@ -766,6 +776,35 @@ static int uw_lightbar_remove(struct platform_device *dev)
} }
static bool uw_charging_prio_loaded = false; static bool uw_charging_prio_loaded = false;
static bool uw_charging_prio_last_written_value;
static ssize_t uw_charging_prios_available_show(struct device *child,
struct device_attribute *attr,
char *buffer);
static ssize_t uw_charging_prio_show(struct device *child,
struct device_attribute *attr, char *buffer);
static ssize_t uw_charging_prio_store(struct device *child,
struct device_attribute *attr,
const char *buffer, size_t size);
struct uw_charging_prio_attrs_t {
struct device_attribute charging_prios_available;
struct device_attribute charging_prio;
} uw_charging_prio_attrs = {
.charging_prios_available = __ATTR(charging_prios_available, 0444, uw_charging_prios_available_show, NULL),
.charging_prio = __ATTR(charging_prio, 0644, uw_charging_prio_show, uw_charging_prio_store)
};
static struct attribute *uw_charging_prio_attrs_list[] = {
&uw_charging_prio_attrs.charging_prios_available.attr,
&uw_charging_prio_attrs.charging_prio.attr,
NULL
};
static struct attribute_group uw_charging_prio_attr_group = {
.name = "charging_priority",
.attrs = uw_charging_prio_attrs_list
};
/* /*
* charging_prio values * charging_prio values
@ -785,6 +824,8 @@ static int uw_set_charging_priority(u8 charging_priority)
next_data = (previous_data & ~(1 << 7)) | charging_priority; next_data = (previous_data & ~(1 << 7)) | charging_priority;
result = uniwill_write_ec_ram(0x07cc, next_data); result = uniwill_write_ec_ram(0x07cc, next_data);
if (result == 0)
uw_charging_prio_last_written_value = charging_priority;
return result; return result;
} }
@ -821,7 +862,57 @@ static int uw_has_charging_priority(bool *status)
return result; return result;
} }
static void uw_charging_priority_write_state(void)
{
if (uw_charging_prio_loaded)
uw_set_charging_priority(uw_charging_prio_last_written_value);
}
static void uw_charging_priority_init(struct platform_device *dev)
{
u8 value;
struct uniwill_device_features_t *uw_feats = &uniwill_device_features;
if (uw_feats->uniwill_has_charging_prio)
uw_charging_prio_loaded = sysfs_create_group(&dev->dev.kobj, &uw_charging_prio_attr_group) == 0;
// Read for state init
if (uw_charging_prio_loaded) {
uw_get_charging_priority(&value);
uw_charging_prio_last_written_value = value;
}
}
static bool uw_charging_profile_loaded = false; static bool uw_charging_profile_loaded = false;
static bool uw_charging_profile_last_written_value;
static ssize_t uw_charging_profiles_available_show(struct device *child,
struct device_attribute *attr,
char *buffer);
static ssize_t uw_charging_profile_show(struct device *child,
struct device_attribute *attr, char *buffer);
static ssize_t uw_charging_profile_store(struct device *child,
struct device_attribute *attr,
const char *buffer, size_t size);
struct uw_charging_profile_attrs_t {
struct device_attribute charging_profiles_available;
struct device_attribute charging_profile;
} uw_charging_profile_attrs = {
.charging_profiles_available = __ATTR(charging_profiles_available, 0444, uw_charging_profiles_available_show, NULL),
.charging_profile = __ATTR(charging_profile, 0644, uw_charging_profile_show, uw_charging_profile_store)
};
static struct attribute *uw_charging_profile_attrs_list[] = {
&uw_charging_profile_attrs.charging_profiles_available.attr,
&uw_charging_profile_attrs.charging_profile.attr,
NULL
};
static struct attribute_group uw_charging_profile_attr_group = {
.name = "charging_profile",
.attrs = uw_charging_profile_attrs_list
};
/* /*
* charging_profile values * charging_profile values
@ -843,13 +934,17 @@ static int uw_set_charging_profile(u8 charging_profile)
next_data = (previous_data & ~(0x03 << 4)) | charging_profile; next_data = (previous_data & ~(0x03 << 4)) | charging_profile;
result = uniwill_write_ec_ram(0x07a6, next_data); result = uniwill_write_ec_ram(0x07a6, next_data);
if (result == 0)
uw_charging_profile_last_written_value = charging_profile;
return result; return result;
} }
static int uw_get_charging_profile(u8 *charging_profile) static int uw_get_charging_profile(u8 *charging_profile)
{ {
int result = uniwill_read_ec_ram(0x07a6, charging_profile); int result = uniwill_read_ec_ram(0x07a6, charging_profile);
*charging_profile = (*charging_profile >> 4) & 0x03; if (result == 0)
*charging_profile = (*charging_profile >> 4) & 0x03;
return result; return result;
} }
@ -878,6 +973,27 @@ static int uw_has_charging_profile(bool *status)
return result; return result;
} }
static void uw_charging_profile_write_state(void)
{
if (uw_charging_profile_loaded)
uw_set_charging_profile(uw_charging_profile_last_written_value);
}
static void uw_charging_profile_init(struct platform_device *dev)
{
u8 value;
struct uniwill_device_features_t *uw_feats = &uniwill_device_features;
if (uw_feats->uniwill_has_charging_profile)
uw_charging_profile_loaded = sysfs_create_group(&dev->dev.kobj, &uw_charging_profile_attr_group) == 0;
// Read for state init
if (uw_charging_profile_loaded) {
uw_get_charging_profile(&value);
uw_charging_profile_last_written_value = value;
}
}
struct char_to_u8_t { struct char_to_u8_t {
char* descriptor; char* descriptor;
u8 value; u8 value;
@ -960,25 +1076,6 @@ static ssize_t uw_charging_profile_store(struct device *child,
return -EINVAL; return -EINVAL;
} }
struct uw_charging_profile_attrs_t {
struct device_attribute charging_profiles_available;
struct device_attribute charging_profile;
} uw_charging_profile_attrs = {
.charging_profiles_available = __ATTR(charging_profiles_available, 0444, uw_charging_profiles_available_show, NULL),
.charging_profile = __ATTR(charging_profile, 0644, uw_charging_profile_show, uw_charging_profile_store)
};
static struct attribute *uw_charging_profile_attrs_list[] = {
&uw_charging_profile_attrs.charging_profiles_available.attr,
&uw_charging_profile_attrs.charging_profile.attr,
NULL
};
static struct attribute_group uw_charging_profile_attr_group = {
.name = "charging_profile",
.attrs = uw_charging_profile_attrs_list
};
static struct char_to_u8_t charging_prio_options[] = { static struct char_to_u8_t charging_prio_options[] = {
{ .descriptor = "charge_battery", .value = 0x00 }, { .descriptor = "charge_battery", .value = 0x00 },
{ .descriptor = "performance", .value = 0x01 } { .descriptor = "performance", .value = 0x01 }
@ -1055,25 +1152,6 @@ static ssize_t uw_charging_prio_store(struct device *child,
return -EINVAL; return -EINVAL;
} }
struct uw_charging_prio_attrs_t {
struct device_attribute charging_prios_available;
struct device_attribute charging_prio;
} uw_charging_prio_attrs = {
.charging_prios_available = __ATTR(charging_prios_available, 0444, uw_charging_prios_available_show, NULL),
.charging_prio = __ATTR(charging_prio, 0644, uw_charging_prio_show, uw_charging_prio_store)
};
static struct attribute *uw_charging_prio_attrs_list[] = {
&uw_charging_prio_attrs.charging_prios_available.attr,
&uw_charging_prio_attrs.charging_prio.attr,
NULL
};
static struct attribute_group uw_charging_prio_attr_group = {
.name = "charging_priority",
.attrs = uw_charging_prio_attrs_list
};
struct uniwill_device_features_t *uniwill_get_device_features(void) struct uniwill_device_features_t *uniwill_get_device_features(void)
{ {
struct uniwill_device_features_t *uw_feats = &uniwill_device_features; struct uniwill_device_features_t *uw_feats = &uniwill_device_features;
@ -1172,11 +1250,8 @@ static int uniwill_keyboard_probe(struct platform_device *dev)
status = uw_lightbar_init(dev); status = uw_lightbar_init(dev);
uw_lightbar_loaded = (status >= 0); uw_lightbar_loaded = (status >= 0);
if (uw_feats->uniwill_has_charging_prio) uw_charging_priority_init(dev);
uw_charging_prio_loaded = sysfs_create_group(&dev->dev.kobj, &uw_charging_prio_attr_group) == 0; uw_charging_profile_init(dev);
if (uw_feats->uniwill_has_charging_profile)
uw_charging_profile_loaded = sysfs_create_group(&dev->dev.kobj, &uw_charging_profile_attr_group) == 0;
return 0; return 0;
} }