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
f797d3b4
Commit
f797d3b4
authored
Feb 12, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
951e0e16
5aa9a277
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
70 additions
and
169 deletions
+70
-169
MK.ino
MK/MK.ino
+1
-1
Pins.h
MK/Pins.h
+66
-165
MK_Main.cpp
MK/module/MK_Main.cpp
+1
-1
buzzer.cpp
MK/module/lcd/buzzer.cpp
+1
-1
buzzer.h
MK/module/lcd/buzzer.h
+1
-1
No files found.
MK/MK.ino
View file @
f797d3b4
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
* M110 - Set the current line number
* M110 - Set the current line number
* M111 - Set debug flags with S<mask>. See flag bits defined in Marlin.h.
* M111 - Set debug flags with S<mask>. See flag bits defined in Marlin.h.
* M112 - Emergency stop
* M112 - Emergency stop
* M114 - Output current position to serial port
, (V)erbose for user
* M114 - Output current position to serial port
* M115 - Capabilities string
* M115 - Capabilities string
* M117 - Display a message on the controller screen
* M117 - Display a message on the controller screen
* M119 - Output Endstop status to serial port
* M119 - Output Endstop status to serial port
...
...
MK/Pins.h
View file @
f797d3b4
This diff is collapsed.
Click to expand it.
MK/module/MK_Main.cpp
View file @
f797d3b4
...
@@ -5725,7 +5725,7 @@ inline void gcode_M226() {
...
@@ -5725,7 +5725,7 @@ inline void gcode_M226() {
uint16_t
beepS
=
code_seen
(
'S'
)
?
code_value_short
()
:
100
;
uint16_t
beepS
=
code_seen
(
'S'
)
?
code_value_short
()
:
100
;
uint32_t
beepP
=
code_seen
(
'P'
)
?
code_value_long
()
:
1000
;
uint32_t
beepP
=
code_seen
(
'P'
)
?
code_value_long
()
:
1000
;
if
(
beepP
>
5000
)
beepP
=
5000
;
// limit to 5 seconds
if
(
beepP
>
5000
)
beepP
=
5000
;
// limit to 5 seconds
buzz
(
beep
S
,
beepP
);
buzz
(
beep
P
,
beepS
);
}
}
#endif // HAS(BUZZER)
#endif // HAS(BUZZER)
...
...
MK/module/lcd/buzzer.cpp
View file @
f797d3b4
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#if HAS(BUZZER)
#if HAS(BUZZER)
#include "buzzer.h"
#include "buzzer.h"
void
buzz
(
uint16_t
freq
,
long
duration
)
{
void
buzz
(
long
duration
,
uint16_t
freq
)
{
if
(
freq
>
0
)
{
if
(
freq
>
0
)
{
#if ENABLED(LCD_USE_I2C_BUZZER)
#if ENABLED(LCD_USE_I2C_BUZZER)
lcd_buzz
(
duration
,
freq
);
lcd_buzz
(
duration
,
freq
);
...
...
MK/module/lcd/buzzer.h
View file @
f797d3b4
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#define BUZZER_H
#define BUZZER_H
#if HAS(BUZZER)
#if HAS(BUZZER)
void
buzz
(
uint16_t
freq
,
long
duration
);
void
buzz
(
long
duration
,
uint16_t
freq
);
#endif
#endif
#endif // BUZZER_H
#endif // BUZZER_H
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