From 550d9d723a538de0aaf2a6a658d1e4a049f1ee65 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 27 Sep 2024 09:36:27 +0200 Subject: [PATCH 1/2] Fix iron (#734) (cherry picked from commit 6c040e3df920f600d3fd8de38179bdbafee53158) # Conflicts: # config/freertos/esp32/create.sh --- config/freertos/esp32/create.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh index 19c420c6..35d4a192 100755 --- a/config/freertos/esp32/create.sh +++ b/config/freertos/esp32/create.sh @@ -26,7 +26,11 @@ pushd $FW_TARGETDIR >/dev/null . $IDF_PATH/export.sh +<<<<<<< HEAD pip3 install catkin_pkg lark-parser colcon-common-extensions --break-system-packages +======= + pip3 install catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions +>>>>>>> 6c040e3 (Fix iron (#734)) popd >/dev/null From bb6fe674a2bed7b3d73ff1824876196b61ed486f Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 27 Sep 2024 09:52:14 +0200 Subject: [PATCH 2/2] Update create.sh --- config/freertos/esp32/create.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh index 35d4a192..103981bf 100755 --- a/config/freertos/esp32/create.sh +++ b/config/freertos/esp32/create.sh @@ -26,11 +26,7 @@ pushd $FW_TARGETDIR >/dev/null . $IDF_PATH/export.sh -<<<<<<< HEAD - pip3 install catkin_pkg lark-parser colcon-common-extensions --break-system-packages -======= - pip3 install catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions ->>>>>>> 6c040e3 (Fix iron (#734)) + pip3 install catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions --break-system-packages popd >/dev/null