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
a1309759
Commit
a1309759
authored
Mar 07, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Pause Pin
parent
aa0fa6a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
14 deletions
+17
-14
Configuration.h
MarlinKimbra/Configuration.h
+1
-0
Marlin.h
MarlinKimbra/Marlin.h
+13
-13
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+3
-1
No files found.
MarlinKimbra/Configuration.h
View file @
a1309759
...
...
@@ -684,6 +684,7 @@ your extruder heater takes 2 minutes to hit the target on heating.
// Setting firmware for filament end switch
//#define FILAMENT_END_SWITCH
#ifdef FILAMENT_END_SWITCH
#define PAUSEPINPULLUP
const
bool
PAUSE_PIN_INVERTING
=
false
;
// set to true to invert the logic of the pause pin.
#endif
...
...
MarlinKimbra/Marlin.h
View file @
a1309759
...
...
@@ -23,41 +23,41 @@
#include "pins.h"
#ifndef AT90USB
#define HardwareSerial_h // trick to disable the standard HWserial
#define HardwareSerial_h // trick to disable the standard HWserial
#endif
#if (ARDUINO >= 100)
#
include "Arduino.h"
#
include "Arduino.h"
#else
#
include "WProgram.h"
#
include "WProgram.h"
#endif
// Arduino < 1.0.0 does not define this, so we need to do it ourselves
#ifndef analogInputToDigitalPin
#
define analogInputToDigitalPin(p) ((p) + 0xA0)
#
define analogInputToDigitalPin(p) ((p) + 0xA0)
#endif
#ifdef AT90USB
#include "HardwareSerial.h"
#include "HardwareSerial.h"
#endif
#include "MarlinSerial.h"
#ifndef cbi
#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
#endif
#ifndef sbi
#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
#endif
#include "WString.h"
#ifdef AT90USB
#ifdef BTENABLED
#define MYSERIAL bt
#else
#define MYSERIAL Serial
#endif // BTENABLED
#ifdef BTENABLED
#define MYSERIAL bt
#else
#define MYSERIAL Serial
#endif // BTENABLED
#else
#define MYSERIAL MSerial
#endif
...
...
@@ -86,7 +86,7 @@ extern const char echomagic[] PROGMEM;
#define SERIAL_ECHOPAIR(name,value) (serial_echopair_P(PSTR(name),(value)))
#define SERIAL_EOL
SERIAL_ECHOLN(""
)
#define SERIAL_EOL
MYSERIAL.write('\n'
)
void
serial_echopair_P
(
const
char
*
s_P
,
float
v
);
void
serial_echopair_P
(
const
char
*
s_P
,
double
v
);
...
...
MarlinKimbra/Marlin_main.cpp
View file @
a1309759
...
...
@@ -606,7 +606,9 @@ void setup_pausepin()
{
#if defined(PAUSE_PIN) && PAUSE_PIN > -1
SET_INPUT
(
PAUSE_PIN
);
WRITE
(
PAUSE_PIN
,
HIGH
);
#ifdef PAUSEPINPULLUP
WRITE
(
PAUSE_PIN
,
HIGH
);
#endif
#endif
}
...
...
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