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
1bdb8bb8
Commit
1bdb8bb8
authored
Feb 24, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
f1c9d953
14af5afb
Changes
11
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
384 additions
and
433 deletions
+384
-433
Configuration_Feature.h
MK/Configuration_Feature.h
+1
-2
Pins.h
MK/Pins.h
+13
-13
MK_Main.cpp
MK/module/MK_Main.cpp
+239
-246
MK_Main.h
MK/module/MK_Main.h
+2
-2
conditionals.h
MK/module/conditionals.h
+1
-0
language.h
MK/module/language/language.h
+1
-1
ultralcd.cpp
MK/module/lcd/ultralcd.cpp
+2
-2
ultralcd.h
MK/module/lcd/ultralcd.h
+2
-1
stepper.cpp
MK/module/motion/stepper.cpp
+112
-155
stepper.h
MK/module/motion/stepper.h
+2
-2
temperature.cpp
MK/module/temperature/temperature.cpp
+9
-9
No files found.
MK/Configuration_Feature.h
View file @
1bdb8bb8
...
@@ -561,8 +561,7 @@
...
@@ -561,8 +561,7 @@
//#define ADVANCE
//#define ADVANCE
#define EXTRUDER_ADVANCE_K .0
#define EXTRUDER_ADVANCE_K .0
#define D_FILAMENT 2.85
#define D_FILAMENT 1.75
#define STEPS_MM_E 836
/*****************************************************************************************/
/*****************************************************************************************/
...
...
MK/Pins.h
View file @
1bdb8bb8
MK/module/MK_Main.cpp
View file @
1bdb8bb8
This diff is collapsed.
Click to expand it.
MK/module/MK_Main.h
View file @
1bdb8bb8
...
@@ -89,7 +89,7 @@ void refresh_cmd_timeout();
...
@@ -89,7 +89,7 @@ void refresh_cmd_timeout();
extern
void
delay_ms
(
millis_t
ms
);
extern
void
delay_ms
(
millis_t
ms
);
#if ENABLED(FAST_PWM_FAN)
#if ENABLED(FAST_PWM_FAN)
void
setPwmFrequency
(
uint8_t
pin
,
in
t
val
);
void
setPwmFrequency
(
uint8_t
pin
,
uint8_
t
val
);
#endif
#endif
extern
float
homing_feedrate
[];
extern
float
homing_feedrate
[];
...
@@ -120,7 +120,7 @@ extern uint8_t axis_was_homed;
...
@@ -120,7 +120,7 @@ extern uint8_t axis_was_homed;
#endif
#endif
#if ENABLED(NPR2)
#if ENABLED(NPR2)
extern
in
t
old_color
;
// old color for system NPR2
extern
uint8_
t
old_color
;
// old color for system NPR2
#endif
#endif
#if MECH(DELTA)
#if MECH(DELTA)
...
...
MK/module/conditionals.h
View file @
1bdb8bb8
...
@@ -234,6 +234,7 @@
...
@@ -234,6 +234,7 @@
*/
*/
#if ENABLED(DONDOLO)
#if ENABLED(DONDOLO)
#undef SINGLENOZZLE
#undef SINGLENOZZLE
#undef ADVANCE
#undef DRIVER_EXTRUDERS
#undef DRIVER_EXTRUDERS
#define DRIVER_EXTRUDERS 1
#define DRIVER_EXTRUDERS 1
#endif
#endif
...
...
MK/module/language/language.h
View file @
1bdb8bb8
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
#define SERIAL_ACTIVE_COLOR "Active Color: "
#define SERIAL_ACTIVE_COLOR "Active Color: "
#define MSG_COUNT_X " Count X:"
#define MSG_COUNT_X " Count X:"
#define MSG_COUNT_A " Count A:"
#define MSG_COUNT_A " Count A:"
#define MSG_COUNT_ALPHA " Count Alpha:
"
#define MSG_COUNT_ALPHA " Count Alpha:"
#define SERIAL_X_MIN "x_min: "
#define SERIAL_X_MIN "x_min: "
#define SERIAL_X_MAX "x_max: "
#define SERIAL_X_MAX "x_max: "
#define SERIAL_Y_MIN "y_min: "
#define SERIAL_Y_MIN "y_min: "
...
...
MK/module/lcd/ultralcd.cpp
View file @
1bdb8bb8
...
@@ -2084,7 +2084,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
...
@@ -2084,7 +2084,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
WRITE
(
SHIFT_LD
,
HIGH
);
WRITE
(
SHIFT_LD
,
HIGH
);
for
(
int8_t
i
=
0
;
i
<
8
;
i
++
)
{
for
(
int8_t
i
=
0
;
i
<
8
;
i
++
)
{
newbutton_reprapworld_keypad
>>=
1
;
newbutton_reprapworld_keypad
>>=
1
;
if
(
READ
(
SHIFT_OUT
))
newbutton_reprapworld_keypad
|=
BIT
(
7
);
if
(
READ
(
SHIFT_OUT
))
BITSET
(
newbutton_reprapworld_keypad
,
7
);
WRITE
(
SHIFT_CLK
,
HIGH
);
WRITE
(
SHIFT_CLK
,
HIGH
);
WRITE
(
SHIFT_CLK
,
LOW
);
WRITE
(
SHIFT_CLK
,
LOW
);
}
}
...
@@ -2097,7 +2097,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
...
@@ -2097,7 +2097,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
unsigned
char
tmp_buttons
=
0
;
unsigned
char
tmp_buttons
=
0
;
for
(
int8_t
i
=
0
;
i
<
8
;
i
++
)
{
for
(
int8_t
i
=
0
;
i
<
8
;
i
++
)
{
newbutton
>>=
1
;
newbutton
>>=
1
;
if
(
READ
(
SHIFT_OUT
))
newbutton
|=
BIT
(
7
);
if
(
READ
(
SHIFT_OUT
))
BITSET
(
newbutton
,
7
);
WRITE
(
SHIFT_CLK
,
HIGH
);
WRITE
(
SHIFT_CLK
,
HIGH
);
WRITE
(
SHIFT_CLK
,
LOW
);
WRITE
(
SHIFT_CLK
,
LOW
);
}
}
...
...
MK/module/lcd/ultralcd.h
View file @
1bdb8bb8
...
@@ -120,7 +120,8 @@
...
@@ -120,7 +120,8 @@
#define EN_B BIT(BLEN_B)
#define EN_B BIT(BLEN_B)
#define EN_A BIT(BLEN_A)
#define EN_A BIT(BLEN_A)
#define LCD_CLICKED ((buttons&B_MI)||(buttons&B_ST))
#define LCD_CLICKED (buttons&(B_MI|B_ST))
#endif//NEWPANEL
#endif//NEWPANEL
char
*
itostr2
(
const
uint8_t
&
x
);
char
*
itostr2
(
const
uint8_t
&
x
);
...
...
MK/module/motion/stepper.cpp
View file @
1bdb8bb8
This diff is collapsed.
Click to expand it.
MK/module/motion/stepper.h
View file @
1bdb8bb8
...
@@ -117,7 +117,7 @@ void st_set_e_position(const long &e);
...
@@ -117,7 +117,7 @@ void st_set_e_position(const long &e);
long
st_get_position
(
uint8_t
axis
);
long
st_get_position
(
uint8_t
axis
);
// Get current position in mm
// Get current position in mm
float
st_get_position_mm
(
AxisEnum
axis
);
float
st_get_
axis_
position_mm
(
AxisEnum
axis
);
// The stepper subsystem goes to sleep when it runs out of things to execute. Call this
// The stepper subsystem goes to sleep when it runs out of things to execute. Call this
// to notify the subsystem that it is time to go to work.
// to notify the subsystem that it is time to go to work.
...
...
MK/module/temperature/temperature.cpp
View file @
1bdb8bb8
...
@@ -1006,9 +1006,9 @@ void tp_init() {
...
@@ -1006,9 +1006,9 @@ void tp_init() {
#endif // HEATER_0_USES_MAX6675
#endif // HEATER_0_USES_MAX6675
#ifdef DIDR2
#ifdef DIDR2
#define ANALOG_SELECT(pin) do{ if (pin < 8)
DIDR0 |= BIT(pin); else DIDR2 |= BIT(
pin - 8); }while(0)
#define ANALOG_SELECT(pin) do{ if (pin < 8)
BITSET(DIDR0, pin); else BITSET(DIDR2,
pin - 8); }while(0)
#else
#else
#define ANALOG_SELECT(pin) do{
DIDR0 |= BIT(
pin); }while(0)
#define ANALOG_SELECT(pin) do{
BITSET(DIDR0,
pin); }while(0)
#endif
#endif
// Set analog inputs
// Set analog inputs
...
@@ -1084,10 +1084,10 @@ void tp_init() {
...
@@ -1084,10 +1084,10 @@ void tp_init() {
// Use timer0 for temperature measurement
// Use timer0 for temperature measurement
// Interleave temperature interrupt with millies interrupt
// Interleave temperature interrupt with millies interrupt
OCR0B
=
128
;
OCR0B
=
128
;
TIMSK0
|=
BIT
(
OCIE0B
);
BITSET
(
TIMSK0
,
OCIE0B
);
// Wait for temperature measurement to settle
// Wait for temperature measurement to settle
delay
_ms
(
250
);
delay
(
250
);
#define TEMP_MIN_ROUTINE(NR) \
#define TEMP_MIN_ROUTINE(NR) \
minttemp[NR] = HEATER_ ## NR ## _MINTEMP; \
minttemp[NR] = HEATER_ ## NR ## _MINTEMP; \
...
@@ -1279,9 +1279,9 @@ void disable_all_heaters() {
...
@@ -1279,9 +1279,9 @@ void disable_all_heaters() {
max6675_temp
=
0
;
max6675_temp
=
0
;
#ifdef PRR
#ifdef PRR
PRR
&=
~
BIT
(
PRSPI
);
BITCLR
(
PRR
,
PRSPI
);
#elif defined(PRR0)
#elif defined(PRR0)
PRR0
&=
~
BIT
(
PRSPI
);
BITCLR
(
PRR0
,
PRSPI
);
#endif
#endif
SPCR
=
BIT
(
MSTR
)
|
BIT
(
SPE
)
|
BIT
(
SPR0
);
SPCR
=
BIT
(
MSTR
)
|
BIT
(
SPE
)
|
BIT
(
SPR0
);
...
@@ -1295,13 +1295,13 @@ void disable_all_heaters() {
...
@@ -1295,13 +1295,13 @@ void disable_all_heaters() {
// read MSB
// read MSB
SPDR
=
0
;
SPDR
=
0
;
for
(;
(
SPSR
&
BIT
(
SPIF
))
==
0
;);
for
(;
!
TEST
(
SPSR
,
SPIF
)
;);
max6675_temp
=
SPDR
;
max6675_temp
=
SPDR
;
max6675_temp
<<=
8
;
max6675_temp
<<=
8
;
// read LSB
// read LSB
SPDR
=
0
;
SPDR
=
0
;
for
(;
(
SPSR
&
BIT
(
SPIF
))
==
0
;);
for
(;
!
TEST
(
SPSR
,
SPIF
)
;);
max6675_temp
|=
SPDR
;
max6675_temp
|=
SPDR
;
// disable TT_MAX6675
// disable TT_MAX6675
...
@@ -1649,7 +1649,7 @@ ISR(TIMER0_COMPB_vect) {
...
@@ -1649,7 +1649,7 @@ ISR(TIMER0_COMPB_vect) {
#endif // SLOW_PWM_HEATERS
#endif // SLOW_PWM_HEATERS
#define SET_ADMUX_ADCSRA(pin) ADMUX = BIT(REFS0) | (pin & 0x07);
ADCSRA |= BIT(
ADSC)
#define SET_ADMUX_ADCSRA(pin) ADMUX = BIT(REFS0) | (pin & 0x07);
BITSET(ADCSRA,
ADSC)
#ifdef MUX5
#ifdef MUX5
#define START_ADC(pin) if (pin > 7) ADCSRB = BIT(MUX5); else ADCSRB = 0; SET_ADMUX_ADCSRA(pin)
#define START_ADC(pin) if (pin > 7) ADCSRB = BIT(MUX5); else ADCSRB = 0; SET_ADMUX_ADCSRA(pin)
#else
#else
...
...
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