3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 12:04:19 +00:00
Code Issues Releases Wiki Activity

Main controller updates

Browse Source
This commit is contained in:
Scott Lahteine 2017-09-06 06:28:33 -05:00
parent 142d8aae56
commit bca67a5b79
3 changed files with 285 additions and 8345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin.ino
View File

@ -28,7 +28,7 @@
* - https://github.com/simen/grbl/tree * - https://github.com/simen/grbl/tree
*/ */
#include "MarlinConfig.h" #include "src/inc/MarlinConfig.h"
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#if ENABLED(LCD_I2C_TYPE_PCF8575) #if ENABLED(LCD_I2C_TYPE_PCF8575)

8600
Marlin/src/Marlin.cpp
View File

File diff suppressed because it is too large Load Diff

28
Marlin/src/Marlin.h
View File

@ -19,33 +19,27 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifndef MARLIN_H #ifndef __MARLIN_H__
#define MARLIN_H #define __MARLIN_H__
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include "MarlinConfig.h" #include "inc/MarlinConfig.h"
#ifdef DEBUG_GCODE_PARSER #ifdef DEBUG_GCODE_PARSER
#include "gcode.h" #include "gcode/parser.h"
#endif #endif
#include "src/HAL/HAL.h"
#include "enum.h"
#include "types.h"
#include "utility.h"
#include "serial.h"
#if ENABLED(PRINTCOUNTER) #if ENABLED(PRINTCOUNTER)
#include "printcounter.h" #include "module/printcounter.h"
#else #else
#include "stopwatch.h" #include "libs/stopwatch.h"
#endif #endif
void stop();
void idle( void idle(
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
bool no_stepper_sleep = false // pass true to keep steppers from disabling on timeout bool no_stepper_sleep = false // pass true to keep steppers from disabling on timeout
@ -195,10 +189,6 @@ void clear_command_queue();
extern millis_t previous_cmd_ms; extern millis_t previous_cmd_ms;
inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); } inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
#if ENABLED(FAST_PWM_FAN)
void setPwmFrequency(uint8_t pin, int val);
#endif
/** /**
* Feedrate scaling and conversion * Feedrate scaling and conversion
*/ */
@ -476,4 +466,4 @@ FORCE_INLINE bool position_is_reachable_xy(const float &lx, const float &ly) {
return position_is_reachable_raw_xy(RAW_X_POSITION(lx), RAW_Y_POSITION(ly)); return position_is_reachable_raw_xy(RAW_X_POSITION(lx), RAW_Y_POSITION(ly));
} }
#endif // MARLIN_H #endif // __MARLIN_H__