jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'LulzbotUniversalTools' of https://github.com/InsanityAutomation/Marlin into LulzbotUniversalTools

Browse Source
This commit is contained in:
InsanityAutomation
2020-08-09 12:39:05 -04:00
parent c0194ec093 6167a8d1e4
commit 9801f4295d
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Version.h
+1 -12
View File
@@ -34,7 +34,7 @@
* Verbose version identifier which should contain a reference to the location
* from where the binary was downloaded or the source code was compiled.
*/
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " Rev1"
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " Rev2"
/**
* The STRING_DISTRIBUTION_DATE represents when the binary file was built,
@@ -72,18 +72,7 @@
* Currently only supported by DUE platform
*/
#if ENABLED(TazPro)
<<<<<<< HEAD
<<<<<<< HEAD
#define USB_DEVICE_VENDOR_ID 0x27b1 // <-- changed
#define USB_DEVICE_PRODUCT_ID 0x0001 // <-- changed
#endif
=======
#define USB_DEVICE_VENDOR_ID 0x27b1 // <-- changed
#define USB_DEVICE_PRODUCT_ID 0x0001 // <-- changed
>>>>>>> d5e2679258... Finish main config
=======
#define USB_DEVICE_VENDOR_ID 0x27b1 // <-- changed
#define USB_DEVICE_PRODUCT_ID 0x0001 // <-- changed
#endif
>>>>>>> 42d532106b... Finish Configs
//#define USB_DEVICE_MANUFACTURE_NAME WEBSITE_URL