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
a87241b5
Commit
a87241b5
authored
Nov 19, 2014
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add M299 turn on/off beep sound temperature
parent
0cfc8af8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+7
-2
README.md
README.md
+1
-0
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
a87241b5
...
@@ -158,6 +158,7 @@
...
@@ -158,6 +158,7 @@
// M240 - Trigger a camera to take a photograph
// M240 - Trigger a camera to take a photograph
// M250 - Set LCD contrast C<contrast value> (value 0..63)
// M250 - Set LCD contrast C<contrast value> (value 0..63)
// M280 - set servo position absolute. P: servo index, S: angle or microseconds
// M280 - set servo position absolute. P: servo index, S: angle or microseconds
// M299 - Beep sound for temperature on/off
// M300 - Play beep sound S<frequency Hz> P<duration ms>
// M300 - Play beep sound S<frequency Hz> P<duration ms>
// M301 - Set PID parameters P I and D
// M301 - Set PID parameters P I and D
// M302 - Allow cold extrudes, or set the minimum extrude S<temperature>.
// M302 - Allow cold extrudes, or set the minimum extrude S<temperature>.
...
@@ -442,6 +443,7 @@ unsigned long starttime=0;
...
@@ -442,6 +443,7 @@ unsigned long starttime=0;
unsigned
long
stoptime
=
0
;
unsigned
long
stoptime
=
0
;
static
uint8_t
tmp_extruder
;
static
uint8_t
tmp_extruder
;
static
boolean
beeptemponoff
=
true
;
static
boolean
beeptemphe
=
false
;
static
boolean
beeptemphe
=
false
;
static
boolean
beeptemphb
=
false
;
static
boolean
beeptemphb
=
false
;
...
@@ -4375,6 +4377,9 @@ Sigma_Exit:
...
@@ -4375,6 +4377,9 @@ Sigma_Exit:
#endif // NUM_SERVOS > 0
#endif // NUM_SERVOS > 0
#if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
#if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
case
299
:
// M299 turn on/off beep sound temp
beeptemponoff
=
!
beeptemponoff
;
break
;
case
300
:
// M300
case
300
:
// M300
{
{
int
beepS
=
code_seen
(
'S'
)
?
code_value
()
:
110
;
int
beepS
=
code_seen
(
'S'
)
?
code_value
()
:
110
;
...
@@ -4397,7 +4402,7 @@ Sigma_Exit:
...
@@ -4397,7 +4402,7 @@ Sigma_Exit:
}
}
}
}
break
;
break
;
#endif // M300
#endif // M
299 - M
300
#ifdef PIDTEMP
#ifdef PIDTEMP
case
301
:
// M301
case
301
:
// M301
...
@@ -5700,7 +5705,7 @@ void manage_inactivity()
...
@@ -5700,7 +5705,7 @@ void manage_inactivity()
}
}
#if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
#if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
temptone
();
if
(
beeptemponoff
)
temptone
();
#endif
#endif
#ifdef CHDK //Check if pin should be set to LOW after M240 set it to HIGH
#ifdef CHDK //Check if pin should be set to LOW after M240 set it to HIGH
...
...
README.md
View file @
a87241b5
...
@@ -268,6 +268,7 @@ M Codes
...
@@ -268,6 +268,7 @@ M Codes
*
M221 Sfactor in percent- set extrude factor override percentage
*
M221 Sfactor in percent- set extrude factor override percentage
*
M240 - Trigger a camera to take a photograph
*
M240 - Trigger a camera to take a photograph
*
M280 - Position an RC Servo Pindex Sangle/microseconds, ommit S to report back current angle
*
M280 - Position an RC Servo Pindex Sangle/microseconds, ommit S to report back current angle
*
M299 - Turn on/off beep sound temperature
*
M300 - Play beepsound Sfrequency Hz Pduration ms
*
M300 - Play beepsound Sfrequency Hz Pduration ms
*
M301 - Set PID parameters P I and D
*
M301 - Set PID parameters P I and D
*
M302 - Allow cold extrudes
*
M302 - Allow cold extrudes
...
...
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