Browse Source

Merge pull request #6177 from thinkyhead/rc_tinyboy

Support for TinyBoy 2 3D printer (and its OLED display)
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
commit
81136c1e82
  1. 10
      Marlin/Conditionals_LCD.h
  2. 5
      Marlin/Configuration.h
  3. 5
      Marlin/SanityCheck.h
  4. 5
      Marlin/example_configurations/Cartesio/Configuration.h
  5. 5
      Marlin/example_configurations/Felix/Configuration.h
  6. 5
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  7. 5
      Marlin/example_configurations/Hephestos/Configuration.h
  8. 5
      Marlin/example_configurations/Hephestos_2/Configuration.h
  9. 5
      Marlin/example_configurations/K8200/Configuration.h
  10. 5
      Marlin/example_configurations/K8400/Configuration.h
  11. 5
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  12. 5
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  13. 5
      Marlin/example_configurations/RigidBot/Configuration.h
  14. 5
      Marlin/example_configurations/SCARA/Configuration.h
  15. 5
      Marlin/example_configurations/TAZ4/Configuration.h
  16. 1575
      Marlin/example_configurations/TinyBoy2/Configuration.h
  17. 1086
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  18. 5
      Marlin/example_configurations/WITBOX/Configuration.h
  19. 5
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  20. 5
      Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
  21. 5
      Marlin/example_configurations/delta/generic/Configuration.h
  22. 5
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  23. 5
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  24. 5
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  25. 5
      Marlin/example_configurations/makibox/Configuration.h
  26. 5
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  27. 7
      Marlin/pins_SANGUINOLOLU_11.h

10
Marlin/Conditionals_LCD.h

@ -67,6 +67,14 @@
#endif #endif
#if ENABLED(OLED_PANEL_TINYBOY2)
#define U8GLIB_SSD1306
#define ULTIPANEL
#define NEWPANEL
#define REVERSE_ENCODER_DIRECTION
#define REVERSE_MENU_DIRECTION
#endif
// Generic support for SSD1306 / SH1106 OLED based LCDs. // Generic support for SSD1306 / SH1106 OLED based LCDs.
#if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SH1106) #if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SH1106)
#define ULTRA_LCD //general LCD support, also 16x2 #define ULTRA_LCD //general LCD support, also 16x2
@ -158,7 +166,7 @@
#endif #endif
// Set encoder detents for well-known controllers // Set encoder detents for well-known controllers
#if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \ #if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) || ENABLED(OLED_PANEL_TINYBOY2) \
|| ENABLED(BQ_LCD_SMART_CONTROLLER) || ENABLED(LCD_I2C_PANELOLU2) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(BQ_LCD_SMART_CONTROLLER) || ENABLED(LCD_I2C_PANELOLU2) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#ifndef ENCODER_PULSES_PER_STEP #ifndef ENCODER_PULSES_PER_STEP
#define ENCODER_PULSES_PER_STEP 4 #define ENCODER_PULSES_PER_STEP 4

5
Marlin/Configuration.h

@ -1405,6 +1405,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/SanityCheck.h

@ -1017,7 +1017,7 @@ static_assert(1 >= 0
#if ENABLED(LCD_I2C_VIKI) #if ENABLED(LCD_I2C_VIKI)
+ 1 + 1
#endif #endif
#if ENABLED(U8GLIB_SSD1306) #if ENABLED(U8GLIB_SSD1306) && DISABLED(OLED_PANEL_TINYBOY2)
+ 1 + 1
#endif #endif
#if ENABLED(SAV_3DLCD) #if ENABLED(SAV_3DLCD)
@ -1029,5 +1029,8 @@ static_assert(1 >= 0
#if ENABLED(SAV_3DGLCD) #if ENABLED(SAV_3DGLCD)
+ 1 + 1
#endif #endif
#if ENABLED(OLED_PANEL_TINYBOY2)
+ 1
#endif
, "Please select no more than one LCD controller option." , "Please select no more than one LCD controller option."
); );

5
Marlin/example_configurations/Cartesio/Configuration.h

@ -1406,6 +1406,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/Felix/Configuration.h

@ -1389,6 +1389,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/Felix/DUAL/Configuration.h

@ -1389,6 +1389,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/Hephestos/Configuration.h

@ -1398,6 +1398,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/Hephestos_2/Configuration.h

@ -1400,6 +1400,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/K8200/Configuration.h

@ -1438,6 +1438,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
#endif // K8200_VM8201 #endif // K8200_VM8201
//============================================================================= //=============================================================================

5
Marlin/example_configurations/K8400/Configuration.h

@ -1406,6 +1406,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/K8400/Dual-head/Configuration.h

@ -1406,6 +1406,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h

@ -1406,6 +1406,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/RigidBot/Configuration.h

@ -1407,6 +1407,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/SCARA/Configuration.h

@ -1421,6 +1421,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/TAZ4/Configuration.h

@ -1427,6 +1427,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

1575
Marlin/example_configurations/TinyBoy2/Configuration.h

File diff suppressed because it is too large

1086
Marlin/example_configurations/TinyBoy2/Configuration_adv.h

File diff suppressed because it is too large

5
Marlin/example_configurations/WITBOX/Configuration.h

@ -1398,6 +1398,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/adafruit/ST7565/Configuration.h

@ -1406,6 +1406,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h

@ -1511,6 +1511,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/delta/generic/Configuration.h

@ -1496,6 +1496,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/delta/kossel_mini/Configuration.h

@ -1500,6 +1500,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/delta/kossel_pro/Configuration.h

@ -1499,6 +1499,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/delta/kossel_xl/Configuration.h

@ -1509,6 +1509,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/makibox/Configuration.h

@ -1409,6 +1409,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

5
Marlin/example_configurations/tvrrug/Round2/Configuration.h

@ -1402,6 +1402,11 @@
// //
//#define SAV_3DLCD //#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//============================================================================= //=============================================================================
//=============================== Extra Features ============================== //=============================== Extra Features ==============================
//============================================================================= //=============================================================================

7
Marlin/pins_SANGUINOLOLU_11.h

@ -188,10 +188,13 @@
#else #else
#define BTN_ENC 30 #define BTN_ENC 30
#endif #endif
#else // !Panelolu2 #elif ENABLED(OLED_PANEL_TINYBOY2)
#define BTN_ENC 28
#define LCD_SDSS -1
#else // !Panelolu2, !TinyBoy2
#define BTN_ENC 16 #define BTN_ENC 16
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi #define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif // !Panelolu2 #endif // !Panelolu2, !TinyBoy2
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1

Loading…
Cancel
Save