From b28503517ee9b4ba811b5f946f45817c3e519291 Mon Sep 17 00:00:00 2001
From: Antoine van Gelder <antoine@greatscottgadgets.com>
Date: Tue, 4 Jun 2024 14:00:13 +0200
Subject: [PATCH 1/2] repo: add ipython as a default dependency to greatfet

---
 docs/source/getting_started.rst | 4 ----
 host/pyproject.toml             | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst
index f6f30bbf..aae30cda 100644
--- a/docs/source/getting_started.rst
+++ b/docs/source/getting_started.rst
@@ -10,10 +10,6 @@ To use GreatFET you will need to ensure the following software is installed:
 
   * `Python <https://wiki.python.org/moin/BeginnersGuide/Download>`__ v3.8, or later.
 
-If you want to use GreatFET's interactive shell you will also need to install:
-
-  * `IPython <https://ipython.readthedocs.io>`__
-
 
 GreatFET Host Software Installation
 -----------------------------------
diff --git a/host/pyproject.toml b/host/pyproject.toml
index 93148729..36babdf1 100644
--- a/host/pyproject.toml
+++ b/host/pyproject.toml
@@ -34,7 +34,8 @@ dependencies = [
     "cmsis_svd",
     "tabulate",
     "prompt_toolkit",
-    "pygreat"
+    "pygreat",
+    "ipython~=8.25",
 ]
 
 dynamic = ["version"]

From 6bd9a8cea10d38d819671b9b4a8a1eab78dcceed Mon Sep 17 00:00:00 2001
From: Antoine van Gelder <antoine@greatscottgadgets.com>
Date: Tue, 4 Jun 2024 14:01:14 +0200
Subject: [PATCH 2/2] host: update udev rules to use uaccess tag rather than
 plugdev group

---
 host/util/54-greatfet.rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/host/util/54-greatfet.rules b/host/util/54-greatfet.rules
index 141a2567..78871649 100644
--- a/host/util/54-greatfet.rules
+++ b/host/util/54-greatfet.rules
@@ -1,2 +1,2 @@
-ATTR{idVendor}=="1d50", ATTR{idProduct}=="60e6", SYMLINK+="greatfet-one%k", MODE="660", GROUP="plugdev"
-ATTR{idVendor}=="1fc9", ATTR{idProduct}=="000c", SYMLINK+="nxp-dfu-%k", MODE="660", GROUP="plugdev"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1d50", ATTR{idProduct}=="60e6", SYMLINK+="greatfet-one%k", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1fc9", ATTR{idProduct}=="000c", SYMLINK+="nxp-dfu-%k", TAG+="uaccess"