Merge branch 'main' into main

KalicoCrew · Jan 2, 2025 · e25b7e5 · e25b7e5
2 parents 8601047 + 4089c35
commit e25b7e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -184,6 +184,7 @@ Can switch back to mainline klipper at any time via a `git checkout upstream_mai
 ```bash
 cd ~/klipper
 git remote add kalico https://github.com/KalicoCrew/kalico.git
+git fetch kalico
 git checkout -b upstream-main origin/master
 git branch -D master
 git checkout -b main kalico/main

diff --git a/docs/_kalico/mkdocs-requirements.txt b/docs/_kalico/mkdocs-requirements.txt
@@ -8,3 +8,4 @@ mdx-truly-sane-lists==1.3
 mdx-breakless-lists==1.0.1
 py-gfm==2.0.0
 markdown==3.6
+mkdocs-github-admonitions-plugin==0.0.3
diff --git a/docs/_kalico/mkdocs.yml b/docs/_kalico/mkdocs.yml
@@ -25,12 +25,14 @@ markdown_extensions:
   - mdx_partial_gfm
   - mdx_truly_sane_lists
   - mdx_breakless_lists
+  - admonition
 plugins:
   search:
     lang: en
   mkdocs-simple-hooks:
     hooks:
       on_page_markdown: "docs._kalico.mkdocs_hooks:transform"
+  gh-admonitions:
 
 # Website layout configuration (using mkdocs-material theme)
 theme:
@@ -153,4 +155,4 @@ nav:
     - TSL1401CL_Filament_Width_Sensor.md
     - Hall_Filament_Width_Sensor.md
   - Contact.md
-  - Sponsors.md
+  - Sponsors.md
diff --git a/klippy/extras/pid_calibrate.py b/klippy/extras/pid_calibrate.py
@@ -129,7 +129,9 @@ def temperature_update(self, read_time, temp, target_temp):
         if not self.started and temp >= self.temp_low:
             self.errored = True
             self.finish(read_time)
-            self.gcode.respond_info("temperature to high to start calibration")
+            self.gcode.respond_info(
+                "temperature is too high to start calibration"
+            )
             return
         else:
             self.started = True