Revert "[Changed] Try to use "Rescue" layer again"

This reverts commit a3e99c1.

CHANGELOG.md

@@ -29,11 +29,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - BoM
   - The field name `Reference` was accepted, but didn't work
 
-### Changed
-- No longer using "User.9" layer for KiCad 7/8
-  Reverting to "Rescue" like we used for KiCad 5
-
-
 ## [1.8.2] - 2024-10-28
 ### Added
 - Experimental GUI

docs/source/Changelog.rst

@@ -48,12 +48,6 @@ Fixed
 
    -  The field name ``Reference`` was accepted, but didn’t work
 
-Changed
-~~~~~~~
-
--  No longer using “User.9” layer for KiCad 7/8 Reverting to “Rescue”
-   like we used for KiCad 5
-
 [1.8.2] - 2024-10-28
 --------------------
 
@@ -113,8 +107,6 @@ Fixed
 -  Expansion of internal field names. KiCad expands “VALUE”, not
    “Value”, which is what you see in the GUI
 
-.. _changed-1:
-
 Changed
 ~~~~~~~
 
@@ -265,7 +257,7 @@ Fixed:
    fills, that could generate huge lines in the generated PCB, not
    supported by KiCad. (#660)
 
-.. _changed-2:
+.. _changed-1:
 
 Changed:
 ~~~~~~~~
@@ -396,7 +388,7 @@ Fixed
    -  Expansion of variables in fields could fail if the KiCad config
       wasn’t initialized
 
-.. _changed-3:
+.. _changed-2:
 
 Changed
 ~~~~~~~
@@ -426,7 +418,7 @@ Added
 -  Navigate results: A header and navigation bar (#582)
 -  BoM: support for SVG format in the logos (#383)
 
-.. _changed-4:
+.. _changed-3:
 
 Changed
 ~~~~~~~
@@ -623,7 +615,7 @@ Added
    -  Added a new mode where we can control the added/removed colors
       (#551)
 
-.. _changed-5:
+.. _changed-4:
 
 Changed
 ~~~~~~~
@@ -848,7 +840,7 @@ Added
    -  ``quote_all``: forces quotes to all values in the CSV output. (See
       #456)
 
-.. _changed-6:
+.. _changed-5:
 
 Changed
 ~~~~~~~
@@ -1028,7 +1020,7 @@ Fixed
 
    -  ref_y coordinate not used. (#419)
 
-.. _changed-7:
+.. _changed-6:
 
 Changed:
 ~~~~~~~~
@@ -1283,7 +1275,7 @@ Added
 
    -  Option to control the *SVG precision* (units scale)
 
-.. _changed-8:
+.. _changed-7:
 
 Changed
 ~~~~~~~
@@ -1428,7 +1420,7 @@ Fixed
 -  Position: Components wrongly separated by side when the side column
    wasn’t the last column (#313)
 
-.. _changed-9:
+.. _changed-8:
 
 Changed
 ~~~~~~~
@@ -1531,7 +1523,7 @@ Fixed
    when VAR isn’t defined. The old code tried to make it an absolute
    path.
 
-.. _changed-10:
+.. _changed-9:
 
 Changed
 ~~~~~~~
@@ -1594,7 +1586,7 @@ Fixed
    orientation.
 -  svg_pcb_print: page orientation for portrait.
 
-.. _changed-11:
+.. _changed-10:
 
 Changed
 ~~~~~~~
@@ -1754,7 +1746,7 @@ Added
 -  Support for ``--subst-models`` option for KiCad 6’s kicad2step.
    (#137)
 
-.. _changed-12:
+.. _changed-11:
 
 Changed
 ~~~~~~~
@@ -1845,7 +1837,7 @@ Added
 -  Basic KiCost support (**experimental**).
 -  Basic internal BoM and KiCost integration (**experimental**).
 
-.. _changed-13:
+.. _changed-12:
 
 Changed
 ~~~~~~~
@@ -1957,7 +1949,7 @@ Added
 -  KiAuto time-out control.
 -  Now you can import outputs from another config file.
 
-.. _changed-14:
+.. _changed-13:
 
 Changed
 ~~~~~~~
@@ -2004,7 +1996,7 @@ Added
 -  A filter to rotate footprints in the position file (#28).
 -  The step output now can download missing 3D models.
 
-.. _changed-15:
+.. _changed-14:
 
 Changed
 ~~~~~~~
@@ -2117,7 +2109,7 @@ Fixed
 [0.6.2] - 2020-08-25
 --------------------
 
-.. _changed-16:
+.. _changed-15:
 
 Changed
 ~~~~~~~
@@ -2150,7 +2142,7 @@ Added
 
 -  More robust behavior on GUI dependent commands.
 
-.. _changed-17:
+.. _changed-16:
 
 Changed
 ~~~~~~~
@@ -2202,7 +2194,7 @@ Added
    -  ``error_number`` -> ``number``
    -  ``regexp`` -> ``regex``
 
-.. _changed-18:
+.. _changed-17:
 
 Changed
 ~~~~~~~
@@ -2222,7 +2214,7 @@ Changed
 [0.5.0] - 2020-07-11
 --------------------
 
-.. _changed-19:
+.. _changed-18:
 
 Changed
 ~~~~~~~
@@ -2328,7 +2320,7 @@ Added
 -  Better debug information when a BoM fails to be generated.
 -  Support for compressed YAML files.
 
-.. _changed-20:
+.. _changed-19:
 
 Changed
 ~~~~~~~
@@ -2370,7 +2362,7 @@ Fixed
 [0.2.4] - 2020-05-19
 --------------------
 
-.. _changed-21:
+.. _changed-20:
 
 Changed
 ~~~~~~~

kibot/__main__.py

@@ -312,7 +312,6 @@ def detect_kicad():
     # KICAD_PATH isn't good on my system.
     # The kicad-nightly package overwrites the regular package!!
     GS.kicad_share_path = '/usr/share/kicad'
-    GS.work_layer = 'Rescue'
     if GS.ki6:
         GS.kicad_conf_path = pcbnew.GetSettingsManager().GetUserSettingsPath()
         if nightly:
@@ -325,8 +324,7 @@ def detect_kicad():
             GS.kicad_dir = 'kicad-nightly'
         GS.pro_ext = '.kicad_pro'
         # KiCad 6 doesn't support the Rescue layer
-        if not GS.ki7:
-            GS.work_layer = 'User.9'
+        GS.work_layer = 'User.9'
     else:
         # Bug in KiCad (#6989), prints to stderr:
         # `../src/common/stdpbase.cpp(62): assert "traits" failed in Get(test_dir): create wxApp before calling this`
@@ -335,6 +333,7 @@ def detect_kicad():
         with hide_stderr():
             GS.kicad_conf_path = pcbnew.GetKicadConfigPath()
         GS.pro_ext = '.pro'
+        GS.work_layer = 'Rescue'
     # Dirs to look for plugins
     GS.kicad_plugins_dirs = []
     # /usr/share/kicad/*