Browse Source

📝 AlephObjects => LulzBot

Scott Lahteine 4 years ago
parent
commit
f6dc56d979

+ 3
- 3
Marlin/Configuration_adv.h View File

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

+ 2
- 0
Marlin/src/inc/SanityCheck.h View File

589
   #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
589
   #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
590
 #elif MOTHERBOARD == BOARD_BTT_SKR_E3_TURBO && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
590
 #elif MOTHERBOARD == BOARD_BTT_SKR_E3_TURBO && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
591
   #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)."
591
   #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)."
592
+#elif defined(LCD_ALEPHOBJECTS_CLCD_UI)
593
+  #warning "LCD_ALEPHOBJECTS_CLCD_UI is now LCD_LULZBOT_CLCD_UI."
592
 #endif
594
 #endif
593
 
595
 
594
 constexpr float arm[] = AXIS_RELATIVE_MODES;
596
 constexpr float arm[] = AXIS_RELATIVE_MODES;

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h View File

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

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h View File

53
 #elif ENABLED(AO_EXP1_DEPRECATED_PINMAP)
53
 #elif ENABLED(AO_EXP1_DEPRECATED_PINMAP)
54
 
54
 
55
   /**
55
   /**
56
-   * This AlephObjects pinout re-purposes the UltraLCD
56
+   * This LulzBot pinout re-purposes the UltraLCD
57
    * connector EXP1 for Software SPI (rev B, obsolete)
57
    * connector EXP1 for Software SPI (rev B, obsolete)
58
    */
58
    */
59
 
59
 
74
   /**
74
   /**
75
    * AO_EXP1_PINMAP with TOUCH_UI_ULTIPANEL
75
    * AO_EXP1_PINMAP with TOUCH_UI_ULTIPANEL
76
    *
76
    *
77
-   * This AlephObjects mapping re-purposes the UltraLCD
77
+   * This LulzBot mapping re-purposes the UltraLCD
78
    * connector EXP1 for Software SPI for display (rev C):
78
    * connector EXP1 for Software SPI for display (rev C):
79
    *
79
    *
80
    *     EXP2:      FTDI:   SD -or- USB [1]:     ULTRA_LCD:
80
    *     EXP2:      FTDI:   SD -or- USB [1]:     ULTRA_LCD:
106
   /**
106
   /**
107
    * AO_EXP2_PINMAP with TOUCH_UI_ULTIPANEL
107
    * AO_EXP2_PINMAP with TOUCH_UI_ULTIPANEL
108
    *
108
    *
109
-   * The AlephObjects mapping for re-purposing the UltraLCD
109
+   * The LulzBot mapping for re-purposing the UltraLCD
110
    * connector EXP2 for hardware SPI for display and SD card
110
    * connector EXP2 for hardware SPI for display and SD card
111
    * or USB (rev C):
111
    * or USB (rev C):
112
    *
112
    *

+ 1
- 3
Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt View File

40
 
40
 
41
 ==== MARLIN INTEGRATION WORK ====
41
 ==== MARLIN INTEGRATION WORK ====
42
 
42
 
43
-All additional work done to integrate USB into Marlin was performed by AlephObjects, Inc.
44
-and is licensed under the GPLv3.
45
-
43
+All additional work done to integrate USB into Marlin was performed by LulzBot and is licensed under the GPLv3.

+ 1
- 2
Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt View File

16
 ==== MARLIN INTEGRATION WORK ====
16
 ==== MARLIN INTEGRATION WORK ====
17
 
17
 
18
 All additional work done to integrate USB into Marlin was performed by
18
 All additional work done to integrate USB into Marlin was performed by
19
-AlephObjects, Inc. and is licensed under the GPLv3.
19
+LulzBot and is licensed under the GPLv3.
20
 
20
 
21
 This version of UHS3 has been modified for better compatibility with Marlin.
21
 This version of UHS3 has been modified for better compatibility with Marlin.
22
 The upstream version of UHS 3.0 runs a frame timer interrupt every 1 ms to
22
 The upstream version of UHS 3.0 runs a frame timer interrupt every 1 ms to
27
 
27
 
28
 SKIP_PAGE3F and USB_NO_TEST_UNIT_READY were added to work around bugs with
28
 SKIP_PAGE3F and USB_NO_TEST_UNIT_READY were added to work around bugs with
29
 certain devices.
29
 certain devices.
30
-

Loading…
Cancel
Save