3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'my_dev/MK3' into dev

Browse Source
This commit is contained in:
PavelSindler 2019-01-28 17:15:22 +01:00
commit 8fe2d1de9a
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -13,7 +13,7 @@
// The firmware should only be checked into github with this symbol. // The firmware should only be checked into github with this symbol.
#define FW_DEV_VERSION FW_VERSION_UNKNOWN #define FW_DEV_VERSION FW_VERSION_UNKNOWN
#define FW_REPOSITORY "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). // 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 // The debug build may be a bit slower than the non-debug build, therefore the debug build should

1
Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h
View File

@ -113,7 +113,6 @@
// Filament sensor // Filament sensor
#define FILAMENT_SENSOR #define FILAMENT_SENSOR
#define PAT9125 #define PAT9125
#define IR_SENSOR
#define DEBUG_DCODE3 #define DEBUG_DCODE3

1
Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h
View File

@ -114,7 +114,6 @@
// Filament sensor // Filament sensor
#define FILAMENT_SENSOR #define FILAMENT_SENSOR
#define PAT9125 #define PAT9125
#define IR_SENSOR
#define DEBUG_DCODE3 #define DEBUG_DCODE3

4
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View File

@ -134,8 +134,8 @@
// Filament sensor // Filament sensor
#define FILAMENT_SENSOR #define FILAMENT_SENSOR
//#define PAT9125 #define PAT9125
#define IR_SENSOR
// Backlash - // Backlash -
//#define BACKLASH_X //#define BACKLASH_X
//#define BACKLASH_Y //#define BACKLASH_Y