forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some bugs

Browse Source
master
Marcio Teixeira 7 years ago
parent e9469ce9b4
commit ea78124172
8 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File

8
Marlin/AO_FT810_Constants.h
Unescape View File

@ -628,14 +628,14 @@ namespace FTDI {
const uint32_t CMD_LOGO = 0xFFFFFF31; const uint32_t CMD_LOGO = 0xFFFFFF31;
} }
// If IS_FT800 is defined, then copy the FT800 namespace into the FTDI namespace // If LCD_IS_FT800 is defined, then copy the FT800 namespace into the FTDI namespace
// If IS_FT810 is defined, then copy the FT810 namespace into the FTDI namespace // If LCD_IS_FT810 is defined, then copy the FT810 namespace into the FTDI namespace
#if defined(IS_FT800) #if defined(LCD_IS_FT800)
namespace FTDI { namespace FTDI {
using namespace FT800; using namespace FT800;
} }
#elif defined(IS_FT810) #elif defined(LCD_IS_FT810)
namespace FTDI { namespace FTDI {
using namespace FT810; using namespace FT810;
} }

12
Marlin/AO_FT810_Functions.h
Unescape View File

@ -105,7 +105,7 @@
#ifndef _AO_FT810_FUNC_H #ifndef _AO_FT810_FUNC_H
#define _AO_FT810_FUNC_H #define _AO_FT810_FUNC_H
#if defined(IS_FT800) #if defined(LCD_IS_FT800)
#define DL_CACHE_START 0x035000 #define DL_CACHE_START 0x035000
#else #else
#define DL_CACHE_START 0x0F5000 #define DL_CACHE_START 0x0F5000
@ -116,7 +116,7 @@
#if defined(LCD_800x480) #if defined(LCD_800x480)
using namespace FTDI_LCD_800x480; using namespace FTDI_LCD_800x480;
#else #elif defined(LCD_480x272)
using namespace FTDI_LCD_480x272; using namespace FTDI_LCD_480x272;
#endif #endif
@ -165,7 +165,7 @@ class CLCD {
static uint32_t getRegCmdWrite(); static uint32_t getRegCmdWrite();
static uint32_t getRegCmdRead(); static uint32_t getRegCmdRead();
#if defined(IS_FT800) #if defined(LCD_IS_FT800)
static uint32_t command_write_ptr; static uint32_t command_write_ptr;
template <class T> void _write_unaligned(T data, uint16_t len); template <class T> void _write_unaligned(T data, uint16_t len);
#else #else
@ -343,7 +343,7 @@ void CLCD::Init (void) {
* If driving the 4D Systems 4DLCD-FT843 Board, the following Init sequence is needed for its FT800 Driver * If driving the 4D Systems 4DLCD-FT843 Board, the following Init sequence is needed for its FT800 Driver
*/ */
#ifdef IS_FT800 // Use External Crystal and 48 MHz System Clock #ifdef LCD_IS_FT800 // Use External Crystal and 48 MHz System Clock
Host_Cmd(CLKEXT, 0); Host_Cmd(CLKEXT, 0);
delay(20); delay(20);
@ -421,7 +421,7 @@ void CLCD::Init (void) {
/* /*
* Turn On the Display * Turn On the Display
*/ */
#if defined(IS_FT800) #if defined(LCD_IS_FT800)
Mem_Write8(REG_GPIO_DIR, 0x80); // Turn ON Display Enable Mem_Write8(REG_GPIO_DIR, 0x80); // Turn ON Display Enable
Mem_Write8(REG_GPIO, 0x80); Mem_Write8(REG_GPIO, 0x80);
#else #else
@ -447,7 +447,7 @@ void CLCD::Init (void) {
/******************* FT800/810 Graphic Commands *********************************/ /******************* FT800/810 Graphic Commands *********************************/
#if defined(IS_FT800) #if defined(LCD_IS_FT800)
uint32_t CLCD::CommandFifo::command_write_ptr = 0xFFFFFFFFul; uint32_t CLCD::CommandFifo::command_write_ptr = 0xFFFFFFFFul;
#endif #endif

2
Marlin/AO_FT810_SPI.h
Unescape View File

@ -278,7 +278,7 @@ void CLCD::CommandFifo::Cmd_Wait_Until_Idle() {
} while(!Cmd_Is_Idle()); } while(!Cmd_Is_Idle());
} }
#if defined(IS_FT800) #if defined(LCD_IS_FT800)
void CLCD::CommandFifo::Cmd_Start() { void CLCD::CommandFifo::Cmd_Start() {
if(command_write_ptr == 0xFFFFFFFFul) { if(command_write_ptr == 0xFFFFFFFFul) {
command_write_ptr = getRegCmdWrite(); command_write_ptr = getRegCmdWrite();

2
Marlin/AO_FT810_UI_Bitmaps.h
Unescape View File

@ -142,7 +142,7 @@ const PROGMEM CLCD::bitmap_info_t TD_Icon_Info = {
.filter = BILINEAR, .filter = BILINEAR,
.wrapx = BORDER, .wrapx = BORDER,
.wrapy = BORDER, .wrapy = BORDER,
.RAMG_addr = RAM_G + 8400, .RAMG_addr = RAM_G + 9000,
.width = 50, .width = 50,
.height = 20, .height = 20,
}; };

28
Marlin/AO_FT810_UI_Screens.h
Unescape View File

@ -924,20 +924,29 @@ void ValueAdjusters::draw_increment_btn(const uint8_t tag, uint8_t decimals) {
uint8_t pos; uint8_t pos;
switch(tag) { switch(tag) {
case 20: label = PSTR("0.001"); pos = decimals - 3; break; case 20: label = PSTR( ".001"); pos = decimals - 3; break;
case 21: label = PSTR( "0.01"); pos = decimals - 2; break; case 21: label = PSTR( ".01"); pos = decimals - 2; break;
case 22: label = PSTR( "0.1"); pos = decimals - 1; break; case 22: label = PSTR( "0.1"); pos = decimals - 1; break;
case 23: label = PSTR( "1" ); pos = decimals + 0; break; case 23: label = PSTR( "1" ); pos = decimals + 0; break;
case 24: label = PSTR( "10" ); pos = decimals + 1; break; case 24: label = PSTR( "10" ); pos = decimals + 1; break;
case 25: label = PSTR("100" ); pos = decimals + 2; break; case 25: label = PSTR("100" ); pos = decimals + 2; break;
default:
#if defined(UI_FRAMEWORK_DEBUG)
#if defined(SERIAL_PROTOCOLLNPAIR)
SERIAL_PROTOCOLLNPAIR("Unknown tag for increment btn: ", tag);
#else
Serial.print(F("Unknown tag for increment btn:"));
Serial.println(tag);
#endif
#endif
} }
BTN_TAG(tag) BTN_TAG(tag)
switch(pos) { switch(pos) {
#if defined(LCD_PORTRAIT) #if defined(LCD_PORTRAIT)
case 0: BTN( BTN_POS(2,8), BTN_SIZE(1,1), progmem_str(label), FONT_MED, OPT_3D); break; case 0: BTN( BTN_POS(3,8), BTN_SIZE(1,1), progmem_str(label), FONT_SML, OPT_3D); break;
case 1: BTN( BTN_POS(3,8), BTN_SIZE(1,1), progmem_str(label), FONT_MED, OPT_3D); break; case 1: BTN( BTN_POS(4,8), BTN_SIZE(1,1), progmem_str(label), FONT_SML, OPT_3D); break;
case 2: BTN( BTN_POS(4,8), BTN_SIZE(1,1), progmem_str(label), FONT_MED, OPT_3D); break; case 2: BTN( BTN_POS(5,8), BTN_SIZE(1,1), progmem_str(label), FONT_SML, OPT_3D); break;
#else #else
case 0: BTN( BTN_POS(8,2), BTN_SIZE(2,1), progmem_str(label), FONT_MED, OPT_3D); break; case 0: BTN( BTN_POS(8,2), BTN_SIZE(2,1), progmem_str(label), FONT_MED, OPT_3D); break;
case 1: BTN( BTN_POS(8,3), BTN_SIZE(2,1), progmem_str(label), FONT_MED, OPT_3D); break; case 1: BTN( BTN_POS(8,3), BTN_SIZE(2,1), progmem_str(label), FONT_MED, OPT_3D); break;
@ -956,16 +965,15 @@ void ValueAdjusters::heading_t::static_parts() const {
draw_increment_btn(23 - decimals, decimals); draw_increment_btn(23 - decimals, decimals);
draw_increment_btn(24 - decimals, decimals); draw_increment_btn(24 - decimals, decimals);
draw_increment_btn(25 - decimals, decimals); draw_increment_btn(25 - decimals, decimals);
draw_increment_btn(26 - decimals, decimals);
#if defined(LCD_PORTRAIT) #if defined(LCD_PORTRAIT)
BTN_TAG(0) THEME(adjust_bg) BTN( BTN_POS(1,1), BTN_SIZE(6,1), heading, FONT_MED, OPT_FLAT); BTN_TAG(0) THEME(adjust_bg) BTN( BTN_POS(1,1), BTN_SIZE(6,1), (progmem_str) label, FONT_MED, OPT_FLAT);
BTN_TAG(0) THEME(adjust_bg) BTN( BTN_POS(1,7), BTN_SIZE(6,1), F("Increment:"), FONT_SML, OPT_FLAT); BTN_TAG(0) THEME(adjust_bg) BTN( BTN_POS(1,7), BTN_SIZE(6,1), F("Increment:"), FONT_MED, OPT_FLAT);
BTN_TAG(1) THEME(navi_btn) BTN( BTN_POS(1,10), BTN_SIZE(6,1), F("Back"), MENU_BTN_STYLE); BTN_TAG(1) THEME(navi_btn) BTN( BTN_POS(1,10), BTN_SIZE(6,1), F("Back"), MENU_BTN_STYLE);
#else #else
BTN_TAG(0) THEME(adjust_bg) BTN( BTN_POS(3,1), BTN_SIZE(4,1), (progmem_str) label, FONT_MED, OPT_FLAT); BTN_TAG(0) THEME(adjust_bg) BTN( BTN_POS(3,1), BTN_SIZE(4,1), (progmem_str) label, FONT_MED, OPT_FLAT);
BTN_TAG(0) THEME(adjust_bg) BTN( BTN_POS(8,1), BTN_SIZE(2,1), F("Increment"), FONT_MED, OPT_FLAT); BTN_TAG(0) THEME(adjust_bg) BTN( BTN_POS(8,1), BTN_SIZE(2,1), F("Increment"), FONT_MED, OPT_FLAT);
BTN_TAG(1) THEME(navi_btn) BTN( BTN_POS(7,6), BTN_SIZE(3,1), F("Back"), MENU_BTN_STYLE); BTN_TAG(1) THEME(navi_btn) BTN( BTN_POS(8,6), BTN_SIZE(2,1), F("Back"), MENU_BTN_STYLE);
#endif #endif
} }
@ -1139,7 +1147,7 @@ void StepsScreen::onRefresh() {
const adjuster_t b = {1, PSTR("X:"), PSTR(""), Theme::x_axis, 0}; const adjuster_t b = {1, PSTR("X:"), PSTR(""), Theme::x_axis, 0};
const adjuster_t c = {2, PSTR("Y:"), PSTR(""), Theme::y_axis, 0}; const adjuster_t c = {2, PSTR("Y:"), PSTR(""), Theme::y_axis, 0};
const adjuster_t d = {3, PSTR("Z:"), PSTR(""), Theme::z_axis, 0}; const adjuster_t d = {3, PSTR("Z:"), PSTR(""), Theme::z_axis, 0};
const adjuster_t e = {4, PSTR("E:"), PSTR(""), Theme::z_axis, 0}; const adjuster_t e = {4, PSTR("E:"), PSTR(""), Theme::e_axis, 0};
if(dlcache.hasData()) { if(dlcache.hasData()) {
dlcache.append(); dlcache.append();

16
Marlin/Conditionals_LulzBot.h
Unescape View File

@ -130,6 +130,7 @@
#define LULZBOT_USE_EINSYRAMBO #define LULZBOT_USE_EINSYRAMBO
#define LULZBOT_USE_EINSY_RETRO #define LULZBOT_USE_EINSY_RETRO
#define LULZBOT_USE_TOUCH_UI #define LULZBOT_USE_TOUCH_UI
#define LULZBOT_USE_HIGH_RES
#define LULZBOT_TWO_PIECE_BED #define LULZBOT_TWO_PIECE_BED
#define LULZBOT_USE_AUTOLEVELING #define LULZBOT_USE_AUTOLEVELING
#define LULZBOT_SENSORLESS_HOMING #define LULZBOT_SENSORLESS_HOMING
@ -168,6 +169,7 @@
#define LULZBOT_TAZ_BED #define LULZBOT_TAZ_BED
#define LULZBOT_TWO_PIECE_BED #define LULZBOT_TWO_PIECE_BED
#define LULZBOT_USE_TOUCH_UI #define LULZBOT_USE_TOUCH_UI
#define LULZBOT_USE_HIGH_RES
#define LULZBOT_USE_AUTOLEVELING #define LULZBOT_USE_AUTOLEVELING
#define LULZBOT_USE_MIN_ENDSTOPS #define LULZBOT_USE_MIN_ENDSTOPS
#define LULZBOT_USE_MAX_ENDSTOPS #define LULZBOT_USE_MAX_ENDSTOPS
@ -1916,8 +1918,18 @@
#endif #endif
#if defined(LULZBOT_USE_TOUCH_UI) #if defined(LULZBOT_USE_TOUCH_UI)
extern void lcd_update(); extern void lcd_update();
extern void lcd_buttons_update(); extern void lcd_buttons_update();
//#define LCD_IS_FT800
#define LCD_IS_FT810
#if defined(LULZBOT_USE_HIGH_RES)
#define LCD_800x480
#else
#define LCD_480x272
#endif
#define LCD_PORTRAIT
#define LCD_UPSIDE_DOWN
#define UI_FRAMEWORK_DEBUG
#endif #endif
/***************************** CUSTOM SPLASH SCREEN *****************************/ /***************************** CUSTOM SPLASH SCREEN *****************************/

22
Marlin/Marlin_main.cpp
Unescape View File

@ -349,20 +349,14 @@
#endif #endif
#if defined(LULZBOT_USE_TOUCH_UI) #if defined(LULZBOT_USE_TOUCH_UI)
#define IS_FT800 #include "AO_UI_Marlin_LCD_API.h"
//#define IS_FT810 #include "AO_UI_Framework.h"
//#define LCD_PORTRAIT #include "AO_FT810_Constants.h"
//#define LCD_UPSIDE_DOWN #include "AO_FT810_Functions.h"
//#define LCD_800x480 #include "AO_FT810_Pins.h"
#define UI_FRAMEWORK_DEBUG #include "AO_FT810_SPI.h"
#include "AO_UI_Marlin_LCD_API.h" #include "AO_FT810_UI_Bitmaps.h"
#include "AO_UI_Framework.h" #include "AO_FT810_UI_Screens.h"
#include "AO_FT810_Constants.h"
#include "AO_FT810_Functions.h"
#include "AO_FT810_Pins.h"
#include "AO_FT810_SPI.h"
#include "AO_FT810_UI_Bitmaps.h"
#include "AO_FT810_UI_Screens.h"
#endif #endif
bool Running = true; bool Running = true;

4
Marlin/ultralcd.h
Unescape View File

@ -185,7 +185,9 @@
extern uint8_t progress_bar_percent; extern uint8_t progress_bar_percent;
#endif #endif
#elif !defined(LULZBOT_USE_TOUCH_UI) // no LCD #elif defined(LULZBOT_USE_TOUCH_UI)
// We will use our own definitions for these functions.
#else // no LCD
inline void lcd_update() {} inline void lcd_update() {}
inline void lcd_init() {} inline void lcd_init() {}
inline bool lcd_hasstatus() { return false; } inline bool lcd_hasstatus() { return false; }

Write Preview
Loading…
Cancel
Save