Merge pull request #1569 from Wackerbarth/Development
Incorporating Build Numbers
This commit is contained in:
commit
db7b0ea0cf
4 changed files with 39 additions and 5 deletions
9
.gitignore
vendored
9
.gitignore
vendored
|
@ -1,3 +1,12 @@
|
||||||
|
// Our automatic versioning scheme generates the following file
|
||||||
|
// NEVER put it in the repository
|
||||||
|
_Version.h
|
||||||
|
|
||||||
|
// All of the following OS, IDE and compiler generated file
|
||||||
|
// references should be moved from this file
|
||||||
|
// They are needed, but they belong in your global .gitignore
|
||||||
|
// rather than in a per-project file such as this
|
||||||
|
|
||||||
*.o
|
*.o
|
||||||
applet/
|
applet/
|
||||||
*~
|
*~
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
compiler.cpp.extra_flags=-DHAS_AUTOMATIC_VERSIONING
|
|
@ -37,6 +37,7 @@
|
||||||
#define BOARD_BRAINWAVE 82 // Brainwave (AT90USB646)
|
#define BOARD_BRAINWAVE 82 // Brainwave (AT90USB646)
|
||||||
#define BOARD_SAV_MKI 83 // SAV Mk-I (AT90USB1286)
|
#define BOARD_SAV_MKI 83 // SAV Mk-I (AT90USB1286)
|
||||||
#define BOARD_TEENSY2 84 // Teensy++2.0 (AT90USB1286) - CLI compile: DEFINES=AT90USBxx_TEENSYPP_ASSIGNMENTS HARDWARE_MOTHERBOARD=84 make
|
#define BOARD_TEENSY2 84 // Teensy++2.0 (AT90USB1286) - CLI compile: DEFINES=AT90USBxx_TEENSYPP_ASSIGNMENTS HARDWARE_MOTHERBOARD=84 make
|
||||||
|
#define BOARD_BRAINWAVE_PRO 85 // Brainwave Pro (AT90USB1286)
|
||||||
#define BOARD_GEN3_PLUS 9 // Gen3+
|
#define BOARD_GEN3_PLUS 9 // Gen3+
|
||||||
#define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics
|
#define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics
|
||||||
#define BOARD_MEGATRONICS 70 // Megatronics
|
#define BOARD_MEGATRONICS 70 // Megatronics
|
||||||
|
|
|
@ -36,8 +36,11 @@
|
||||||
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
|
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAS_AUTOMATIC_VERSIONING
|
||||||
|
#include "_Version.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define PROTOCOL_VERSION "1.0"
|
#define PROTOCOL_VERSION "1.0"
|
||||||
#define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
|
|
||||||
|
|
||||||
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
|
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
|
||||||
#undef FIRMWARE_URL
|
#undef FIRMWARE_URL
|
||||||
|
@ -65,13 +68,33 @@
|
||||||
#define MACHINE_NAME "HEPHESTOS"
|
#define MACHINE_NAME "HEPHESTOS"
|
||||||
#undef FIRMWARE_URL
|
#undef FIRMWARE_URL
|
||||||
#define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
|
#define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
|
||||||
#else // Default firmware set to Mendel
|
#elif MB(BRAINWAVE_PRO)
|
||||||
#define MACHINE_NAME "Mendel"
|
#define MACHINE_NAME "Kossel Pro"
|
||||||
|
#ifndef FIRMWARE_URL
|
||||||
|
#define FIRMWARE_URL "https://github.com/OpenBeamUSA/Marlin/"
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#ifndef MACHINE_NAME
|
||||||
|
#define MACHINE_NAME "Mendel"
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CUSTOM_MENDEL_NAME
|
#ifdef CUSTOM_MENDEL_NAME
|
||||||
|
#warning CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
|
||||||
|
#define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CUSTOM_MACHINE_NAME
|
||||||
#undef MACHINE_NAME
|
#undef MACHINE_NAME
|
||||||
#define MACHINE_NAME CUSTOM_MENDEL_NAME
|
#define MACHINE_NAME CUSTOM_MACHINE_NAME
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef FIRMWARE_URL
|
||||||
|
#define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef BUILD_VERSION
|
||||||
|
#define BUILD_VERSION "V1; Sprinter/grbl mashup for gen6"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MACHINE_UUID
|
#ifndef MACHINE_UUID
|
||||||
|
@ -122,7 +145,7 @@
|
||||||
#define MSG_HEATING_COMPLETE "Heating done."
|
#define MSG_HEATING_COMPLETE "Heating done."
|
||||||
#define MSG_BED_HEATING "Bed Heating."
|
#define MSG_BED_HEATING "Bed Heating."
|
||||||
#define MSG_BED_DONE "Bed done."
|
#define MSG_BED_DONE "Bed done."
|
||||||
#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
|
#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
|
||||||
#define MSG_COUNT_X " Count X: "
|
#define MSG_COUNT_X " Count X: "
|
||||||
#define MSG_ERR_KILLED "Printer halted. kill() called!"
|
#define MSG_ERR_KILLED "Printer halted. kill() called!"
|
||||||
#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
|
#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
|
||||||
|
|
Reference in a new issue