zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

📝 AlephObjects => LulzBot

Browse source
This commit is contained in:
Scott Lahteine 2021-08-27 17:23:08 -05:00
parent fd594ab176
commit 9b0e196ba2
6 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/Configuration_adv.h
View file

@ -1737,7 +1737,7 @@
//#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" (480x272) //#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" (480x272)
//#define LCD_HAOYU_FT800CB // Haoyu with 4.3" or 5" (480x272) //#define LCD_HAOYU_FT800CB // Haoyu with 4.3" or 5" (480x272)
//#define LCD_HAOYU_FT810CB // Haoyu with 5" (800x480) //#define LCD_HAOYU_FT810CB // Haoyu with 5" (800x480)
//#define LCD_ALEPHOBJECTS_CLCD_UI // Aleph Objects Color LCD UI //#define LCD_LULZBOT_CLCD_UI // LulzBot Color LCD UI
//#define LCD_FYSETC_TFT81050 // FYSETC with 5" (800x480) //#define LCD_FYSETC_TFT81050 // FYSETC with 5" (800x480)
//#define LCD_EVE3_50G // Matrix Orbital 5.0", 800x480, BT815 //#define LCD_EVE3_50G // Matrix Orbital 5.0", 800x480, BT815
//#define LCD_EVE2_50G // Matrix Orbital 5.0", 800x480, FT813 //#define LCD_EVE2_50G // Matrix Orbital 5.0", 800x480, FT813
@ -1748,8 +1748,8 @@
//#define TOUCH_UI_800x480 //#define TOUCH_UI_800x480
// Mappings for boards with a standard RepRapDiscount Display connector // Mappings for boards with a standard RepRapDiscount Display connector
//#define AO_EXP1_PINMAP // AlephObjects CLCD UI EXP1 mapping //#define AO_EXP1_PINMAP // LulzBot CLCD UI EXP1 mapping
//#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping //#define AO_EXP2_PINMAP // LulzBot CLCD UI EXP2 mapping
//#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping //#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
//#define S6_TFT_PINMAP // FYSETC S6 pin mapping //#define S6_TFT_PINMAP // FYSETC S6 pin mapping
//#define F6_TFT_PINMAP // FYSETC F6 pin mapping //#define F6_TFT_PINMAP // FYSETC F6 pin mapping

2
Marlin/src/inc/SanityCheck.h
View file

@ -589,6 +589,8 @@
#warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)." #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
#elif MOTHERBOARD == BOARD_BTT_SKR_E3_TURBO && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD) #elif MOTHERBOARD == BOARD_BTT_SKR_E3_TURBO && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
#warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)." #warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
#elif defined(LCD_ALEPHOBJECTS_CLCD_UI)
#warning "LCD_ALEPHOBJECTS_CLCD_UI is now LCD_LULZBOT_CLCD_UI."
#endif #endif
constexpr float arm[] = AXIS_RELATIVE_MODES; constexpr float arm[] = AXIS_RELATIVE_MODES;

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
View file

@ -138,7 +138,7 @@
* Settings for the Aleph Objects Color LCD User Interface * Settings for the Aleph Objects Color LCD User Interface
* Datasheet https://www.hantronix.com/files/data/s1501799605s500-gh7.pdf * Datasheet https://www.hantronix.com/files/data/s1501799605s500-gh7.pdf
*/ */
#elif defined(LCD_ALEPHOBJECTS_CLCD_UI) #elif defined(LCD_LULZBOT_CLCD_UI)
#if !HAS_RESOLUTION #if !HAS_RESOLUTION
#define TOUCH_UI_800x480 #define TOUCH_UI_800x480
#endif #endif

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
View file

@ -53,7 +53,7 @@
#elif ENABLED(AO_EXP1_DEPRECATED_PINMAP) #elif ENABLED(AO_EXP1_DEPRECATED_PINMAP)
/** /**
* This AlephObjects pinout re-purposes the UltraLCD * This LulzBot pinout re-purposes the UltraLCD
* connector EXP1 for Software SPI (rev B, obsolete) * connector EXP1 for Software SPI (rev B, obsolete)
*/ */
@ -74,7 +74,7 @@
/** /**
* AO_EXP1_PINMAP with TOUCH_UI_ULTIPANEL * AO_EXP1_PINMAP with TOUCH_UI_ULTIPANEL
* *
* This AlephObjects mapping re-purposes the UltraLCD * This LulzBot mapping re-purposes the UltraLCD
* connector EXP1 for Software SPI for display (rev C): * connector EXP1 for Software SPI for display (rev C):
* *
* EXP2: FTDI: SD -or- USB [1]: ULTRA_LCD: * EXP2: FTDI: SD -or- USB [1]: ULTRA_LCD:
@ -106,7 +106,7 @@
/** /**
* AO_EXP2_PINMAP with TOUCH_UI_ULTIPANEL * AO_EXP2_PINMAP with TOUCH_UI_ULTIPANEL
* *
* The AlephObjects mapping for re-purposing the UltraLCD * The LulzBot mapping for re-purposing the UltraLCD
* connector EXP2 for hardware SPI for display and SD card * connector EXP2 for hardware SPI for display and SD card
* or USB (rev C): * or USB (rev C):
* *

5
Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt
View file

@ -40,7 +40,4 @@ under the "MIT" license, as documented here:
==== MARLIN INTEGRATION WORK ==== ==== MARLIN INTEGRATION WORK ====
All additional work done to integrate USB into Marlin was performed by AlephObjects, Inc. All additional work done to integrate USB into Marlin was performed by LulzBot and is licensed under the GPLv3.
and is licensed under the GPLv3.
-- marcio@alephobjects.com

4
Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt
View file

@ -16,7 +16,7 @@ usb_flashdrive/lib github.com/felis/UHS30 GPLv2 or later
==== MARLIN INTEGRATION WORK ==== ==== MARLIN INTEGRATION WORK ====
All additional work done to integrate USB into Marlin was performed by All additional work done to integrate USB into Marlin was performed by
AlephObjects, Inc. and is licensed under the GPLv3. LulzBot and is licensed under the GPLv3.
This version of UHS3 has been modified for better compatibility with Marlin. This version of UHS3 has been modified for better compatibility with Marlin.
The upstream version of UHS 3.0 runs a frame timer interrupt every 1 ms to The upstream version of UHS 3.0 runs a frame timer interrupt every 1 ms to
@ -27,5 +27,3 @@ IRQ.
SKIP_PAGE3F and USB_NO_TEST_UNIT_READY were added to work around bugs with SKIP_PAGE3F and USB_NO_TEST_UNIT_READY were added to work around bugs with
certain devices. certain devices.
-- marcio@alephobjects.com