f

AVSLab · Dec 28, 2023 · 2ec5bd6 · 2ec5bd6
1 parent 7b6d9f0
commit 2ec5bd6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.ruff.toml b/.ruff.toml
@@ -1,9 +1 @@
 ignore-init-module-imports = true
-
-[lint.pydocstyle]
-convention = "google"
-
-[lint]
-select = ["D"]
-
-ignore = ["D100", "D101", "D102", "D103", "D104", "D105", "D106"]
diff --git a/src/bsk_rl/envs/general_satellite_tasking/.ruff.toml b/src/bsk_rl/envs/general_satellite_tasking/.ruff.toml
@@ -0,0 +1,9 @@
+[lint.pydocstyle]
+convention = "google"
+
+[lint]
+select = ["D", "W"]
+ignore = ["D100", "D101", "D102", "D103", "D104", "D105", "D106", "D107"]
+
+[lint.pycodestyle]
+max-doc-length = 88
diff --git a/src/bsk_rl/envs/general_satellite_tasking/simulation/fsw.py b/src/bsk_rl/envs/general_satellite_tasking/simulation/fsw.py
@@ -227,8 +227,12 @@ def _set_rw_config_msg(self) -> None:
         self.fswRwConfigMsg = self.dynamics.rwFactory.getConfigMessage()
 
     def _set_gateway_msgs(self) -> None:
+<<<<<<< HEAD
         """Create C-wrapped gateway messages such that different modules can write to
         this message and provide a common input msg for down-stream modules."""
+=======
+        """Create C-wrapped gateway messages such that different modules can write to this message and provide a common input msg for down-stream modules."""
+>>>>>>> ee9d664 (f)
         self.attRefMsg = cMsgPy.AttRefMsg_C()
         self.attGuidMsg = cMsgPy.AttGuidMsg_C()