Skip to content

Commit

Permalink
Merge pull request #102
Browse files Browse the repository at this point in the history
  • Loading branch information
teackot committed Feb 6, 2024
2 parents 4f0d5eb + d2b30fa commit ab7de01
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ Set this parameter to a supported EC firmware version to use its configuration a
- Alpha 15 B5EE / B5EEK (158LEMS1)
- Alpha 17 B5EEK (17LLEMS1)
- Bravo 17 A4DDR / A4DDK (17FKEMS1)
- Cyborg 15 A12VF (15K1IMS1)
- GP66 Leopard 10UG / 10UE / 10UH (1542EMS1)
- GS66 Stealth 11UE (16V4EMS1)
- GF63 Thin 11UC (16R6EMS1)
Expand All @@ -265,4 +266,3 @@ Set this parameter to a supported EC firmware version to use its configuration a
Eager to support the project? Your help is always welcome to keep the project alive and going!
- Checkout the relevant [wiki article](https://github.com/BeardOverflow/msi-ec/wiki/Contributing).
- If you want to go deeper: [read into this discussion regarding ec firmware naming patterns](https://github.com/BeardOverflow/msi-ec/discussions/98).

84 changes: 83 additions & 1 deletion msi-ec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,6 @@ static struct msi_ec_conf CONF14 __initdata = {
},
};


static const char *ALLOWED_FW_15[] __initconst = {
"15CKEMS1.108", // MSI Delta 15 A5EFK
NULL
Expand Down Expand Up @@ -1395,6 +1394,88 @@ static struct msi_ec_conf CONF16 __initdata = {
},
};

static const char *ALLOWED_FW_17[] __initconst = {
"15K1IMS1.110", // MSI CYBORG 12 A12VF
NULL
};

static struct msi_ec_conf CONF17 __initdata = {
.allowed_fw = ALLOWED_FW_17,
.charge_control = {
.address = 0xd7,
.offset_start = 0x8a,
.offset_end = 0x80,
.range_min = 0x8a,
.range_max = 0xe4,
},
// .usb_share {
// .address = 0xbf, // states: 0x08 || 0x28
// .bit = 5,
// }, // Like Katana 17 B11UCX
.webcam = {
.address = 0x2e,
.block_address = 0x2f,
.bit = 1,
},
.fn_win_swap = {
.address = 0xe8,
.bit = 4, // 0x01-0x11
},
.cooler_boost = {
.address = 0x98,
.bit = 7,
},
.shift_mode = {
.address = 0xd2,
.modes = {
{ SM_ECO_NAME, 0xc2 }, // super battery
{ SM_COMFORT_NAME, 0xc1 }, // balanced
{ SM_TURBO_NAME, 0xc4 }, // extreme
MSI_EC_MODE_NULL
},
},
.super_battery = {
.address = 0xeb, // 0x0F ( on ) or 0x00 ( off ) on 0xEB
.mask = 0x0f, // 00, 0f
},
.fan_mode = {
.address = 0xd4,
.modes = {
{ FM_AUTO_NAME, 0x0d },
{ FM_SILENT_NAME, 0x1d },
{ FM_ADVANCED_NAME, 0x8d },
MSI_EC_MODE_NULL
},
},
.cpu = {
.rt_temp_address = 0x68,
.rt_fan_speed_address = 0x71,
.rt_fan_speed_base_min = 0x00,
.rt_fan_speed_base_max = 0x96,
.bs_fan_speed_address = MSI_EC_ADDR_UNSUPP,
.bs_fan_speed_base_min = 0x00,
.bs_fan_speed_base_max = 0x0f,
// n/rpm register is C9
},
.gpu = {
.rt_temp_address = 0x80,
.rt_fan_speed_address = 0x89,
},
.leds = {
.micmute_led_address = 0x2c,
.mute_led_address = 0x2d,
.bit = 1,
},
.kbd_bl = {
.bl_mode_address = 0x2c, // KB auto turn off
.bl_modes = { 0x00, 0x08 }, // always on; off after 10 sec
.max_mode = 1,
.bl_state_address = 0xd3,
.state_base_value = 0x80,
.max_state = 3,
},
};

static struct msi_ec_conf *CONFIGURATIONS[] __initdata = {
&CONF0,
&CONF1,
Expand All @@ -1413,6 +1494,7 @@ static struct msi_ec_conf *CONFIGURATIONS[] __initdata = {
&CONF14,
&CONF15,
&CONF16,
&CONF17,
NULL
};

Expand Down

0 comments on commit ab7de01

Please sign in to comment.