Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
7fb4201e
Commit
7fb4201e
authored
9 years ago
by
Simone Primarosa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update 4.1.5 dev
parent
9667bff1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
8 deletions
+25
-8
changelog.md
Documentation/changelog.md
+2
-1
temperature.cpp
MarlinKimbra/temperature.cpp
+23
-7
No files found.
Documentation/changelog.md
View file @
7fb4201e
### Version 4.1.5
### Version 4.1.5
*
Implemented FAN_SOFT_PWM also for other fan that can be added in configuration_adv file.
*
Implemented FA
ST_PWM_FAN and FA
N_SOFT_PWM also for other fan that can be added in configuration_adv file.
*
Added the ability to set a min speed to the fan that can be added in configuration_adv file.
*
Added the ability to set a min speed to the fan that can be added in configuration_adv file.
*
General bugfix
### Version 4.1.4
### Version 4.1.4
*
Add support for Piggy Alligator board
*
Add support for Piggy Alligator board
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/temperature.cpp
View file @
7fb4201e
...
@@ -956,31 +956,47 @@ void tp_init() {
...
@@ -956,31 +956,47 @@ void tp_init() {
ANALOG_SELECT
(
FILWIDTH_PIN
);
ANALOG_SELECT
(
FILWIDTH_PIN
);
#endif
#endif
#if HAS_CONTROLLERFAN
SET_OUTPUT
(
CONTROLLERFAN_PIN
);
//Set pin used for driver cooling fan
#if ENABLED(FAST_PWM_FAN)
setPwmFrequency
(
CONTROLLERFAN_PIN
,
1
);
// No prescaling. Pwm frequency = F_CPU/256/8
#endif
#if ENABLED(FAN_SOFT_PWM)
soft_pwm_fan_controller
=
fanSpeedSoftPwm_controller
/
2
;
#endif
#endif
#if HAS_AUTO_FAN_0
#if HAS_AUTO_FAN_0
SET_OUTPUT
(
EXTRUDER_0_AUTO_FAN_PIN
);
SET_OUTPUT
(
EXTRUDER_0_AUTO_FAN_PIN
);
#if ENABLED(FAST_PWM_FAN)
setPwmFrequency
(
EXTRUDER_0_AUTO_FAN_PIN
,
1
);
// No prescaling. Pwm frequency = F_CPU/256/8
#endif
#endif
#endif
#if HAS_AUTO_FAN_1 && (EXTRUDER_1_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN)
#if HAS_AUTO_FAN_1 && (EXTRUDER_1_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN)
SET_OUTPUT
(
EXTRUDER_1_AUTO_FAN_PIN
);
SET_OUTPUT
(
EXTRUDER_1_AUTO_FAN_PIN
);
#if ENABLED(FAST_PWM_FAN)
setPwmFrequency
(
EXTRUDER_1_AUTO_FAN_PIN
,
1
);
// No prescaling. Pwm frequency = F_CPU/256/8
#endif
#endif
#endif
#if HAS_AUTO_FAN_2 && (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN) && (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
#if HAS_AUTO_FAN_2 && (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN) && (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
SET_OUTPUT
(
EXTRUDER_2_AUTO_FAN_PIN
);
SET_OUTPUT
(
EXTRUDER_2_AUTO_FAN_PIN
);
#if ENABLED(FAST_PWM_FAN)
setPwmFrequency
(
EXTRUDER_2_AUTO_FAN_PIN
,
1
);
// No prescaling. Pwm frequency = F_CPU/256/8
#endif
#endif
#endif
#if HAS_AUTO_FAN_3 && (EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN) && (EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN) && (EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_2_AUTO_FAN_PIN)
#if HAS_AUTO_FAN_3 && (EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN) && (EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN) && (EXTRUDER_3_AUTO_FAN_PIN != EXTRUDER_2_AUTO_FAN_PIN)
SET_OUTPUT
(
EXTRUDER_3_AUTO_FAN_PIN
);
SET_OUTPUT
(
EXTRUDER_3_AUTO_FAN_PIN
);
#endif
#if ENABLED(FAST_PWM_FAN)
setPwmFrequency
(
EXTRUDER_3_AUTO_FAN_PIN
,
1
);
// No prescaling. Pwm frequency = F_CPU/256/8
#if HAS_CONTROLLERFAN
#endif
SET_OUTPUT
(
CONTROLLERFAN_PIN
);
//Set pin used for driver cooling fan
#endif
#endif
#if ENABLED(FAN_SOFT_PWM)
#if ENABLED(FAN_SOFT_PWM)
#if HAS_CONTROLLERFAN
soft_pwm_fan_controller
=
fanSpeedSoftPwm_controller
/
2
;
#endif
#if HAS_AUTO_FAN
#if HAS_AUTO_FAN
soft_pwm_fan_auto
=
fanSpeedSoftPwm_auto
/
2
;
soft_pwm_fan_auto
=
fanSpeedSoftPwm_auto
/
2
;
#endif
#endif
#endif
#endif
#if HAS_POWER_CONSUMPTION_SENSOR
#if HAS_POWER_CONSUMPTION_SENSOR
ANALOG_SELECT
(
POWER_CONSUMPTION_PIN
);
ANALOG_SELECT
(
POWER_CONSUMPTION_PIN
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment