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
cf945e01
Commit
cf945e01
authored
Apr 15, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start water pwm
parent
af2199cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
temperature.cpp
MK/module/temperature/temperature.cpp
+12
-3
No files found.
MK/module/temperature/temperature.cpp
View file @
cf945e01
...
...
@@ -43,6 +43,11 @@ int current_temperature_raw[4] = { 0 };
float
current_temperature
[
4
]
=
{
0.0
};
int
current_temperature_bed_raw
=
0
;
float
current_temperature_bed
=
0.0
;
#if ENABLED(LASER_WATER_COOLING)
int
current_temperature_water_raw
=
0
;
float
current_temperature_water
=
0.0
;
#endif
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
int
redundant_temperature_raw
=
0
;
float
redundant_temperature
=
0.0
;
...
...
@@ -53,7 +58,13 @@ float current_temperature_bed = 0.0;
float
bedKi
=
((
DEFAULT_bedKi
)
*
(
PID_dT
));
float
bedKd
=
((
DEFAULT_bedKd
)
/
(
PID_dT
));
#endif //PIDTEMPBED
#if ENABLED(PIDTEMPWATER)
float
waterKp
=
DEFAULT_waterKp
;
float
waterKi
=
((
DEFAULT_waterKi
)
*
(
PID_dT
));
float
waterKd
=
((
DEFAULT_waterKd
)
/
(
PID_dT
));
#endif
#if ENABLED(FAN_SOFT_PWM)
unsigned
char
fanSpeedSoftPwm
=
0
;
#if HAS(AUTO_FAN)
...
...
@@ -993,8 +1004,6 @@ void tp_init() {
#if ENABLED(LASER_WATER_COOLING)
SET_OUTPUT
(
LASER_WATER_COOLING_PIN
);
setPwmFrequency
(
LASER_WATER_COOLING_PIN
,
2
);
// No prescaling. Pwm frequency = F_CPU/256/64
digitalWrite
(
LASER_WATER_COOLING_PIN
,
50
);
analogWrite
(
LASER_WATER_COOLING_PIN
,
50
);
#endif
#if ENABLED(HEATER_0_USES_MAX6675)
...
...
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