Merge branch 'master' into promote-recovery

Author: ahoneybun

content/graphics-switch-pop.md

@@ -28,11 +28,13 @@ tableOfContents: true
 Many modern laptops with NVIDIA graphics cards have switchable graphics, which allows users to switch their primary GPU between the CPU's integrated graphics processor and the dedicated NVIDIA graphics card.
 The following System76 laptops have these switchable graphics capabilities:
 
-- Adder WS (addw1, addw2)
+- Adder WS (addw1, addw2, addw3)
+- Bonobo WS (bonw15)
 - Galago Pro (galp5 - NVIDIA models only)
-- Gazelle (gaze14, gaze15, gaze16, gaze17)
+- Gazelle (gaze14, gaze15, gaze16, gaze17, gaze18)
 - Kudu (kudu6)
-- Oryx Pro (oryp4, oryp4-b, oryp5, oryp6, oryp7, oryp8, oryp9, oryp10)
+- Oryx Pro (oryp4, oryp4-b, oryp5, oryp6, oryp7, oryp8, oryp9, oryp10, oryp11)
+- Serval WS (serw13)
 
 Pop!\_OS includes utilities for switching between these modes, which you can learn more about below.
 

content/graphics-switch-ubuntu.md

@@ -27,11 +27,13 @@ tableOfContents: true
 
 Many modern laptops with NVIDIA graphics cards have switchable graphics, which allows users to switch their primary GPU between the CPU's integrated graphics processor and the dedicated NVIDIA graphics card. The following System76 laptops have these switchable graphics capabilities:
 
-- Adder WS (addw1, addw2)
+- Adder WS (addw1, addw2, addw3)
+- Bonobo WS (bonw15)
 - Galago Pro (galp5 - NVIDIA models only)
-- Gazelle (gaze14, gaze15, gaze16, gaze17)
+- Gazelle (gaze14, gaze15, gaze16, gaze17, gaze18)
 - Kudu (kudu6)
-- Oryx Pro (oryp4, oryp4-b, oryp5, oryp6, oryp7, oryp8, oryp9, oryp10)
+- Oryx Pro (oryp4, oryp4-b, oryp5, oryp6, oryp7, oryp8, oryp9, oryp10, oryp11)
+- Serval WS (serw13)
 
 ## Graphics modes
 

content/guides.md

