Merge remote-tracking branch 'my_dev/MK3' into dev
This commit is contained in:
commit
8fe2d1de9a
@ -13,7 +13,7 @@
|
||||
// The firmware should only be checked into github with this symbol.
|
||||
#define FW_DEV_VERSION FW_VERSION_UNKNOWN
|
||||
#define FW_REPOSITORY "Unknown"
|
||||
#define FW_VERSION_FULL FW_VERSION "-" STR(FW_COMMIT_NR) "a"
|
||||
#define FW_VERSION_FULL FW_VERSION "-" STR(FW_COMMIT_NR)
|
||||
|
||||
// Debug version has debugging enabled (the symbol DEBUG_BUILD is set).
|
||||
// The debug build may be a bit slower than the non-debug build, therefore the debug build should
|
||||
|
@ -113,7 +113,6 @@
|
||||
// Filament sensor
|
||||
#define FILAMENT_SENSOR
|
||||
#define PAT9125
|
||||
#define IR_SENSOR
|
||||
|
||||
|
||||
#define DEBUG_DCODE3
|
||||
|
@ -114,7 +114,6 @@
|
||||
// Filament sensor
|
||||
#define FILAMENT_SENSOR
|
||||
#define PAT9125
|
||||
#define IR_SENSOR
|
||||
|
||||
|
||||
#define DEBUG_DCODE3
|
||||
|
@ -134,8 +134,8 @@
|
||||
|
||||
// Filament sensor
|
||||
#define FILAMENT_SENSOR
|
||||
//#define PAT9125
|
||||
#define IR_SENSOR
|
||||
#define PAT9125
|
||||
|
||||
// Backlash -
|
||||
//#define BACKLASH_X
|
||||
//#define BACKLASH_Y
|
||||
|
Loading…
Reference in New Issue
Block a user