Adjust FAQ: _globals explanation; NOTEs in misc-macros.cfg.

OrcaSlicer profiles added.

.vscode/settings.json

@@ -32,9 +32,11 @@
 		"pico",
 		"Printables",
 		"Prusa",
+		"reformats",
 		"runout",
 		"scriptsize",
 		"Sovol",
+		"superslicer",
 		"textcolor",
 		"textit",
 		"texttt"
@@ -65,4 +67,18 @@
 		"titleBar.inactiveForeground": "#e7e7e799"
 	},
 	"peacock.color": "#512e0a"
+	// "[html][jinja][jinja-html]": {
+	// 	"editor.formatOnSave": false,
+	// 	"editor.defaultFormatter": "monosans.djlint",
+	// 	"editor.detectIndentation": true,
+	// 	"editor.linkedEditing": true,
+	// 	"editor.tabSize": 4,
+
+	// 	"djlint.enableLinting": true,
+	// 	"djlint.profile": "jinja"
+	// },
+	// "djlint.showInstallError": true,
+	// "djlint.useVenv": false,
+	// "djlint.pythonPath": "/home/bassam/.local/share/uv/tools",
+	// "djlint.formatLanguages": ["django-html", "jinja", "jinja-html"]
 }

README.md

@@ -48,6 +48,7 @@ ${\small{\textit{** Maintained by ElPainis}}}$
 - Pre-configured configuration bundles based on the [Ellis SuperSlicer Print Profiles](https://github.com/AndrewEllis93/Ellis-SuperSlicer-Profiles):
   - SuperSlicer
   - PrusaSlicer
+  - 🚀 OrcaSlicer 🚀
   - Printer profiles: `SV06/Plus`; `SV07/Plus`
 - Bed model and texture to use in SuperSlicer/PrusaSlicer.
 - Macros:
@@ -149,11 +150,12 @@ Please note:
 
 💡 Make sure `git` is installed (`sudo apt update && sudo apt install git`).
 
-1. `cd ~/printer_data/config`
+1. `ssh` into the Klipper host.
-2. Empty entire `~/printer_data/config` folder.
+2. `cd ~/printer_data/config`
+3. Empty entire `~/printer_data/config` folder.
    - In linux, you can delete files via `rm fileName` and directories via `rmdir directoryName`.
    - In linux, you can list files and folders via `ls -lah`.
-3. `git clone -b master --single-branch https://github.com/bassamanator/Sovol-SV06-firmware.git .` ⚠️ Don't miss the period!
+4. `git clone -b master --single-branch https://github.com/bassamanator/Sovol-SV06-firmware.git .` ⚠️ Don't miss the period!
 
 #### Method 2: Download the ZIP
 
@@ -187,7 +189,7 @@ Please note:
    restart_method: command
    ```
 
-3. Do a `FIRMWARE_RESTART`.
+3. Do a `FIRMWARE_RESTART` in the Klipper console.
 
 If the Klipper flash that you did earlier was successful, and you've done everything else correctly, you should see no errors or warnings in the `Mainsail`/`Fluidd` dashboard. 🎉 **Your printer has been Klipperized!** 🎉
 
@@ -336,11 +338,13 @@ Edit the relevant file according to your needs.
 | ---------------------- | ------------------------ |
 | `cfgs/misc-macros.cfg` | `[gcode_macro _globals]` |
 
-| Variable                           | Disable       | Enable        | Notes                                          |
+| Variable                           | Disable       | Enable         | Notes                                          |
-| ---------------------------------- | ------------- | ------------- | ---------------------------------------------- |
+| ---------------------------------- | ------------- | -------------- | ---------------------------------------------- |
-| `variable_beeping_enabled`         | `0`           | `1` (default) |
+| `variable_beeping_enabled`         | `0`           | `1` (default)  |
-| `variable_filament_sensor_enabled` | `0` (default) | `1`           |
+| `variable_filament_sensor_enabled` | `0` (default) | `1`            |
-| `variable_kamp_enable`             | `0` (default) | `1`           | See [here](#what-do-i-need-to-know-about-kamp) |
+| `variable_kamp_enable`             | `0` (default) | `1`            | See [here](#what-do-i-need-to-know-about-kamp) |
+| `variable_bed_temp_over`           | `0`           | `10` (default) | Speeds up print start                          |
+| `variable_bed_temp_not_exact`      | `0`           | `1` (default)  | Speeds up print start                          |
 
 ### How do I import a configuration bundle into SuperSlicer/PrusaSlicer?
 

cfgs/misc-macros.cfg

@@ -29,9 +29,11 @@ gcode:
     SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
 
 [gcode_macro _globals]
+# NOTE 0 = false; 1 = true
 variable_filament_sensor_enabled: 0 # NOTE Enable(1) or disable(0) the filament sensor, if one is connected
 variable_beeping_enabled: 1 # NOTE Enable(1) or disable(0) beeping everywhere except during gantry calibration
-variable_bed_temp_over: 10 # NOTE Start print if bed temperature is over by this amount, otherwise wait for temperature drop
+variable_bed_temp_over: 10 # NOTE Start print if bed temperature is over by this amount. Set to 0 to disable, meaning, wait for temperature to drop
+variable_bed_temp_not_exact: 1 # NOTE Start print if bed temperature is `target temperature - 1` (but continue to heat until target is reached)
 variable_kamp_enable: 0 # NOTE Enable(1) or disable(0) KAMP (adaptive mesh)
 variable_pre_purge_prime_length: 1.40
 gcode:
@@ -75,12 +77,20 @@ gcode:
 [gcode_macro M190]
 rename_existing: M99190
 gcode:
-    #Parameters
+    # Global variables/settings
+    {% set bedtempNotExact = printer["gcode_macro _globals"].bed_temp_not_exact|default(1)|int %}
+
+    # Parameters
     {% set s = params.S|float %}
 
     M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %}   ; Set bed temp
     {% if s != 0 %}
-        TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1}  ; Wait for bed temp (within 1 degree)
+        {% if bedtempNotExact == 1 %}
+            TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s-1} MAXIMUM={s+1}  ; set & wait for bed temp (within -1 or +1 degree)
+            M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; set & don't wait for bed temp
+        {% else %}
+            TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1}    ; Wait for bed temp (within +1 degree)
+        {% endif %}
     {% endif %}
 
 [gcode_macro PURGE_LINE]
@@ -97,7 +107,7 @@ gcode:
 
     #   Set safe speeds
     {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
-    {% set maxVelocityAdjusted =  (0.95 * maxVelocity * 60)|int  %}
+    {% set maxVelocityAdjusted = (0.95 * maxVelocity * 60)|int %}
 
     G92 E0.0                                ; reset extruder
     G90                                     ; Absolute positioning
@@ -132,7 +142,7 @@ gcode:
     {% set bedtempSlicer = bedtemp %}
     {% set bedtempOver = printer["gcode_macro _globals"].bed_temp_over|default(0)|int %}
     {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
-    {% set maxVelocityAdjusted =  (0.90 * maxVelocity * 60)|int %}
+    {% set maxVelocityAdjusted = (0.90 * maxVelocity * 60)|int %}
     {% set kampEnabled=printer["gcode_macro _globals"].kamp_enable|default(0)|int %}
 
     {% if printer.configfile.settings.safe_z_home %}
@@ -195,8 +205,8 @@ gcode:
     #   Set safe speeds
     {% set zVelocity = printer.configfile.settings.printer.max_z_velocity|default(15)|int %}
     {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
-    {% set zVelocityAdjusted =  (0.95 * zVelocity * 60)|int  %}
+    {% set zVelocityAdjusted = (0.95 * zVelocity * 60)|int %}
-    {% set maxVelocityAdjusted =  (0.95 * maxVelocity * 60)|int  %}
+    {% set maxVelocityAdjusted = (0.95 * maxVelocity * 60)|int %}
 
     #   Get Boundaries
     {% set max_x = printer.configfile.config["stepper_x"]["position_max"]|float %}
@@ -326,4 +336,4 @@ gcode:
         G4 P{dur}
         SET_PIN PIN=beeper VALUE=0
         G4 P{dur}
-    {% endfor %}
+    {% endfor %}

misc/orcaslicer-bundles/how-to-generate/README.md

@@ -0,0 +1,15 @@
+## Converting PrusaSlicer/SuperSlicer config bundles to OrcaSlicer
+
+OrcaSlicer configs can be converted from PrusaSlicer using [SuperSlicer_to_Orca_scripts](https://github.com/apparle/SuperSlicer_to_Orca_scripts). It is a fork of theophile's script with some enhancements which haven't been merged yet ([theophile/SuperSlicer_to_Orca_scripts#43](https://github.com/theophile/SuperSlicer_to_Orca_scripts/pull/43)). It does require a few perl modules which can be installed using `cpanminus` (or your favorite perl module manager).
+
+Most of the script is automated, with the exception of `printer_model` field which must be manually specified with a `json`. This attribute is used by OrcaSlicer to load the appropriate build plate images & STLs.
+
+```
+perl SuperSlicer_to_Orca_scripts/superslicer_to_orca.pl --input PrusaSlicer_config_bundle-2.9.2.ini --nozzle-size 0.4 --compatible_printers_condition KEEP --skip-link-system-printer --printer-models-json printer_models_conversion_mapping.json --output-config-bundle OrcaSlicer_config_bundle-2.9.2-DEV.zip
+```
+
+## How to use OrcaSlicer bundle:
+
+This config bundle can be imported into OrcaSlicer : `File > Import > Import configs...`
+
+Note, OrcaSlicer reformats the `json` and adds some default attributes, so the imported files cannot be directly compared with the contents of the zipped bundle. But you can use json comparison tools like [https://www.jsondiff.com/](https://www.jsondiff.com/) to analyze the differences if needed.

misc/orcaslicer-bundles/how-to-generate/printer_models_conversion_mapping.json

@@ -0,0 +1,12 @@
+{
+	"SV06 0.4 nozzle": "Sovol SV06",
+	"SV06 0.6 nozzle": "Sovol SV06",
+	"SV06 ACE 0.4 nozzle": "Sovol SV06 ACE",
+	"SV06 ACE 0.6 nozzle": "Sovol SV06 ACE",
+	"SV06 Plus 0.4 nozzle": "Sovol SV06 Plus",
+	"SV06 Plus 0.6 nozzle": "Sovol SV06 Plus",
+	"SV07 0.4 nozzle": "Sovol SV07",
+	"SV07 0.6 nozzle": "Sovol SV07",
+	"SV07 Plus 0.4 nozzle": "Sovol SV07 Plus",
+	"SV07 Plus 0.6 nozzle": "Sovol SV07 Plus"
+}