Skip to content

Commit

Permalink
Merge branch 'main' into dev/gizmo
Browse files Browse the repository at this point in the history
  • Loading branch information
Noisyfox authored Nov 12, 2023
2 parents 5669b4f + b1c325a commit d6c2192
Show file tree
Hide file tree
Showing 14 changed files with 174 additions and 70 deletions.
36 changes: 35 additions & 1 deletion doc/Auxiliary-fan.md
Original file line number Diff line number Diff line change
@@ -1 +1,35 @@
WIP
OrcaSlicer use `M106 P2` command to control auxiliary cooling fan.

If you are using Klipper, you can define a `M106` macro to control the both normal part cooling fan and auxiliary fan and exhuast fan.
Below is a reference configuration for Klipper.
*Note: Don't forget to change the pin name to the actual pin name you are using in the configuration*

```
# instead of using [fan], we define the default part cooling fan with [fan_generic] here
# this is the default part cooling fan
[fan_generic fan0]
pin: PA7
cycle_time: 0.01
hardware_pwm: false
# this is the auxiliary fan
# comment out it if you don't have auxiliary fan
[fan_generic fan2]
pin: PA8
cycle_time: 0.01
hardware_pwm: false
# this is the exhaust fan
# comment out it if you don't have exhaust fan
[fan_generic fan3]
pin: PA9
cycle_time: 0.01
hardware_pwm: false
[gcode_macro M106]
gcode:
{% set fan = 'fan' + (params.P|int if params.P is defined else 0)|string %}
{% set speed = (params.S|int if params.S is defined else 255) %}
SET_FAN_SPEED FAN={fan} SPEED={speed}
```
37 changes: 36 additions & 1 deletion doc/Chamber-temperature.md
Original file line number Diff line number Diff line change
@@ -1 +1,36 @@
WIP...
OrcaSlicer use `M141/M191` command to control active chamber heater.
If you are using Klipper, you can define these macros to control the active chamber heater.
Bellow is a reference configuration for Klipper.
*Note: Don't forget to change the pin name/values to the actual values you are using in the configuration*

```
[heater_generic chamber_heater]
heater_pin:PB10
max_power:1.0
# Note: here the temperature sensor should be the sensor you are using for chamber temperature, not the PTC sensor
sensor_type:NTC 100K MGB18-104F39050L32
sensor_pin:PA1
control = pid
pid_Kp = 63.418
pid_ki = 0.960
pid_kd = 1244.716
min_temp:0
max_temp:70
[gcode_macro M141]
gcode:
SET_HEATER_TEMPERATURE HEATER=chamber_heater TARGET={params.S|default(0)}
[gcode_macro M191]
gcode:
{% set s = params.S|float %}
{% if s == 0 %}
# If target temperature is 0, do nothing
M117 Chamber heating cancelled
{% else %}
SET_HEATER_TEMPERATURE HEATER=chamber_heater TARGET={s}
TEMPERATURE_WAIT SENSOR="heater_generic chamber_heater" MINIMUM={s-1} MAXIMUM={s+1}
M117 Chamber at target temperature
{% endif %}
```
36 changes: 35 additions & 1 deletion doc/air-filtration.md
Original file line number Diff line number Diff line change
@@ -1 +1,35 @@
WIP
OrcaSlicer use `M106 P3` command to control air-filtration/exhuast fan.

If you are using Klipper, you can define a `M106` macro to control the both normal part cooling fan and auxiliary fan and exhuast fan.
Below is a reference configuration for Klipper.
*Note: Don't forget to change the pin name to the actual pin name you are using in the configuration*

```
# instead of using [fan], we define the default part cooling fan with [fan_generic] here
# this is the default part cooling fan
[fan_generic fan0]
pin: PA7
cycle_time: 0.01
hardware_pwm: false
# this is the auxiliary fan
# comment out it if you don't have auxiliary fan
[fan_generic fan2]
pin: PA8
cycle_time: 0.01
hardware_pwm: false
# this is the exhaust fan
# comment out it if you don't have exhaust fan
[fan_generic fan3]
pin: PA9
cycle_time: 0.01
hardware_pwm: false
[gcode_macro M106]
gcode:
{% set fan = 'fan' + (params.P|int if params.P is defined else 0)|string %}
{% set speed = (params.S|int if params.S is defined else 255) %}
SET_FAN_SPEED FAN={fan} SPEED={speed}
```
32 changes: 16 additions & 16 deletions localization/i18n/en/OrcaSlicer_en.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n"
"X-Generator: Poedit 3.3.2\n"
"X-Generator: Poedit 3.4.1\n"

msgid "Supports Painting"
msgstr "Support Painting"
Expand Down Expand Up @@ -4080,7 +4080,7 @@ msgid "Upload failed\n"
msgstr ""

msgid "obtaining instance_id failed\n"
msgstr ""
msgstr "Obtaining instance_id failed\n"

msgid ""
"Your comment result cannot be uploaded due to some reasons. As follows:\n"
Expand Down Expand Up @@ -4660,7 +4660,7 @@ msgid "Please select a file"
msgstr "Please select a file"

msgid "Do you want to replace it"
msgstr ""
msgstr "Do you want to replace it?"

msgid "Message"
msgstr ""
Expand Down Expand Up @@ -5809,13 +5809,13 @@ msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
"by right-click the empty position of build plate and choose \"Add Primitive"
"\"->\"Timelapse Wipe Tower\"."
"by right-click the empty position of build plate and choose \"Add "
"Primitive\"->\"Timelapse Wipe Tower\"."
msgstr ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
"by right-click the empty position of build plate and choose \"Add Primitive"
"\"->\"Timelapse Wipe Tower\"."
"by right-click the empty position of build plate and choose \"Add "
"Primitive\"->\"Timelapse Wipe Tower\"."

msgid "Line width"
msgstr "Line width"
Expand Down Expand Up @@ -8543,10 +8543,10 @@ msgstr "Full fan speed at layer"

msgid ""
"Fan speed will be ramped up linearly from zero at layer "
"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer"
"\". \"full_fan_speed_layer\" will be ignored if lower than "
"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
"\"close_fan_the_first_x_layers\" to maximum at layer "
"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
msgstr ""

msgid "Support interface fan speed"
Expand Down Expand Up @@ -9716,21 +9716,21 @@ msgid ""
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"normal(auto) and tree(auto) are used to generate support automatically. If "
"Normal(auto) and Tree(auto) are used to generate support automatically. If "
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"

msgid "normal(auto)"
msgstr "normal(auto)"
msgstr "Normal(auto)"

msgid "tree(auto)"
msgstr "tree(auto)"
msgstr "Tree(auto)"

msgid "normal(manual)"
msgstr "normal(manual)"
msgstr "Normal(manual)"

msgid "tree(manual)"
msgstr "tree(manual)"
msgstr "Tree(manual)"

msgid "Support/object xy distance"
msgstr "Support/object xy distance"
Expand Down
Loading

0 comments on commit d6c2192

Please sign in to comment.