From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Sun, 24 Jun 2018 00:18:30 +0000 (-0700)
Subject: Default to US keyboard layout. #145
X-Git-Url: https://git.buildbotics.com/?a=commitdiff_plain;h=1df92faacfe877db5d14cc49efc9fb6ca014501e;p=bbctrl-firmware

Default to US keyboard layout. #145
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 801b607..20e353f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Buildbotics CNC Controller Firmware Changelog
 ## v0.3.25
  - Error on home if max-soft-limit <= min-soft-limit + 1. #139
  - Decrease boot time networking delay.
+ - Default to US keyboard layout. #145
 
 ## v0.3.24
  - Added unhome button on axis position popup.
diff --git a/scripts/install.sh b/scripts/install.sh
index ce0aee6..c11b480 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -34,6 +34,10 @@ fi
 sed -i 's/^TimeoutStartSec=.*$/TimeoutStartSec=1/' \
     /etc/systemd/system/network-online.target.wants/networking.service
 
+# Change to US keyboard layout
+sed -i 's/^XKBLAYOUT="gb"$/XKBLAYOUT="us" # Comment stops change on upgrade/' \
+    /etc/default/keyboard
+
 if $UPDATE_PY; then
     rm -rf /usr/local/lib/python*/dist-packages/bbctrl-*
     ./setup.py install --force