@@ -26,18 +26,21 @@ To see ports, keyboard layouts, function keys, and product quickstart guides, fi
 | Laptops | Desktops | Accessories |
 |:-------:|:--------:|:-----------:|
 | Adder WS [(addw1)](https://tech-docs.system76.com/models/addw1/README.html) | Meerkat [(meer5)](https://tech-docs.system76.com/models/meer5/README.html) | Launch [(launch_1)](https://tech-docs.system76.com/models/launch_1/README.html) |
-| Adder WS [(addw2)](https://tech-docs.system76.com/models/addw2/README.html) | Meerkat [(meer6)](https://tech-docs.system76.com/models/meer6/README.html)  | Luanch [(launch_2)](https://tech-docs.system76.com/models/launch_2/README.html) |
+| Adder WS [(addw2)](https://tech-docs.system76.com/models/addw2/README.html) | Meerkat [(meer6)](https://tech-docs.system76.com/models/meer6/README.html)  | Launch [(launch_2)](https://tech-docs.system76.com/models/launch_2/README.html) |
 | Adder WS [(addw3)](https://tech-docs.system76.com/models/addw3/README.html) | Thelio B4 [(thelio-b4)](https://tech-docs.system76.com/models/thelio-b4/README.html) | Launch Lite [(launch_lite_1)](https://tech-docs.system76.com/models/launch_lite_1/README.html) |
 | Bonobo WS [(bonw14)](https://tech-docs.system76.com/models/bonw14/README.html) | Thelio Major [(thelio-major-b1-b2/r1-r2)](https://tech-docs.system76.com/models/thelio-major-b1-b2-r1-r2/README.html) |  Launch Heavy [(launch_heavy_1)](https://tech-docs.system76.com/models/launch_heavy_1/README.html) | Thelio Major [(thelio-major-r3)](https://tech-docs.system76.com/models/thelio-major-r3/README.html) |
-| Darter Pro [(darp6)](https://tech-docs.system76.com/models/darp6/README.html) | Thelio Massive B1 [(thelio-massive-b1)](https://tech-docs.system76.com/models/thelio-massive-b1.2/README.html) |
-| Darter Pro [(darp7)](https://tech-docs.system76.com/models/darp7/README.html) | Thelio Mega R1 [(thelio-mega-r1)](https://tech-docs.system76.com/models/thelio-mega-r1.0/README.html) |
- Darter Pro [(darp8)](https://tech-docs.system76.com/models/darp8/README.html) | Thelio Mira R1 [(thelio-mira-r1)](https://tech-docs.system76.com/models/thelio-mira-r1.0/README.html) |
-| Galago Pro [(galp4)](https://tech-docs.system76.com/models/galp4/README.html) | Thelio Mira B1 [(thelio-mira-b1)](https://tech-docs.system76.com/models/thelio-mira-b1.0/README.html) |
-| Galago Pro [(galp5)](https://tech-docs.system76.com/models/galp5/README.html) | Thelio Mira R3 [(thelio-mira-r3)](https://tech-docs.system76.com/models/thelio-mira-r3/README.html) |
+| Bonobo WS [(bonw15)](https://tech-docs.system76.com/models/bonw15/README.html) | Thelio Massive B1 [(thelio-massive-b1)](https://tech-docs.system76.com/models/thelio-massive-b1.2/README.html) |
+| Darter Pro [(darp6)](https://tech-docs.system76.com/models/darp6/README.html) | Thelio Mega R1 [(thelio-mega-r1)](https://tech-docs.system76.com/models/thelio-mega-r1.0/README.html) |
+| Darter Pro [(darp7)](https://tech-docs.system76.com/models/darp7/README.html) | Thelio Mira R1 [(thelio-mira-r1)](https://tech-docs.system76.com/models/thelio-mira-r1.0/README.html) |
+ Darter Pro [(darp8)](https://tech-docs.system76.com/models/darp8/README.html) | Thelio Mira B1 [(thelio-mira-b1)](https://tech-docs.system76.com/models/thelio-mira-b1.0/README.html) |
+| Galago Pro [(galp4)](https://tech-docs.system76.com/models/galp4/README.html) | Thelio Mira R3 [(thelio-mira-r3)](https://tech-docs.system76.com/models/thelio-mira-r3/README.html) |
+| Galago Pro [(galp5)](https://tech-docs.system76.com/models/galp5/README.html) |
 | Galago Pro [(galp6)](https://tech-docs.system76.com/models/galp6/README.html) |
+| Galago Pro [(galp7)](https://tech-docs.system76.com/models/galp7/README.html) |
 | Gazelle [(gaze15)](https://tech-docs.system76.com/models/gaze15/README.html) |
 | Gazelle [(gaze16)](https://tech-docs.system76.com/models/gaze16/README.html) |
 | Gazelle [(gaze17)](https://tech-docs.system76.com/models/gaze17/README.html) |
+| Gazelle [(gaze18)](https://tech-docs.system76.com/models/gaze18/README.html) |
 | Kudu [(kudu6)](https://tech-docs.system76.com/models/kudu6/README.html) |
 | Lemur Pro [(lemp9)](https://tech-docs.system76.com/models/lemp9/README.html) |
 | Lemur Pro [(lemp10)](https://tech-docs.system76.com/models/lemp10/README.html) |

content/launch_2-firmware-update.md

@@ -0,0 +1,79 @@
+---
+title: Manual steps to update firmware on Launch and Launch Heavy keyboards
+description: >
+  Launch firmware before version 0.12.20 will need these manual steps to make sure they can reliably upgrade firmware with `fwupd`
+keywords:
+  - Firmware
+  - Open Firmware
+  - fwupd
+  - Launch_2
+  - Launch_heavy_1
+
+facebookImage: /_social/article
+twitterImage: /_social/article
+
+hidden: false
+section: software-troubleshooting
+tableOfContents: true
+---
+
+## Steps to take to update firmware
+
+* NOTE: This should only be necessary for firmware versions starting with `0.7.103-`. Newer versions should be able to update via the Firmware Manager in Pop!\_OS and Ubuntu, or via `fwupdmgr`.
+
+If you are receiving notifications that your `launch_2` or `launch_heavy_1` keyboard has an available firmware update, but the update won't install, this guide may help you manually flash the firmware update. We will be using the [System76 Keyboard Configurator](https://github.com/pop-os/keyboard-configurator/), but it will be in the testing mode that we use for factory firmware updates, as well as quality control.
+
+Manually updating firmware in this way will reset your Launch back to its factory defaults, undoing any customizations that you've made to mapping and LEDs. Before you begin, you may want to use the System76 Keyboard Configurator to export your layout. After the firmware update, it can be imported to restore all of your customizations.
+
+![Exporting Layout in Keyboard Configurator](/images/launch_2-firmware-update/heavy-export-layout.png)
+
+### Install software
+
+We have a package that will launch the System76 Keyboard Configurator in testing mode, which can be used to install this firmware update. Run the following command in a terminal:
+
+```
+sudo apt install test-launch-system76-keyboard-configurator
+```
+
+If you are not on Pop!\_OS or Ubuntu, you can also use the AppImage version of the System76 Keyboard Configurator and launch it with the `--launch-test` command line argument. You will also need to install `avrdude` and `dfu-programmer` if they are not installed already.
+
+Start System76 Keyboard Tester -- this will launch the System76 Keyboard Configurator in a test mode.
+
+![System76-Tester](/images/launch_2-firmware-update/Launch-system76-keyboard-tester.png)
+
+### Enter Bootloader mode
+
+Unplug the Launch Keyboard and hold <kbd>Esc</kbd> while plugging it back in. Continue to hold the <kbd>Esc</kbd> key for about 10 seconds, or until the firmware update button appears in the right side of the Configurator's header bar. The keyboard's LEDs will remain off while the keyboard is in bootloader mode.
+
+![System76-Tester-in-update-mode](/images/launch_2-firmware-update/Tester-in-firmware-update-mode.png)
+
+* NOTE: This occasionally takes a couple tries. If the LEDs come on and the keyboard powers on normally, try a few more times. In between retries, leave the keyboard unplugged for 15 to 20 seconds.
+
+### Update firmware
+
+When the firmware update button appears, it means that your keyboard is in bootloader mode and is ready for a firmware update. Click the firmware update button and select your keyboard's model to initiate the firmware update.
+
+* **WARNING:** Do not unplug the keyboard while firmware is updating! An incomplete firmware flash will render the keyboard inoperable and unflashable.
+
+![System76-Tester-firmware-update](/images/launch_2-firmware-update/Tester-in-firmware-update-mode-menu.png)
+
+Once the firmware update has completed, the keyboard will reset, the keyboard will be displayed in the Configurator window, and the LEDs will turn on to the default "spacetime" pattern.
+
+The button below the keyboard in the Configurator should now say "Configure Keyboard" instead of "Keyboard firmware update required!"
+
+![firmware-update-success](/images/launch_2-firmware-update/firmware-update-success.png)
+
+### Clean up and remove software
+
+We can remove the unneeded software with:
+
+```
+sudo apt remove test-launch-system76-keyboard-configurator
+sudo apt autoremove
+```
+
+Future updates will now be done with the firmware manager in Pop!\_OS or Ubuntu, and these manual steps should not be necessary.
+
+## Getting help
+
+If this does not work, please open a [support case](https://support.system76.com/) for for your keyboard. Factory updates to firmware done via ISP cable can be arranged.

content/power-on-failure-laptop.md

@@ -20,7 +20,7 @@ tableOfContents: true
 3. Confirm the outlet you are connecting to works by plugging in another device.
 4. Plug in the AC Adapter to the wall and computer. Laptops have a charging indicator in front with a light. Please provide the light color(s) and icon underneath it to the support team.
      - 4A. If the battery is removable, unplug the machine, remove the battery, and plug the machine back into the power source without the battery installed. Please provide the light status to the support team.
-5. To perform a hardware reset, unplug the system. Disconnect the CMOS battery for 30 seconds. Reconnect the CMOS battery and turn the computer on with the battery installed and the AC Adapter plugged in. Instructions to disconnect the CMOS battery can be found for your model [here](https://tech-docs.system76.com/README.html).
+5. To perform a hardware reset, unplug the system. Disconnect the main battery and CMOS battery for 30 seconds. Reconnect the CMOS battery and the main battery, connect the AC adapter, and power the computer on. Instructions to disconnect the main battery and CMOS battery can be found for your model [here](https://tech-docs.system76.com/README.html).
 6. If the keyboard backlight (both multi color and single color) comes on but nothing is on the display try the following steps:
     - 6a. Connect an external display if possible
     - 6b. Remove the bottom cover of the system (if you are comfortable) and remove one stick of RAM if you have more then one. This will allow us to test both sticks as a bad stick of RAM can cause a system to not boot. Refer to this [article](/articles/guides) to find the service manual for your system.

content/windows.md

@@ -38,7 +38,7 @@ Installing Windows is undertaken at your own risk. It's possible not all hardwar
 
 ## Windows 11
 
-> **Windows 11 Compatibility:** Windows 11 is not supported on all systems. Open Firmware systems do not support Secure Boot which is a requirement for Windows 11. If your computer does not meet [Windows 11 requirements](https://support.microsoft.com/en-us/topic/windows-11-system-requirements-86c11283-ea52-4782-9efd-7674389a7ba3), try Windows 10.  Windows 10 is still supported by Microsoft until [October of 2025](https://docs.microsoft.com/en-us/lifecycle/products/windows-10-home-and-pro).
+> **Windows 11 Compatibility:** Windows 11 is not supported on all systems. Open Firmware systems below 13th Gen do not support Secure Boot which is a requirement for Windows 11. If your computer does not meet [Windows 11 requirements](https://support.microsoft.com/en-us/topic/windows-11-system-requirements-86c11283-ea52-4782-9efd-7674389a7ba3), try Windows 10.  Windows 10 is still supported by Microsoft until [October of 2025](https://docs.microsoft.com/en-us/lifecycle/products/windows-10-home-and-pro).
 
 ### Compatibility Table
 
@@ -47,30 +47,36 @@ Installing Windows is undertaken at your own risk. It's possible not all hardwar
 | ------------ | ------------------ | ------------------ |
 | addw1        | Yes                | Yes                |
 | addw2        | Yes                | No                 |
-| addw3        | Yes                | No                 |
+| addw3        | Yes                | Yes                |
 | bonw14       | Yes                | No                 |
+| bonw15       | Yes                | Yes                |
 | darp6        | Yes                | No                 |
 | darp7        | Yes                | No                 |
 | darp8        | Yes                | No                 |
+| darp9        | Yes                | Yes                |
 | galp4        | Yes                | No                 |
 | galp5        | Yes                | No                 |
+| galp6        | Yes                | No                 |
+| galp7        | Yes                | Yes                |
 | gaze15       | Yes                | No                 |
 | gaze16       | Yes                | No                 |
 | gaze17       | Yes                | No                 |
-| gaze18       | Yes                | No                 |
+| gaze18       | Yes                | Yes                |
 | lemp9        | Yes                | No                 |
 | lemp10       | Yes                | No                 |
 | lemp11       | Yes                | No                 |
+| lemp12       | Yes                | Yes                |
 | oryp6        | Yes                | No                 |
 | oryp7        | Yes                | No                 |
 | oryp8        | Yes                | No                 |
 | oryp9        | Yes                | No                 |
 | oryp10       | Yes                | No                 |
+| oryp11       | Yes                | Yes                |
 | pang10       | Yes                | Yes                |
 | pang11       | Yes                | Yes                |
 | pang12       | Yes                | Yes                |
 | serw12       | Yes                | Yes                |
-| serw13       | Yes                | No                 |
+| serw13       | Yes                | Yes                |
 
 | Desktop Model     | Windows 10 Support | Windows 11 Support |
 | ----------------- | ------------------ | ------------------ |
@@ -84,15 +90,18 @@ Installing Windows is undertaken at your own risk. It's possible not all hardwar
 | thelio-b2         | Yes                | Yes                |
 | thelio-b3         | Yes                | Yes                |
 | thelio-b4         | Yes                | Yes                |
+| thelio-b5         | Yes                | Yes                |
 | thelio-mira-r1    | Yes                | Yes*               |
 | thelio-mira-r2    | Yes                | Yes*               |
 | thelio-mira-r3    | Yes                | Yes*               |
 | thelio-mira-b1    | Yes                | Yes*               |
 | thelio-mira-b2    | Yes                | Yes*               |
 | thelio-mira-b3    | Yes                | Yes*               |
+| thelio-mira-b4    | Yes                | Yes*               |
 | thelio-major-r1   | Yes                | Yes*               |
 | thelio-major-r2   | Yes                | Yes*               |
 | thelio-major-r3   | Yes                | Yes*               |
+| thelio-major-r4   | Yes                | Yes*               |
 | thelio-major-b1   | Yes                | Yes*               |
 | thelio-major-b2   | Yes                | Yes*               |
 | thelio-major-b3   | Yes                | Yes*               |

layouts/default.vue

@@ -30,6 +30,7 @@
       url-desktops="https://system76.com/desktops"
       url-mini="https://system76.com/desktops/meerkat"
       url-servers="https://system76.com/servers"
+      url-components="https://system76.com/components"
       url-keyboards="https://system76.com/accessories/launch"
       url-pop-os="https://pop.system76.com"
       url-contact="https://system76.com/contact"

package-lock.json

@@ -13,7 +13,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@nuxt/content": "^1.14.0",
-    "@system76/components": "^1.6.0",
+    "@system76/components": "^1.7.0",
     "@system76/design": "^5.4.1",
     "core-js": "^3.18.2",
     "nuxt": "^2.2.0",