Skip to content

Commit

Permalink
Added 15M2IMS1.113 (BeardOverflow#156)
Browse files Browse the repository at this point in the history
  • Loading branch information
AnonCoder3 committed Dec 30, 2024
1 parent b01861c commit d9cc35e
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 0 deletions.
1 change: 1 addition & 0 deletions docs/supported_devices.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
| Modern 15 A5M | 155LEMS1 | Issues:<br>- [#4](https://github.com/BeardOverflow/msi-ec/issues/4)<br>- [#57](https://github.com/BeardOverflow/msi-ec/issues/57)<br>- [#83](https://github.com/BeardOverflow/msi-ec/issues/83)<br> PRs:<br>- [#66](https://github.com/BeardOverflow/msi-ec/pull/66) | 16 | ✔️ Battery thresholds <br> ✔️ Webcam toggle <br> ✔️ Webcam block <br> ✔️ Fn <-> Win <br> ✔️ Cooler boost <br> ✔️ Shift mode <br> ✔️ Fan mode <br> ✔️ Mic mute LED <br> ✔️ Sound mute LED <br> ✔️ Keyboard backlight intensity |
| Modern 15 A11M | 1552EMS1 | Issues:<br>- [#48](https://github.com/BeardOverflow/msi-ec/issues/48)<br>- [#174](https://github.com/BeardOverflow/msi-ec/issues/174)<br> PRs:<br>- [#40](https://github.com/BeardOverflow/msi-ec/pull/40)<br>- [#125](https://github.com/BeardOverflow/msi-ec/pull/125)<br>- [#175](https://github.com/BeardOverflow/msi-ec/pull/175) | 2 | ✔️ Battery thresholds <br> ✔️ Webcam toggle <br> ✔️ Webcam block <br> ✔️ Fn <-> Win <br> ✔️ Cooler boost <br> ✔️ Shift mode <br> ✔️ Fan mode <br> ✔️ Mic mute LED <br> ✔️ Sound mute LED <br> ✔️ Keyboard backlight intensity |
| Modern 15 B7M | 15HKEMS1 | Issues:<br>- [#89](https://github.com/BeardOverflow/msi-ec/issues/89)<br> PRs:<br>- [#91](https://github.com/BeardOverflow/msi-ec/pull/91) | 18 | ✔️ Battery thresholds <br> ✔️ Webcam toggle <br> ✔️ Webcam block <br> ✔️ Fn <-> Win <br> ✔️ Cooler boost <br> ✔️ Shift mode <br> ✔️ Fan mode <br> ✔️ Mic mute LED <br> ✔️ Sound mute LED <br> ✔️ Keyboard backlight intensity |
| Raider GE68HX | 15M2IMS1 | Issues:<br>- [#156](https://github.com/BeardOverflow/msi-ec/issues/156)<br> PRs:<br>- | 34 | ✔️ Battery thresholds <br> ✔️ Webcam toggle <br> ❌ Webcam block <br> ✔️ Fn <-> Win <br> ✔️ Cooler boost <br> ✔️ Shift mode <br> ✔️ Fan mode <br> ✔️ Mic mute LED <br> ✔️ Sound mute LED <br> ✔️ Keyboard backlight intensity |
| Raider GE78HX SmartTouchpad | 17S2IMS1 | PRs:<br>- [#50](https://github.com/BeardOverflow/msi-ec/pull/50) | 27 | ✔️ Battery thresholds <br> ✔️ Webcam toggle <br> ✔️ Webcam block <br> ✔️ Fn <-> Win <br> ✔️ Cooler boost <br> ✔️ Shift mode <br> ✔️ Fan mode <br> ✔️ Mic mute LED <br> ✔️ Sound mute LED <br> ❌ Keyboard backlight intensity |
| Summit E14 Evo A12M | 14F1EMS1 | Issues:<br>- [#24](https://github.com/BeardOverflow/msi-ec/issues/24)<br>- [#103](https://github.com/BeardOverflow/msi-ec/issues/103)<br> PRs:<br>- [#30](https://github.com/BeardOverflow/msi-ec/pull/30)<br>- [#79](https://github.com/BeardOverflow/msi-ec/pull/79)<br>- [#110](https://github.com/BeardOverflow/msi-ec/pull/110) | 8 | ✔️ Battery thresholds <br> ✔️ Webcam toggle <br> ✔️ Webcam block <br> ✔️ Fn <-> Win <br> ✔️ Cooler boost <br> ✔️ Shift mode <br> ✔️ Fan mode <br> ❌ Mic mute LED <br> ✔️ Sound mute LED <br> ✔️ Keyboard backlight intensity |
| Summit E14 Flip Evo A13MT | 14F1EMS1 | Issues:<br>- [#136](https://github.com/BeardOverflow/msi-ec/issues/136)<br> PRs:<br>- [#144](https://github.com/BeardOverflow/msi-ec/pull/144) | 25 | ✔️ Battery thresholds <br> ✔️ Webcam toggle <br> ✔️ Webcam block <br> ✔️ Fn <-> Win <br> ✔️ Cooler boost <br> ✔️ Shift mode <br> ⭕ Fan mode <br> ✔️ Mic mute LED <br> ✔️ Sound mute LED <br> ✔️ Keyboard backlight intensity |
Expand Down
85 changes: 85 additions & 0 deletions msi-ec.c
Original file line number Diff line number Diff line change
Expand Up @@ -2705,6 +2705,90 @@ static struct msi_ec_conf CONF32 __initdata = {
},
};

static const char *ALLOWED_FW_34[] __initconst = {
"15M2IMS1.113", // Raider GE68HX 13VG
NULL
};

static struct msi_ec_conf CONF34 __initdata = {
.allowed_fw = ALLOWED_FW_34, // WMI2 based
.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,
// },
.webcam = {
.address = 0x2e,
.block_address = MSI_EC_ADDR_UNSUPP, // not in MSI app
.bit = 1,
},
.fn_win_swap = {
.address = 0xe8,
.bit = 4,
.invert = true,
},
.cooler_boost = {
.address = 0x98,
.bit = 7,
},
.shift_mode = {
.address = 0xd2,
.modes = {
{ SM_COMFORT_NAME, 0xc1 }, // Silent / Balanced / AI
{ SM_ECO_NAME, 0xc2 }, // Super Battery
{ SM_TURBO_NAME, 0xc4 }, // Performance
MSI_EC_MODE_NULL
},
},
.super_battery = {
.address = 0xeb,
.mask = 0x0f,
},
.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,
// Fan rpm is 480000 / value at combined: c8..c9
},
.gpu = {
.rt_temp_address = 0x80,
.rt_fan_speed_address = 0x89,
// Fan rpm is 480000 / value at combined: ca..cb
},
.leds = {
.micmute_led_address = 0x2c,
.mute_led_address = 0x2d,
.bit = 1,
},
.kbd_bl = {
.bl_mode_address = MSI_EC_ADDR_UNSUPP,
.bl_modes = { 0x00, 0x08 },
.max_mode = 1,
.bl_state_address = MSI_EC_ADDR_UNSUPP,
.state_base_value = 0x80,
.max_state = 3,
},
};

static struct msi_ec_conf *CONFIGURATIONS[] __initdata = {
&CONF0,
&CONF1,
Expand Down Expand Up @@ -2739,6 +2823,7 @@ static struct msi_ec_conf *CONFIGURATIONS[] __initdata = {
&CONF30,
&CONF31,
&CONF32,
&CONF34,
NULL
};

Expand Down

0 comments on commit d9cc35e

Please sign in to comment.