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
796cdb50
Commit
796cdb50
authored
Mar 01, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug Fix
parent
b3cca544
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
26 deletions
+27
-26
Pins.h
MK/Pins.h
+1
-1
MK_Main.cpp
MK/module/MK_Main.cpp
+24
-20
temperature.cpp
MK/module/temperature/temperature.cpp
+2
-5
No files found.
MK/Pins.h
View file @
796cdb50
...
...
@@ -2326,7 +2326,7 @@
* Ramps - FD v1 & v2
****************************************************************************************/
#if MB(RAMPS_FD_V1) || MB(RAMPS_FD_V2)
#define KNOWN_BOARD
1
#define KNOWN_BOARD
#if MB(RAMPS_FD_V1)
#define RAMPS_FD_V1
...
...
MK/module/MK_Main.cpp
View file @
796cdb50
...
...
@@ -6282,23 +6282,23 @@ inline void gcode_M400() { st_synchronize(); }
ECHO_M
(
"
\"
heads
\"
: {
\"
current
\"
:["
);
firstOccurrence
=
true
;
for
(
uint8_t
h
=
0
;
h
<
HOTENDS
;
h
++
)
{
if
(
!
firstOccurrence
)
ECHO_M
(
","
);
ECHO_V
(
degHotend
(
h
),
1
);
firstOccurrence
=
false
;
if
(
!
firstOccurrence
)
ECHO_M
(
","
);
ECHO_V
(
degHotend
(
h
),
1
);
firstOccurrence
=
false
;
}
ECHO_M
(
"],
\"
active
\"
:["
);
firstOccurrence
=
true
;
for
(
uint8_t
h
=
0
;
h
<
HOTENDS
;
h
++
)
{
if
(
!
firstOccurrence
)
ECHO_M
(
","
);
ECHO_V
(
degTargetHotend
(
h
),
1
);
firstOccurrence
=
false
;
if
(
!
firstOccurrence
)
ECHO_M
(
","
);
ECHO_V
(
degTargetHotend
(
h
),
1
);
firstOccurrence
=
false
;
}
ECHO_M
(
"],
\"
state
\"
:["
);
firstOccurrence
=
true
;
for
(
uint8_t
h
=
0
;
h
<
HOTENDS
;
h
++
)
{
if
(
!
firstOccurrence
)
ECHO_M
(
","
);
ECHO_M
(
degTargetHotend
(
h
)
>
EXTRUDER_AUTO_FAN_TEMPERATURE
?
"2"
:
"1"
);
firstOccurrence
=
false
;
if
(
!
firstOccurrence
)
ECHO_M
(
","
);
ECHO_M
(
degTargetHotend
(
h
)
>
EXTRUDER_AUTO_FAN_TEMPERATURE
?
"2"
:
"1"
);
firstOccurrence
=
false
;
}
ECHO_MV
(
"]}},
\"
time
\"
:"
,
HAL
::
timeInMilliseconds
());
...
...
@@ -6403,20 +6403,24 @@ inline void gcode_M400() { st_synchronize(); }
ECHO_M
(
","
);
ECHO_V
(
max_acceleration_units_per_sq_second
[
Z_AXIS
]);
for
(
uint8_t
i
=
0
;
i
<
EXTRUDERS
;
i
++
)
{
ECHO_M
(
","
);
ECHO_V
(
max_acceleration_units_per_sq_second
[
E_AXIS
+
i
]);
ECHO_M
(
","
);
ECHO_V
(
max_acceleration_units_per_sq_second
[
E_AXIS
+
i
]);
}
ECHO_M
(
"],
\"
currents
\"
:["
);
ECHO_V
(
motor_current
[
X_AXIS
]);
ECHO_M
(
","
);
ECHO_V
(
motor_current
[
Y_AXIS
]);
ECHO_M
(
","
);
ECHO_V
(
motor_current
[
Z_AXIS
]);
for
(
uint8_t
i
=
0
;
i
<
DRIVER_EXTRUDERS
;
i
++
)
{
ECHO_M
(
"],"
);
#if MB(ALLIGATOR)
ECHO_M
(
"
\"
currents
\"
:["
);
ECHO_V
(
motor_current
[
X_AXIS
]);
ECHO_M
(
","
);
ECHO_V
(
motor_current
[
Y_AXIS
]);
ECHO_M
(
","
);
ECHO_V
(
motor_current
[
Z_AXIS
]);
for
(
uint8_t
i
=
0
;
i
<
DRIVER_EXTRUDERS
;
i
++
)
{
ECHO_M
(
","
);
ECHO_V
(
motor_current
[
E_AXIS
+
i
]);
}
ECHO_EM
(
"],"
);
}
ECHO_EM
(
"],"
);
#endif
ECHO_M
(
"
\"
firmwareElectronics
\"
:
\"
"
);
#if MB(RAMPS_13_HFB) || MB(RAMPS_13_HHB) || MB(RAMPS_13_HFF) || MB(RAMPS_13_HHF) || MB(RAMPS_13_HHH)
...
...
MK/module/temperature/temperature.cpp
View file @
796cdb50
...
...
@@ -996,9 +996,6 @@ void tp_init() {
OUT_WRITE
(
SCK_PIN
,
LOW
);
OUT_WRITE
(
MOSI_PIN
,
HIGH
);
OUT_WRITE
(
MISO_PIN
,
HIGH
);
#else
pinMode
(
SS_PIN
,
OUTPUT
);
digitalWrite
(
SS_PIN
,
HIGH
);
#endif
OUT_WRITE
(
MAX6675_SS
,
HIGH
);
...
...
@@ -1290,8 +1287,8 @@ void disable_all_heaters() {
WRITE
(
MAX6675_SS
,
0
);
// ensure 100ns delay - a bit extra is fine
asm
(
"nop"
);
//
50ns on 20Mhz, 62.5ns on 16Mhz
asm
(
"nop"
);
//
50ns on 20Mhz, 62.5ns on 16Mhz
asm
(
"nop"
);
//
50ns on 20Mhz, 62.5ns on 16Mhz
asm
(
"nop"
);
//
50ns on 20Mhz, 62.5ns on 16Mhz
// read MSB
SPDR
=
0
;
...
...
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