Merge pull request #407 from buildrob101/Marlin_v1
Combine and converge other I2C LCD branches (PANELOLU2, VIKI & PCF8575)
This commit is contained in:
ErikZalm
commit
1a18a487f9
|
|
@ -90,7 +90,7 @@
|
|||
#define TEMP_SENSOR_BED 0
|
||||
|
||||
// Actual temperature must be close to target for this long before M109 returns success
|
||||
#define TEMP_RESIDENCY_TIME 10 // (seconds)
|
||||
#define TEMP_RESIDENCY_TIME 10 // (seconds)
|
||||
#define TEMP_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one
|
||||
#define TEMP_WINDOW 1 // (degC) Window around target to start the recidency timer x degC early.
|
||||
|
||||
|
|
@ -315,9 +315,18 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
|
|||
// please keep turned on if you can.
|
||||
//#define EEPROM_CHITCHAT
|
||||
|
||||
// Preheat Constants
|
||||
#define PLA_PREHEAT_HOTEND_TEMP 180
|
||||
#define PLA_PREHEAT_HPB_TEMP 70
|
||||
#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 240
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
|
||||
|
||||
//LCD and SD support
|
||||
//#define ULTRA_LCD //general lcd support, also 16x2
|
||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||
//#define SDSUPPORT // Enable SD Card Support in Hardware Console
|
||||
//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
|
||||
|
||||
|
|
@ -360,36 +369,67 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
|
|||
#define ULTIPANEL
|
||||
#endif
|
||||
|
||||
// Preheat Constants
|
||||
#define PLA_PREHEAT_HOTEND_TEMP 180
|
||||
#define PLA_PREHEAT_HPB_TEMP 70
|
||||
#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
|
||||
//I2C PANELS
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 240
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
|
||||
//#define LCD_I2C_SAINSMART_YWROBOT
|
||||
#ifdef LCD_I2C_SAINSMART_YWROBOT
|
||||
// This uses the LiquidCrystal_I2C library ( https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home )
|
||||
// Make sure it is placed in the Arduino libraries directory.
|
||||
#define LCD_I2C_TYPE_PCF8575
|
||||
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
||||
#define NEWPANEL
|
||||
#define ULTIPANEL
|
||||
#endif
|
||||
|
||||
// PANELOLU2 LCD with status LEDs, separate encoder and click inputs
|
||||
//#define LCD_I2C_PANELOLU2
|
||||
#ifdef LCD_I2C_PANELOLU2
|
||||
// This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 )
|
||||
// Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory.
|
||||
// (v1.2.3 no longer requires you to define PANELOLU in the LiquidTWI2.h library header file)
|
||||
// Note: The PANELOLU2 encoder click input can either be directly connected to a pin
|
||||
// (if BTN_ENC defined to != -1) or read through I2C (when BTN_ENC == -1).
|
||||
#define LCD_I2C_TYPE_MCP23017
|
||||
#define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
|
||||
#define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
|
||||
#define NEWPANEL
|
||||
#define ULTIPANEL
|
||||
#endif
|
||||
|
||||
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
|
||||
//#define LCD_I2C_VIKI
|
||||
#ifdef LCD_I2C_VIKI
|
||||
// This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 )
|
||||
// Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory.
|
||||
// Note: The pause/stop/resume LCD button pin should be connected to the Arduino
|
||||
// BTN_ENC pin (or set BTN_ENC to -1 if not used)
|
||||
#define LCD_I2C_TYPE_MCP23017
|
||||
#define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
|
||||
#define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)
|
||||
#define NEWPANEL
|
||||
#define ULTIPANEL
|
||||
#endif
|
||||
|
||||
#ifdef ULTIPANEL
|
||||
// #define NEWPANEL //enable this if you have a click-encoder panel
|
||||
#define SDSUPPORT
|
||||
#define ULTRA_LCD
|
||||
#ifdef DOGLCD // Change number of lines to match the DOG graphic display
|
||||
#define LCD_WIDTH 20
|
||||
#define LCD_HEIGHT 5
|
||||
#else
|
||||
#define LCD_WIDTH 20
|
||||
#define LCD_HEIGHT 4
|
||||
#endif
|
||||
#ifdef DOGLCD // Change number of lines to match the DOG graphic display
|
||||
#define LCD_WIDTH 20
|
||||
#define LCD_HEIGHT 5
|
||||
#else
|
||||
#define LCD_WIDTH 20
|
||||
#define LCD_HEIGHT 4
|
||||
#endif
|
||||
#else //no panel but just lcd
|
||||
#ifdef ULTRA_LCD
|
||||
#ifdef DOGLCD // Change number of lines to match the 128x64 graphics display
|
||||
#define LCD_WIDTH 20
|
||||
#define LCD_HEIGHT 5
|
||||
#else
|
||||
#define LCD_WIDTH 16
|
||||
#define LCD_HEIGHT 2
|
||||
#endif
|
||||
#ifdef DOGLCD // Change number of lines to match the 128x64 graphics display
|
||||
#define LCD_WIDTH 20
|
||||
#define LCD_HEIGHT 5
|
||||
#else
|
||||
#define LCD_WIDTH 16
|
||||
#define LCD_HEIGHT 2
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -34,11 +34,17 @@
|
|||
#include "pins.h"
|
||||
|
||||
#ifdef ULTRA_LCD
|
||||
#ifdef DOGLCD
|
||||
#include <U8glib.h> // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/)
|
||||
#else
|
||||
#include <LiquidCrystal.h> // library for character LCD
|
||||
#endif
|
||||
#if defined(LCD_I2C_TYPE_PCF8575)
|
||||
#include <Wire.h>
|
||||
#include <LiquidCrystal_I2C.h>
|
||||
#elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008)
|
||||
#include <Wire.h>
|
||||
#include <LiquidTWI2.h>
|
||||
#elif defined(DOGLCD)
|
||||
#include <U8glib.h> // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/)
|
||||
#else
|
||||
#include <LiquidCrystal.h> // library for character LCD
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if DIGIPOTSS_PIN > -1
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@
|
|||
#include "language.h"
|
||||
#include "pins_arduino.h"
|
||||
|
||||
#if (defined NUM_SERVOS) && (NUM_SERVOS > 0)
|
||||
#if NUM_SERVOS > 0
|
||||
#include "Servo.h"
|
||||
#endif
|
||||
|
||||
#if DIGIPOTSS_PIN > -1
|
||||
#if DIGIPOTSS_PIN > 0
|
||||
#include <SPI.h>
|
||||
#endif
|
||||
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
// M85 - Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default)
|
||||
// M92 - Set axis_steps_per_unit - same syntax as G92
|
||||
// M114 - Output current position to serial port
|
||||
// M115 - Capabilities string
|
||||
// M115 - Capabilities string
|
||||
// M117 - display message
|
||||
// M119 - Output Endstop status to serial port
|
||||
// M126 - Solenoid Air Valve Open (BariCUDA support by jmil)
|
||||
|
|
@ -230,7 +230,7 @@ static uint8_t tmp_extruder;
|
|||
|
||||
bool Stopped=false;
|
||||
|
||||
#if (defined NUM_SERVOS) && (NUM_SERVOS > 0)
|
||||
#if NUM_SERVOS > 0
|
||||
Servo servos[NUM_SERVOS];
|
||||
#endif
|
||||
|
||||
|
|
@ -309,7 +309,7 @@ void setup_killpin()
|
|||
void setup_photpin()
|
||||
{
|
||||
#ifdef PHOTOGRAPH_PIN
|
||||
#if (PHOTOGRAPH_PIN > -1)
|
||||
#if (PHOTOGRAPH_PIN > 0)
|
||||
SET_OUTPUT(PHOTOGRAPH_PIN);
|
||||
WRITE(PHOTOGRAPH_PIN, LOW);
|
||||
#endif
|
||||
|
|
@ -324,7 +324,7 @@ void setup_powerhold()
|
|||
WRITE(SUICIDE_PIN, HIGH);
|
||||
#endif
|
||||
#endif
|
||||
#if (PS_ON_PIN > -1)
|
||||
#if (PS_ON_PIN > 0)
|
||||
SET_OUTPUT(PS_ON_PIN);
|
||||
WRITE(PS_ON_PIN, PS_ON_AWAKE);
|
||||
#endif
|
||||
|
|
@ -333,7 +333,7 @@ void setup_powerhold()
|
|||
void suicide()
|
||||
{
|
||||
#ifdef SUICIDE_PIN
|
||||
#if (SUICIDE_PIN> -1)
|
||||
#if (SUICIDE_PIN > 0)
|
||||
SET_OUTPUT(SUICIDE_PIN);
|
||||
WRITE(SUICIDE_PIN, LOW);
|
||||
#endif
|
||||
|
|
@ -342,16 +342,16 @@ void suicide()
|
|||
|
||||
void servo_init()
|
||||
{
|
||||
#if (NUM_SERVOS >= 1) && defined (SERVO0_PIN) && (SERVO0_PIN > -1)
|
||||
#if (NUM_SERVOS >= 1) && (SERVO0_PIN > 0)
|
||||
servos[0].attach(SERVO0_PIN);
|
||||
#endif
|
||||
#if (NUM_SERVOS >= 2) && defined (SERVO1_PIN) && (SERVO1_PIN > -1)
|
||||
#if (NUM_SERVOS >= 2) && (SERVO1_PIN > 0)
|
||||
servos[1].attach(SERVO1_PIN);
|
||||
#endif
|
||||
#if (NUM_SERVOS >= 3) && defined (SERVO2_PIN) && (SERVO2_PIN > -1)
|
||||
#if (NUM_SERVOS >= 3) && (SERVO2_PIN > 0)
|
||||
servos[2].attach(SERVO2_PIN);
|
||||
#endif
|
||||
#if (NUM_SERVOS >= 4) && defined (SERVO3_PIN) && (SERVO3_PIN > -1)
|
||||
#if (NUM_SERVOS >= 4) && (SERVO3_PIN > 0)
|
||||
servos[3].attach(SERVO3_PIN);
|
||||
#endif
|
||||
#if (NUM_SERVOS >= 5)
|
||||
|
|
@ -433,9 +433,9 @@ void loop()
|
|||
#ifdef SDSUPPORT
|
||||
if(card.saving)
|
||||
{
|
||||
if(strstr_P(cmdbuffer[bufindr], PSTR("M29")) == NULL)
|
||||
{
|
||||
card.write_command(cmdbuffer[bufindr]);
|
||||
if(strstr_P(cmdbuffer[bufindr], PSTR("M29")) == NULL)
|
||||
{
|
||||
card.write_command(cmdbuffer[bufindr]);
|
||||
if(card.logging)
|
||||
{
|
||||
process_commands();
|
||||
|
|
@ -444,16 +444,16 @@ void loop()
|
|||
{
|
||||
SERIAL_PROTOCOLLNPGM(MSG_OK);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
card.closefile();
|
||||
SERIAL_PROTOCOLLNPGM(MSG_FILE_SAVED);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
card.closefile();
|
||||
SERIAL_PROTOCOLLNPGM(MSG_FILE_SAVED);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
process_commands();
|
||||
process_commands();
|
||||
}
|
||||
#else
|
||||
process_commands();
|
||||
|
|
@ -548,10 +548,10 @@ void get_command()
|
|||
case 2:
|
||||
case 3:
|
||||
if(Stopped == false) { // If printer is stopped by an error the G[0-3] codes are ignored.
|
||||
#ifdef SDSUPPORT
|
||||
#ifdef SDSUPPORT
|
||||
if(card.saving)
|
||||
break;
|
||||
#endif //SDSUPPORT
|
||||
#endif //SDSUPPORT
|
||||
SERIAL_PROTOCOLLNPGM(MSG_OK);
|
||||
}
|
||||
else {
|
||||
|
|
@ -645,17 +645,17 @@ bool code_seen(char code)
|
|||
return (strchr_pointer != NULL); //Return True if a character was found
|
||||
}
|
||||
|
||||
#define DEFINE_PGM_READ_ANY(type, reader) \
|
||||
static inline type pgm_read_any(const type *p) \
|
||||
{ return pgm_read_##reader##_near(p); }
|
||||
#define DEFINE_PGM_READ_ANY(type, reader) \
|
||||
static inline type pgm_read_any(const type *p) \
|
||||
{ return pgm_read_##reader##_near(p); }
|
||||
|
||||
DEFINE_PGM_READ_ANY(float, float);
|
||||
DEFINE_PGM_READ_ANY(signed char, byte);
|
||||
|
||||
#define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
|
||||
static const PROGMEM type array##_P[3] = \
|
||||
{ X_##CONFIG, Y_##CONFIG, Z_##CONFIG }; \
|
||||
static inline type array(int axis) \
|
||||
#define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
|
||||
static const PROGMEM type array##_P[3] = \
|
||||
{ X_##CONFIG, Y_##CONFIG, Z_##CONFIG }; \
|
||||
static inline type array(int axis) \
|
||||
{ return pgm_read_any(&array##_P[axis]); }
|
||||
|
||||
XYZ_CONSTS_FROM_CONFIG(float, base_min_pos, MIN_POS);
|
||||
|
|
@ -673,7 +673,7 @@ static void axis_is_at_home(int axis) {
|
|||
|
||||
static void homeaxis(int axis) {
|
||||
#define HOMEAXIS_DO(LETTER) \
|
||||
((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1))
|
||||
((LETTER##_MIN_PIN > 0 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > 0 && LETTER##_HOME_DIR==1))
|
||||
|
||||
if (axis==X_AXIS ? HOMEAXIS_DO(X) :
|
||||
axis==Y_AXIS ? HOMEAXIS_DO(Y) :
|
||||
|
|
@ -911,13 +911,13 @@ void process_commands()
|
|||
previous_millis_cmd = millis();
|
||||
if (codenum > 0){
|
||||
codenum += millis(); // keep track of when we started waiting
|
||||
while(millis() < codenum && !LCD_CLICKED){
|
||||
while(millis() < codenum && !lcd_clicked()){
|
||||
manage_heater();
|
||||
manage_inactivity();
|
||||
lcd_update();
|
||||
}
|
||||
}else{
|
||||
while(!LCD_CLICKED){
|
||||
while(!lcd_clicked()){
|
||||
manage_heater();
|
||||
manage_inactivity();
|
||||
lcd_update();
|
||||
|
|
@ -987,17 +987,17 @@ void process_commands()
|
|||
//card,saving = false;
|
||||
break;
|
||||
case 30: //M30 <filename> Delete File
|
||||
if (card.cardOK){
|
||||
card.closefile();
|
||||
starpos = (strchr(strchr_pointer + 4,'*'));
|
||||
if(starpos != NULL){
|
||||
char* npos = strchr(cmdbuffer[bufindr], 'N');
|
||||
strchr_pointer = strchr(npos,' ') + 1;
|
||||
*(starpos-1) = '\0';
|
||||
}
|
||||
card.removeFile(strchr_pointer + 4);
|
||||
}
|
||||
break;
|
||||
if (card.cardOK){
|
||||
card.closefile();
|
||||
starpos = (strchr(strchr_pointer + 4,'*'));
|
||||
if(starpos != NULL){
|
||||
char* npos = strchr(cmdbuffer[bufindr], 'N');
|
||||
strchr_pointer = strchr(npos,' ') + 1;
|
||||
*(starpos-1) = '\0';
|
||||
}
|
||||
card.removeFile(strchr_pointer + 4);
|
||||
}
|
||||
break;
|
||||
case 928: //M928 - Start SD write
|
||||
starpos = (strchr(strchr_pointer + 5,'*'));
|
||||
if(starpos != NULL){
|
||||
|
|
@ -1062,12 +1062,12 @@ void process_commands()
|
|||
if(setTargetedHotend(105)){
|
||||
break;
|
||||
}
|
||||
#if (TEMP_0_PIN > -1)
|
||||
#if (TEMP_0_PIN > 0)
|
||||
SERIAL_PROTOCOLPGM("ok T:");
|
||||
SERIAL_PROTOCOL_F(degHotend(tmp_extruder),1);
|
||||
SERIAL_PROTOCOLPGM(" /");
|
||||
SERIAL_PROTOCOL_F(degTargetHotend(tmp_extruder),1);
|
||||
#if TEMP_BED_PIN > -1
|
||||
#if TEMP_BED_PIN > 0
|
||||
SERIAL_PROTOCOLPGM(" B:");
|
||||
SERIAL_PROTOCOL_F(degBed(),1);
|
||||
SERIAL_PROTOCOLPGM(" /");
|
||||
|
|
@ -1165,7 +1165,7 @@ void process_commands()
|
|||
}
|
||||
break;
|
||||
case 190: // M190 - Wait for bed heater to reach target.
|
||||
#if TEMP_BED_PIN > -1
|
||||
#if TEMP_BED_PIN > 0
|
||||
LCD_MESSAGEPGM(MSG_BED_HEATING);
|
||||
if (code_seen('S')) setTargetBed(code_value());
|
||||
codenum = millis();
|
||||
|
|
@ -1192,7 +1192,7 @@ void process_commands()
|
|||
#endif
|
||||
break;
|
||||
|
||||
#if FAN_PIN > -1
|
||||
#if FAN_PIN > 0
|
||||
case 106: //M106 Fan On
|
||||
if (code_seen('S')){
|
||||
fanSpeed=constrain(code_value(),0,255);
|
||||
|
|
@ -1206,8 +1206,8 @@ void process_commands()
|
|||
break;
|
||||
#endif //FAN_PIN
|
||||
#ifdef BARICUDA
|
||||
// PWM for HEATER_1_PIN
|
||||
#if HEATER_1_PIN > -1
|
||||
// PWM for HEATER_1_PIN
|
||||
#if HEATER_1_PIN > 0
|
||||
case 126: //M126 valve open
|
||||
if (code_seen('S')){
|
||||
ValvePressure=constrain(code_value(),0,255);
|
||||
|
|
@ -1221,8 +1221,8 @@ void process_commands()
|
|||
break;
|
||||
#endif //HEATER_1_PIN
|
||||
|
||||
// PWM for HEATER_2_PIN
|
||||
#if HEATER_2_PIN > -1
|
||||
// PWM for HEATER_2_PIN
|
||||
#if HEATER_2_PIN > 0
|
||||
case 128: //M128 valve open
|
||||
if (code_seen('S')){
|
||||
EtoPPressure=constrain(code_value(),0,255);
|
||||
|
|
@ -1237,7 +1237,7 @@ void process_commands()
|
|||
#endif //HEATER_2_PIN
|
||||
#endif
|
||||
|
||||
#if (PS_ON_PIN > -1)
|
||||
#if (PS_ON_PIN > 0)
|
||||
case 80: // M80 - ATX Power On
|
||||
SET_OUTPUT(PS_ON_PIN); //GND
|
||||
WRITE(PS_ON_PIN, PS_ON_AWAKE);
|
||||
|
|
@ -1246,14 +1246,14 @@ void process_commands()
|
|||
|
||||
case 81: // M81 - ATX Power Off
|
||||
|
||||
#if defined SUICIDE_PIN && SUICIDE_PIN > -1
|
||||
#if defined SUICIDE_PIN && SUICIDE_PIN > 0
|
||||
st_synchronize();
|
||||
suicide();
|
||||
#elif (PS_ON_PIN > -1)
|
||||
#elif (PS_ON_PIN > 0)
|
||||
SET_OUTPUT(PS_ON_PIN);
|
||||
WRITE(PS_ON_PIN, PS_ON_ASLEEP);
|
||||
#endif
|
||||
break;
|
||||
break;
|
||||
|
||||
case 82:
|
||||
axis_relative_modes[3] = false;
|
||||
|
|
@ -1354,27 +1354,27 @@ void process_commands()
|
|||
break;
|
||||
case 119: // M119
|
||||
SERIAL_PROTOCOLLN(MSG_M119_REPORT);
|
||||
#if (X_MIN_PIN > -1)
|
||||
#if (X_MIN_PIN > 0)
|
||||
SERIAL_PROTOCOLPGM(MSG_X_MIN);
|
||||
SERIAL_PROTOCOLLN(((READ(X_MIN_PIN)^X_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
|
||||
#endif
|
||||
#if (X_MAX_PIN > -1)
|
||||
#if (X_MAX_PIN > 0)
|
||||
SERIAL_PROTOCOLPGM(MSG_X_MAX);
|
||||
SERIAL_PROTOCOLLN(((READ(X_MAX_PIN)^X_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
|
||||
#endif
|
||||
#if (Y_MIN_PIN > -1)
|
||||
#if (Y_MIN_PIN > 0)
|
||||
SERIAL_PROTOCOLPGM(MSG_Y_MIN);
|
||||
SERIAL_PROTOCOLLN(((READ(Y_MIN_PIN)^Y_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
|
||||
#endif
|
||||
#if (Y_MAX_PIN > -1)
|
||||
#if (Y_MAX_PIN > 0)
|
||||
SERIAL_PROTOCOLPGM(MSG_Y_MAX);
|
||||
SERIAL_PROTOCOLLN(((READ(Y_MAX_PIN)^Y_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
|
||||
#endif
|
||||
#if (Z_MIN_PIN > -1)
|
||||
#if (Z_MIN_PIN > 0)
|
||||
SERIAL_PROTOCOLPGM(MSG_Z_MIN);
|
||||
SERIAL_PROTOCOLLN(((READ(Z_MIN_PIN)^Z_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
|
||||
#endif
|
||||
#if (Z_MAX_PIN > -1)
|
||||
#if (Z_MAX_PIN > 0)
|
||||
SERIAL_PROTOCOLPGM(MSG_Z_MAX);
|
||||
SERIAL_PROTOCOLLN(((READ(Z_MAX_PIN)^Z_ENDSTOPS_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
|
||||
#endif
|
||||
|
|
@ -1389,7 +1389,7 @@ void process_commands()
|
|||
}
|
||||
}
|
||||
// steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner)
|
||||
reset_acceleration_rates();
|
||||
reset_acceleration_rates();
|
||||
break;
|
||||
#if 0 // Not used for Sprinter/grbl gen6
|
||||
case 202: // M202
|
||||
|
|
@ -1513,8 +1513,8 @@ void process_commands()
|
|||
}
|
||||
}
|
||||
break;
|
||||
|
||||
#if (defined NUM_SERVOS) && (NUM_SERVOS > 0)
|
||||
|
||||
#if NUM_SERVOS > 0
|
||||
case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds
|
||||
{
|
||||
int servo_index = -1;
|
||||
|
|
@ -1545,16 +1545,20 @@ void process_commands()
|
|||
break;
|
||||
#endif // NUM_SERVOS > 0
|
||||
|
||||
#if defined(LARGE_FLASH) && LARGE_FLASH == true && defined(BEEPER) && BEEPER > -1
|
||||
#if LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) )
|
||||
case 300: // M300
|
||||
{
|
||||
int beepS = 1;
|
||||
int beepS = 400;
|
||||
int beepP = 1000;
|
||||
if(code_seen('S')) beepS = code_value();
|
||||
if(code_seen('P')) beepP = code_value();
|
||||
tone(BEEPER, beepS);
|
||||
delay(beepP);
|
||||
noTone(BEEPER);
|
||||
#if BEEPER > 0
|
||||
tone(BEEPER, beepS);
|
||||
delay(beepP);
|
||||
noTone(BEEPER);
|
||||
#elif defined(ULTRALCD)
|
||||
lcd_buzz(beepS, beepP);
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
#endif // M300
|
||||
|
|
@ -1572,7 +1576,7 @@ void process_commands()
|
|||
|
||||
updatePID();
|
||||
SERIAL_PROTOCOL(MSG_OK);
|
||||
SERIAL_PROTOCOL(" p:");
|
||||
SERIAL_PROTOCOL(" p:");
|
||||
SERIAL_PROTOCOL(Kp);
|
||||
SERIAL_PROTOCOL(" i:");
|
||||
SERIAL_PROTOCOL(unscalePID_i(Ki));
|
||||
|
|
@ -1596,7 +1600,7 @@ void process_commands()
|
|||
|
||||
updatePID();
|
||||
SERIAL_PROTOCOL(MSG_OK);
|
||||
SERIAL_PROTOCOL(" p:");
|
||||
SERIAL_PROTOCOL(" p:");
|
||||
SERIAL_PROTOCOL(bedKp);
|
||||
SERIAL_PROTOCOL(" i:");
|
||||
SERIAL_PROTOCOL(unscalePID_i(bedKi));
|
||||
|
|
@ -1609,7 +1613,7 @@ void process_commands()
|
|||
case 240: // M240 Triggers a camera by emulating a Canon RC-1 : http://www.doc-diy.net/photo/rc-1_hacked/
|
||||
{
|
||||
#ifdef PHOTOGRAPH_PIN
|
||||
#if (PHOTOGRAPH_PIN > -1)
|
||||
#if (PHOTOGRAPH_PIN > 0)
|
||||
const uint8_t NUM_PULSES=16;
|
||||
const float PULSE_LENGTH=0.01524;
|
||||
for(int i=0; i < NUM_PULSES; i++) {
|
||||
|
|
@ -1641,8 +1645,8 @@ void process_commands()
|
|||
int e=0;
|
||||
int c=5;
|
||||
if (code_seen('E')) e=code_value();
|
||||
if (e<0)
|
||||
temp=70;
|
||||
if (e<0)
|
||||
temp=70;
|
||||
if (code_seen('S')) temp=code_value();
|
||||
if (code_seen('C')) c=code_value();
|
||||
PID_autotune(temp, e, c);
|
||||
|
|
@ -1765,23 +1769,24 @@ void process_commands()
|
|||
delay(100);
|
||||
LCD_ALERTMESSAGEPGM(MSG_FILAMENTCHANGE);
|
||||
uint8_t cnt=0;
|
||||
while(!LCD_CLICKED){
|
||||
while(!lcd_clicked()){
|
||||
cnt++;
|
||||
manage_heater();
|
||||
manage_inactivity();
|
||||
lcd_update();
|
||||
|
||||
#if BEEPER > -1
|
||||
if(cnt==0)
|
||||
{
|
||||
#if BEEPER > 0
|
||||
SET_OUTPUT(BEEPER);
|
||||
|
||||
WRITE(BEEPER,HIGH);
|
||||
delay(3);
|
||||
WRITE(BEEPER,LOW);
|
||||
delay(3);
|
||||
}
|
||||
#else
|
||||
lcd_buzz(1000/6,100);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
//return to normal
|
||||
|
|
@ -1806,7 +1811,7 @@ void process_commands()
|
|||
#endif //FILAMENTCHANGEENABLE
|
||||
case 907: // M907 Set digital trimpot motor current using axis codes.
|
||||
{
|
||||
#if DIGIPOTSS_PIN > -1
|
||||
#if DIGIPOTSS_PIN > 0
|
||||
for(int i=0;i<NUM_AXIS;i++) if(code_seen(axis_codes[i])) digipot_current(i,code_value());
|
||||
if(code_seen('B')) digipot_current(4,code_value());
|
||||
if(code_seen('S')) for(int i=0;i<=4;i++) digipot_current(i,code_value());
|
||||
|
|
@ -1815,7 +1820,7 @@ void process_commands()
|
|||
break;
|
||||
case 908: // M908 Control digital trimpot directly.
|
||||
{
|
||||
#if DIGIPOTSS_PIN > -1
|
||||
#if DIGIPOTSS_PIN > 0
|
||||
uint8_t channel,current;
|
||||
if(code_seen('P')) channel=code_value();
|
||||
if(code_seen('S')) current=code_value();
|
||||
|
|
@ -1825,7 +1830,7 @@ void process_commands()
|
|||
break;
|
||||
case 350: // M350 Set microstepping mode. Warning: Steps per unit remains unchanged. S code sets stepping mode for all drivers.
|
||||
{
|
||||
#if X_MS1_PIN > -1
|
||||
#if X_MS1_PIN > 0
|
||||
if(code_seen('S')) for(int i=0;i<=4;i++) microstep_mode(i,code_value());
|
||||
for(int i=0;i<NUM_AXIS;i++) if(code_seen(axis_codes[i])) microstep_mode(i,(uint8_t)code_value());
|
||||
if(code_seen('B')) microstep_mode(4,code_value());
|
||||
|
|
@ -1835,7 +1840,7 @@ void process_commands()
|
|||
break;
|
||||
case 351: // M351 Toggle MS1 MS2 pins directly, S# determines MS1 or MS2, X# sets the pin high/low.
|
||||
{
|
||||
#if X_MS1_PIN > -1
|
||||
#if X_MS1_PIN > 0
|
||||
if(code_seen('S')) switch((int)code_value())
|
||||
{
|
||||
case 1:
|
||||
|
|
@ -2173,7 +2178,7 @@ void kill()
|
|||
disable_e1();
|
||||
disable_e2();
|
||||
|
||||
if(PS_ON_PIN > -1) pinMode(PS_ON_PIN,INPUT);
|
||||
if(PS_ON_PIN > 0) pinMode(PS_ON_PIN,INPUT);
|
||||
SERIAL_ERROR_START;
|
||||
SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
|
||||
LCD_ALERTMESSAGEPGM(MSG_KILLED);
|
||||
|
|
|
|||
209
Marlin/pins.h
209
Marlin/pins.h
|
|
@ -14,7 +14,7 @@
|
|||
#define DIGIPOTSS_PIN -1
|
||||
|
||||
#if MOTHERBOARD == 99
|
||||
#define KNOWN_BOARD 1
|
||||
#define KNOWN_BOARD 1
|
||||
|
||||
#define X_STEP_PIN 2
|
||||
#define X_DIR_PIN 3
|
||||
|
|
@ -228,7 +228,7 @@
|
|||
|
||||
//x axis pins
|
||||
#define X_STEP_PIN 21 //different from stanard GEN7
|
||||
#define X_DIR_PIN 20 //different from stanard GEN7
|
||||
#define X_DIR_PIN 20 //different from stanard GEN7
|
||||
#define X_ENABLE_PIN 24
|
||||
#define X_STOP_PIN 0
|
||||
|
||||
|
|
@ -274,11 +274,11 @@
|
|||
//#define RX_ENABLE_PIN 13
|
||||
|
||||
#define BEEPER -1
|
||||
#define SDCARDDETECT -1
|
||||
#define SUICIDE_PIN -1 //has to be defined; otherwise Power_off doesn't work
|
||||
#define SDCARDDETECT -1
|
||||
#define SUICIDE_PIN -1 //has to be defined; otherwise Power_off doesn't work
|
||||
|
||||
#define KILL_PIN -1
|
||||
//Pins for 4bit LCD Support
|
||||
//Pins for 4bit LCD Support
|
||||
#define LCD_PINS_RS 18
|
||||
#define LCD_PINS_ENABLE 17
|
||||
#define LCD_PINS_D4 16
|
||||
|
|
@ -291,14 +291,6 @@
|
|||
#define BTN_EN2 10
|
||||
#define BTN_ENC 12 //the click
|
||||
|
||||
#define BLEN_C 2
|
||||
#define BLEN_B 1
|
||||
#define BLEN_A 0
|
||||
|
||||
#define encrot0 0
|
||||
#define encrot1 2
|
||||
#define encrot2 3
|
||||
#define encrot3 1
|
||||
#endif
|
||||
|
||||
/****************************************************************************************
|
||||
|
|
@ -391,17 +383,7 @@
|
|||
#ifdef ULTRA_LCD
|
||||
|
||||
#ifdef NEWPANEL
|
||||
//encoder rotation values
|
||||
#define encrot0 0
|
||||
#define encrot1 2
|
||||
#define encrot2 3
|
||||
#define encrot3 1
|
||||
|
||||
#define BLEN_A 0
|
||||
#define BLEN_B 1
|
||||
#define BLEN_C 2
|
||||
|
||||
#define LCD_PINS_RS 16
|
||||
#define LCD_PINS_RS 16
|
||||
#define LCD_PINS_ENABLE 17
|
||||
#define LCD_PINS_D4 23
|
||||
#define LCD_PINS_D5 25
|
||||
|
|
@ -418,7 +400,7 @@
|
|||
#define SDCARDDETECT 49
|
||||
#else
|
||||
//arduino pin which triggers an piezzo beeper
|
||||
#define BEEPER 33 // Beeper on AUX-4
|
||||
#define BEEPER 33 // Beeper on AUX-4
|
||||
|
||||
//buttons are directly attached using AUX-2
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
|
|
@ -428,16 +410,7 @@
|
|||
#define SHIFT_OUT 40 // shift register
|
||||
#define SHIFT_CLK 44 // shift register
|
||||
#define SHIFT_LD 42 // shift register
|
||||
// define register bit values, don't change it
|
||||
#define BLEN_REPRAPWORLD_KEYPAD_F3 0
|
||||
#define BLEN_REPRAPWORLD_KEYPAD_F2 1
|
||||
#define BLEN_REPRAPWORLD_KEYPAD_F1 2
|
||||
#define BLEN_REPRAPWORLD_KEYPAD_UP 3
|
||||
#define BLEN_REPRAPWORLD_KEYPAD_RIGHT 4
|
||||
#define BLEN_REPRAPWORLD_KEYPAD_MIDDLE 5
|
||||
#define BLEN_REPRAPWORLD_KEYPAD_DOWN 6
|
||||
#define BLEN_REPRAPWORLD_KEYPAD_LEFT 7
|
||||
#else
|
||||
#else
|
||||
#define BTN_EN1 37
|
||||
#define BTN_EN2 35
|
||||
#define BTN_ENC 31 //the click
|
||||
|
|
@ -452,10 +425,10 @@
|
|||
|
||||
#else //old style panel with shift register
|
||||
//arduino pin witch triggers an piezzo beeper
|
||||
#define BEEPER 33 No Beeper added
|
||||
#define BEEPER 33 // No Beeper added
|
||||
|
||||
//buttons are attached to a shift register
|
||||
// Not wired this yet
|
||||
// Not wired this yet
|
||||
//#define SHIFT_CLK 38
|
||||
//#define SHIFT_LD 42
|
||||
//#define SHIFT_OUT 40
|
||||
|
|
@ -467,26 +440,7 @@
|
|||
#define LCD_PINS_D5 25
|
||||
#define LCD_PINS_D6 27
|
||||
#define LCD_PINS_D7 29
|
||||
|
||||
//encoder rotation values
|
||||
#define encrot0 0
|
||||
#define encrot1 2
|
||||
#define encrot2 3
|
||||
#define encrot3 1
|
||||
|
||||
|
||||
//bits in the shift register that carry the buttons for:
|
||||
// left up center down right red
|
||||
#define BL_LE 7
|
||||
#define BL_UP 6
|
||||
#define BL_MI 5
|
||||
#define BL_DW 4
|
||||
#define BL_RI 3
|
||||
#define BL_ST 2
|
||||
|
||||
#define BLEN_B 1
|
||||
#define BLEN_A 0
|
||||
#endif
|
||||
#endif
|
||||
#endif //ULTRA_LCD
|
||||
|
||||
#else // RAMPS_V_1_1 or RAMPS_V_1_2 as default (MOTHERBOARD == 3)
|
||||
|
|
@ -659,8 +613,8 @@
|
|||
#define DEBUG_PIN 0
|
||||
|
||||
//our RS485 pins
|
||||
#define TX_ENABLE_PIN 12
|
||||
#define RX_ENABLE_PIN 13
|
||||
#define TX_ENABLE_PIN 12
|
||||
#define RX_ENABLE_PIN 13
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -759,43 +713,32 @@
|
|||
//we have no buzzer installed
|
||||
#define BEEPER -1
|
||||
//LCD Pins
|
||||
#ifdef DOGLCD
|
||||
// Pins for DOGM SPI LCD Support
|
||||
#define DOGLCD_A0 30
|
||||
#define DOGLCD_CS 29
|
||||
// GLCD features
|
||||
#define LCD_CONTRAST 1
|
||||
// Uncomment screen orientation
|
||||
// #define LCD_SCREEN_ROT_0
|
||||
// #define LCD_SCREEN_ROT_90
|
||||
#define LCD_SCREEN_ROT_180
|
||||
// #define LCD_SCREEN_ROT_270
|
||||
#else // standard Hitachi LCD controller
|
||||
#define LCD_PINS_RS 4
|
||||
#define LCD_PINS_ENABLE 17
|
||||
#define LCD_PINS_D4 30
|
||||
#define LCD_PINS_D5 29
|
||||
#define LCD_PINS_D6 28
|
||||
#define LCD_PINS_D7 27
|
||||
#endif
|
||||
#ifdef DOGLCD
|
||||
// Pins for DOGM SPI LCD Support
|
||||
#define DOGLCD_A0 30
|
||||
#define DOGLCD_CS 29
|
||||
// GLCD features
|
||||
#define LCD_CONTRAST 1
|
||||
// Uncomment screen orientation
|
||||
// #define LCD_SCREEN_ROT_0
|
||||
// #define LCD_SCREEN_ROT_90
|
||||
#define LCD_SCREEN_ROT_180
|
||||
// #define LCD_SCREEN_ROT_270
|
||||
#else // standard Hitachi LCD controller
|
||||
#define LCD_PINS_RS 4
|
||||
#define LCD_PINS_ENABLE 17
|
||||
#define LCD_PINS_D4 30
|
||||
#define LCD_PINS_D5 29
|
||||
#define LCD_PINS_D6 28
|
||||
#define LCD_PINS_D7 27
|
||||
#endif
|
||||
//The encoder and click button
|
||||
#define BTN_EN1 11 //must be a hardware interrupt pin
|
||||
#define BTN_EN2 10 //must be hardware interrupt pin
|
||||
#define BTN_EN1 11
|
||||
#define BTN_EN2 10
|
||||
#define BTN_ENC 16 //the switch
|
||||
//not connected to a pin
|
||||
#define SDCARDDETECT -1
|
||||
|
||||
//from the same bit in the RAMPS Newpanel define
|
||||
//encoder rotation values
|
||||
#define encrot0 0
|
||||
#define encrot1 2
|
||||
#define encrot2 3
|
||||
#define encrot3 1
|
||||
|
||||
#define BLEN_C 2
|
||||
#define BLEN_B 1
|
||||
#define BLEN_A 0
|
||||
|
||||
#define SDCARDDETECT -1
|
||||
|
||||
#endif //Newpanel
|
||||
#endif //Ultipanel
|
||||
|
||||
|
|
@ -879,18 +822,9 @@
|
|||
#define BTN_EN1 40
|
||||
#define BTN_EN2 42
|
||||
#define BTN_ENC 19 //the click
|
||||
|
||||
#define BLEN_C 2
|
||||
#define BLEN_B 1
|
||||
#define BLEN_A 0
|
||||
|
||||
|
||||
#define SDCARDDETECT 38
|
||||
|
||||
//encoder rotation values
|
||||
#define encrot0 0
|
||||
#define encrot1 2
|
||||
#define encrot2 3
|
||||
#define encrot3 1
|
||||
|
||||
#else //old style panel with shift register
|
||||
//arduino pin witch triggers an piezzo beeper
|
||||
#define BEEPER 18
|
||||
|
|
@ -907,34 +841,9 @@
|
|||
#define LCD_PINS_D5 21
|
||||
#define LCD_PINS_D6 20
|
||||
#define LCD_PINS_D7 19
|
||||
|
||||
//encoder rotation values
|
||||
#ifndef ULTIMAKERCONTROLLER
|
||||
#define encrot0 0
|
||||
#define encrot1 2
|
||||
#define encrot2 3
|
||||
#define encrot3 1
|
||||
#else
|
||||
#define encrot0 0
|
||||
#define encrot1 1
|
||||
#define encrot2 3
|
||||
#define encrot3 2
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#define SDCARDDETECT -1
|
||||
//bits in the shift register that carry the buttons for:
|
||||
// left up center down right red
|
||||
#define BL_LE 7
|
||||
#define BL_UP 6
|
||||
#define BL_MI 5
|
||||
#define BL_DW 4
|
||||
#define BL_RI 3
|
||||
#define BL_ST 2
|
||||
|
||||
#define BLEN_B 1
|
||||
#define BLEN_A 0
|
||||
#endif
|
||||
#endif
|
||||
#endif //ULTRA_LCD
|
||||
|
||||
#endif
|
||||
|
|
@ -1122,14 +1031,6 @@
|
|||
#define BTN_EN1 11
|
||||
#define BTN_EN2 12
|
||||
#define BTN_ENC 43
|
||||
//encoder rotation values
|
||||
#define BLEN_C 2
|
||||
#define BLEN_B 1
|
||||
#define BLEN_A 0
|
||||
#define encrot0 0
|
||||
#define encrot1 2
|
||||
#define encrot2 3
|
||||
#define encrot3 1
|
||||
|
||||
#endif //MOTHERBOARD==80
|
||||
|
||||
|
|
@ -1434,12 +1335,12 @@
|
|||
#define E0_ENABLE_PIN 10
|
||||
|
||||
/* future proofing */
|
||||
#define __FS 20
|
||||
#define __FD 19
|
||||
#define __GS 18
|
||||
#define __GD 13
|
||||
#define __FS 20
|
||||
#define __FD 19
|
||||
#define __GS 18
|
||||
#define __GD 13
|
||||
|
||||
#define UNUSED_PWM 14 /* PWM on LEFT connector */
|
||||
#define UNUSED_PWM 14 /* PWM on LEFT connector */
|
||||
|
||||
#define E1_STEP_PIN -1 // 21
|
||||
#define E1_DIR_PIN -1 // 20
|
||||
|
|
@ -1468,8 +1369,8 @@
|
|||
#define HEATER_BED_PIN 4
|
||||
#define TEMP_BED_PIN 2 // 1,2 or I2C
|
||||
|
||||
#define I2C_SCL 16
|
||||
#define I2C_SDA 17
|
||||
#define I2C_SCL 16
|
||||
#define I2C_SDA 17
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -1617,7 +1518,7 @@
|
|||
#define HEATER_BED_PIN 10 // BED
|
||||
#define TEMP_BED_PIN 14 // ANALOG NUMBERING
|
||||
|
||||
#define BEEPER 33 // Beeper on AUX-4
|
||||
#define BEEPER 33 // Beeper on AUX-4
|
||||
|
||||
|
||||
#ifdef ULTRA_LCD
|
||||
|
|
@ -1636,18 +1537,8 @@
|
|||
#define BTN_EN1 59
|
||||
#define BTN_EN2 64
|
||||
#define BTN_ENC 43 //the click
|
||||
|
||||
#define BLEN_C 2
|
||||
#define BLEN_B 1
|
||||
#define BLEN_A 0
|
||||
|
||||
#define SDCARDDETECT -1 // Ramps does not use this port
|
||||
|
||||
//encoder rotation values
|
||||
#define encrot0 0
|
||||
#define encrot1 2
|
||||
#define encrot2 3
|
||||
#define encrot3 1
|
||||
|
||||
#define SDCARDDETECT -1 // Ramps does not use this port
|
||||
#endif
|
||||
#endif //ULTRA_LCD
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,11 @@ static void menu_action_setting_edit_callback_float51(const char* pstr, float* p
|
|||
static void menu_action_setting_edit_callback_float52(const char* pstr, float* ptr, float minValue, float maxValue, menuFunc_t callbackFunc);
|
||||
static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned long* ptr, unsigned long minValue, unsigned long maxValue, menuFunc_t callbackFunc);
|
||||
|
||||
#define ENCODER_STEPS_PER_MENU_ITEM 5
|
||||
#if !defined(LCD_I2C_VIKI)
|
||||
#define ENCODER_STEPS_PER_MENU_ITEM 5
|
||||
#else
|
||||
#define ENCODER_STEPS_PER_MENU_ITEM 2 // VIKI LCD rotary encoder uses a different number of steps per rotation
|
||||
#endif
|
||||
|
||||
/* Helper macros for menus */
|
||||
#define START_MENU() do { \
|
||||
|
|
@ -112,15 +116,18 @@ static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned l
|
|||
} } while(0)
|
||||
|
||||
/** Used variables to keep track of the menu */
|
||||
#ifndef REPRAPWORLD_KEYPAD
|
||||
volatile uint8_t buttons;//Contains the bits of the currently pressed buttons.
|
||||
volatile uint8_t buttons_reprapworld_keypad; // to store the reprapworld_keypad shiftregister values
|
||||
#else
|
||||
volatile uint16_t buttons;//Contains the bits of the currently pressed buttons (extended).
|
||||
#endif
|
||||
|
||||
uint8_t currentMenuViewOffset; /* scroll offset in the current menu */
|
||||
uint32_t blocking_enc;
|
||||
uint8_t lastEncoderBits;
|
||||
int8_t encoderDiff; /* encoderDiff is updated from interrupt context and added to encoderPosition every LCD update */
|
||||
uint32_t encoderPosition;
|
||||
#if (SDCARDDETECT > -1)
|
||||
#if (SDCARDDETECT > 0)
|
||||
bool lcd_oldcardstatus;
|
||||
#endif
|
||||
#endif//ULTIPANEL
|
||||
|
|
@ -222,14 +229,14 @@ static void lcd_main_menu()
|
|||
}else{
|
||||
MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu);
|
||||
#if SDCARDDETECT < 1
|
||||
MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21")); // SD-card changed by user
|
||||
#endif
|
||||
MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21")); // SD-card changed by user
|
||||
#endif
|
||||
}
|
||||
}else{
|
||||
MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu);
|
||||
#if SDCARDDETECT < 1
|
||||
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
|
||||
#endif
|
||||
#if SDCARDDETECT < 1
|
||||
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
END_MENU();
|
||||
|
|
@ -252,7 +259,7 @@ void lcd_preheat_pla()
|
|||
setTargetBed(plaPreheatHPBTemp);
|
||||
fanSpeed = plaPreheatFanSpeed;
|
||||
lcd_return_to_status();
|
||||
setWatch(); // heater sanity check timer
|
||||
setWatch(); // heater sanity check timer
|
||||
}
|
||||
|
||||
void lcd_preheat_abs()
|
||||
|
|
@ -263,16 +270,16 @@ void lcd_preheat_abs()
|
|||
setTargetBed(absPreheatHPBTemp);
|
||||
fanSpeed = absPreheatFanSpeed;
|
||||
lcd_return_to_status();
|
||||
setWatch(); // heater sanity check timer
|
||||
setWatch(); // heater sanity check timer
|
||||
}
|
||||
|
||||
static void lcd_cooldown()
|
||||
{
|
||||
setTargetHotend0(0);
|
||||
setTargetHotend1(0);
|
||||
setTargetHotend2(0);
|
||||
setTargetBed(0);
|
||||
lcd_return_to_status();
|
||||
setTargetHotend0(0);
|
||||
setTargetHotend1(0);
|
||||
setTargetHotend2(0);
|
||||
setTargetBed(0);
|
||||
lcd_return_to_status();
|
||||
}
|
||||
|
||||
static void lcd_tune_menu()
|
||||
|
|
@ -471,10 +478,10 @@ static void lcd_control_menu()
|
|||
|
||||
static void lcd_control_temperature_menu()
|
||||
{
|
||||
// set up temp variables - undo the default scaling
|
||||
raw_Ki = unscalePID_i(Ki);
|
||||
raw_Kd = unscalePID_d(Kd);
|
||||
|
||||
// set up temp variables - undo the default scaling
|
||||
raw_Ki = unscalePID_i(Ki);
|
||||
raw_Kd = unscalePID_d(Kd);
|
||||
|
||||
START_MENU();
|
||||
MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
|
||||
MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
|
||||
|
|
@ -496,7 +503,7 @@ static void lcd_control_temperature_menu()
|
|||
#endif
|
||||
#ifdef PIDTEMP
|
||||
MENU_ITEM_EDIT(float52, MSG_PID_P, &Kp, 1, 9990);
|
||||
// i is typically a small value so allows values below 1
|
||||
// i is typically a small value so allows values below 1
|
||||
MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I, &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
|
||||
MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D, &raw_Kd, 1, 9990, copy_and_scalePID_d);
|
||||
# ifdef PID_ADD_EXTRUSION_RATE
|
||||
|
|
@ -700,21 +707,21 @@ menu_edit_type(float, float52, ftostr52, 100)
|
|||
menu_edit_type(unsigned long, long5, ftostr5, 0.01)
|
||||
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
static void reprapworld_keypad_move_y_down() {
|
||||
static void reprapworld_keypad_move_y_down() {
|
||||
encoderPosition = 1;
|
||||
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
|
||||
lcd_move_y();
|
||||
}
|
||||
static void reprapworld_keypad_move_y_up() {
|
||||
encoderPosition = -1;
|
||||
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
|
||||
lcd_move_y();
|
||||
}
|
||||
static void reprapworld_keypad_move_home() {
|
||||
//enquecommand_P((PSTR("G28"))); // move all axis home
|
||||
// TODO gregor: move all axis home, i have currently only one axis on my prusa i3
|
||||
enquecommand_P((PSTR("G28 Y")));
|
||||
}
|
||||
lcd_move_y();
|
||||
}
|
||||
static void reprapworld_keypad_move_y_up() {
|
||||
encoderPosition = -1;
|
||||
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
|
||||
lcd_move_y();
|
||||
}
|
||||
static void reprapworld_keypad_move_home() {
|
||||
//enquecommand_P((PSTR("G28"))); // move all axis home
|
||||
// TODO gregor: move all axis home, i have currently only one axis on my prusa i3
|
||||
enquecommand_P((PSTR("G28 Y")));
|
||||
}
|
||||
#endif
|
||||
|
||||
/** End of menus **/
|
||||
|
|
@ -775,18 +782,20 @@ void lcd_init()
|
|||
#ifdef NEWPANEL
|
||||
pinMode(BTN_EN1,INPUT);
|
||||
pinMode(BTN_EN2,INPUT);
|
||||
pinMode(BTN_ENC,INPUT);
|
||||
pinMode(SDCARDDETECT,INPUT);
|
||||
WRITE(BTN_EN1,HIGH);
|
||||
WRITE(BTN_EN2,HIGH);
|
||||
#if BTN_ENC > 0
|
||||
pinMode(BTN_ENC,INPUT);
|
||||
WRITE(BTN_ENC,HIGH);
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
pinMode(SHIFT_CLK,OUTPUT);
|
||||
pinMode(SHIFT_LD,OUTPUT);
|
||||
pinMode(SHIFT_OUT,INPUT);
|
||||
WRITE(SHIFT_OUT,HIGH);
|
||||
WRITE(SHIFT_LD,HIGH);
|
||||
#endif
|
||||
#endif
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
pinMode(SHIFT_CLK,OUTPUT);
|
||||
pinMode(SHIFT_LD,OUTPUT);
|
||||
pinMode(SHIFT_OUT,INPUT);
|
||||
WRITE(SHIFT_OUT,HIGH);
|
||||
WRITE(SHIFT_LD,HIGH);
|
||||
#endif
|
||||
#else
|
||||
pinMode(SHIFT_CLK,OUTPUT);
|
||||
pinMode(SHIFT_LD,OUTPUT);
|
||||
|
|
@ -796,12 +805,14 @@ void lcd_init()
|
|||
WRITE(SHIFT_LD,HIGH);
|
||||
WRITE(SHIFT_EN,LOW);
|
||||
#endif//!NEWPANEL
|
||||
#if (SDCARDDETECT > -1)
|
||||
#if (SDCARDDETECT > 0)
|
||||
WRITE(SDCARDDETECT, HIGH);
|
||||
lcd_oldcardstatus = IS_SD_INSERTED;
|
||||
#endif//(SDCARDDETECT > -1)
|
||||
#endif//(SDCARDDETECT > 0)
|
||||
lcd_buttons_update();
|
||||
#ifdef ULTIPANEL
|
||||
encoderDiff = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
void lcd_update()
|
||||
|
|
@ -810,7 +821,11 @@ void lcd_update()
|
|||
|
||||
lcd_buttons_update();
|
||||
|
||||
#if (SDCARDDETECT > -1)
|
||||
#ifdef LCD_HAS_SLOW_BUTTONS
|
||||
buttons |= lcd_implementation_read_slow_buttons(); // buttons which take too long to read in interrupt context
|
||||
#endif
|
||||
|
||||
#if (SDCARDDETECT > 0)
|
||||
if((IS_SD_INSERTED != lcd_oldcardstatus))
|
||||
{
|
||||
lcdDrawUpdate = 2;
|
||||
|
|
@ -833,17 +848,17 @@ void lcd_update()
|
|||
if (lcd_next_update_millis < millis())
|
||||
{
|
||||
#ifdef ULTIPANEL
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
if (REPRAPWORLD_KEYPAD_MOVE_Y_DOWN) {
|
||||
reprapworld_keypad_move_y_down();
|
||||
}
|
||||
if (REPRAPWORLD_KEYPAD_MOVE_Y_UP) {
|
||||
reprapworld_keypad_move_y_up();
|
||||
}
|
||||
if (REPRAPWORLD_KEYPAD_MOVE_HOME) {
|
||||
reprapworld_keypad_move_home();
|
||||
}
|
||||
#endif
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
if (REPRAPWORLD_KEYPAD_MOVE_Y_DOWN) {
|
||||
reprapworld_keypad_move_y_down();
|
||||
}
|
||||
if (REPRAPWORLD_KEYPAD_MOVE_Y_UP) {
|
||||
reprapworld_keypad_move_y_up();
|
||||
}
|
||||
if (REPRAPWORLD_KEYPAD_MOVE_HOME) {
|
||||
reprapworld_keypad_move_home();
|
||||
}
|
||||
#endif
|
||||
if (encoderDiff)
|
||||
{
|
||||
lcdDrawUpdate = 1;
|
||||
|
|
@ -856,21 +871,26 @@ void lcd_update()
|
|||
#endif//ULTIPANEL
|
||||
|
||||
#ifdef DOGLCD // Changes due to different driver architecture of the DOGM display
|
||||
blink++; // Variable for fan animation and alive dot
|
||||
u8g.firstPage();
|
||||
do {
|
||||
u8g.setFont(u8g_font_6x10_marlin);
|
||||
u8g.setPrintPos(125,0);
|
||||
if (blink % 2) u8g.setColorIndex(1); else u8g.setColorIndex(0); // Set color for the alive dot
|
||||
u8g.drawPixel(127,63); // draw alive dot
|
||||
u8g.setColorIndex(1); // black on white
|
||||
(*currentMenu)();
|
||||
if (!lcdDrawUpdate) break; // Terminate display update, when nothing new to draw. This must be done before the last dogm.next()
|
||||
} while( u8g.nextPage() );
|
||||
blink++; // Variable for fan animation and alive dot
|
||||
u8g.firstPage();
|
||||
do
|
||||
{
|
||||
u8g.setFont(u8g_font_6x10_marlin);
|
||||
u8g.setPrintPos(125,0);
|
||||
if (blink % 2) u8g.setColorIndex(1); else u8g.setColorIndex(0); // Set color for the alive dot
|
||||
u8g.drawPixel(127,63); // draw alive dot
|
||||
u8g.setColorIndex(1); // black on white
|
||||
(*currentMenu)();
|
||||
if (!lcdDrawUpdate) break; // Terminate display update, when nothing new to draw. This must be done before the last dogm.next()
|
||||
} while( u8g.nextPage() );
|
||||
#else
|
||||
(*currentMenu)();
|
||||
#endif
|
||||
|
||||
#ifdef LCD_HAS_STATUS_INDICATORS
|
||||
lcd_implementation_update_indicators();
|
||||
#endif
|
||||
|
||||
#ifdef ULTIPANEL
|
||||
if(timeoutToStatus < millis() && currentMenu != lcd_status_screen)
|
||||
{
|
||||
|
|
@ -921,23 +941,25 @@ void lcd_buttons_update()
|
|||
uint8_t newbutton=0;
|
||||
if(READ(BTN_EN1)==0) newbutton|=EN_A;
|
||||
if(READ(BTN_EN2)==0) newbutton|=EN_B;
|
||||
#if BTN_ENC > 0
|
||||
if((blocking_enc<millis()) && (READ(BTN_ENC)==0))
|
||||
newbutton |= EN_C;
|
||||
#endif
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
// for the reprapworld_keypad
|
||||
uint8_t newbutton_reprapworld_keypad=0;
|
||||
WRITE(SHIFT_LD,LOW);
|
||||
WRITE(SHIFT_LD,HIGH);
|
||||
for(int8_t i=0;i<8;i++) {
|
||||
newbutton_reprapworld_keypad = newbutton_reprapworld_keypad>>1;
|
||||
if(READ(SHIFT_OUT))
|
||||
newbutton_reprapworld_keypad|=(1<<7);
|
||||
WRITE(SHIFT_CLK,HIGH);
|
||||
WRITE(SHIFT_CLK,LOW);
|
||||
}
|
||||
newbutton |= ((~newbutton_reprapworld_keypad) << REPRAPWORLD_BTN_OFFSET); //invert it, because a pressed switch produces a logical 0
|
||||
#endif
|
||||
buttons = newbutton;
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
// for the reprapworld_keypad
|
||||
uint8_t newbutton_reprapworld_keypad=0;
|
||||
WRITE(SHIFT_LD,LOW);
|
||||
WRITE(SHIFT_LD,HIGH);
|
||||
for(int8_t i=0;i<8;i++) {
|
||||
newbutton_reprapworld_keypad = newbutton_reprapworld_keypad>>1;
|
||||
if(READ(SHIFT_OUT))
|
||||
newbutton_reprapworld_keypad|=(1<<7);
|
||||
WRITE(SHIFT_CLK,HIGH);
|
||||
WRITE(SHIFT_CLK,LOW);
|
||||
}
|
||||
buttons_reprapworld_keypad=~newbutton_reprapworld_keypad; //invert it, because a pressed switch produces a logical 0
|
||||
#endif
|
||||
#else //read it from the shift register
|
||||
uint8_t newbutton=0;
|
||||
WRITE(SHIFT_LD,LOW);
|
||||
|
|
@ -992,6 +1014,18 @@ void lcd_buttons_update()
|
|||
}
|
||||
lastEncoderBits = enc;
|
||||
}
|
||||
|
||||
void lcd_buzz(long duration, uint16_t freq)
|
||||
{
|
||||
#ifdef LCD_USE_I2C_BUZZER
|
||||
lcd.buzz(duration,freq);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool lcd_clicked()
|
||||
{
|
||||
return LCD_CLICKED;
|
||||
}
|
||||
#endif//ULTIPANEL
|
||||
|
||||
/********************************/
|
||||
|
|
@ -1193,7 +1227,7 @@ void copy_and_scalePID_i()
|
|||
{
|
||||
Ki = scalePID_i(raw_Ki);
|
||||
updatePID();
|
||||
}
|
||||
}
|
||||
|
||||
// Callback for after editing PID d value
|
||||
// grab the pid d value out of the temp variable; scale it; then update the PID driver
|
||||
|
|
@ -1201,6 +1235,6 @@ void copy_and_scalePID_d()
|
|||
{
|
||||
Kd = scalePID_d(raw_Kd);
|
||||
updatePID();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif //ULTRA_LCD
|
||||
|
|
|
|||
|
|
@ -22,10 +22,6 @@
|
|||
|
||||
#ifdef ULTIPANEL
|
||||
void lcd_buttons_update();
|
||||
extern volatile uint8_t buttons; //the last checked buttons in a bit array.
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
extern volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shiftregister values
|
||||
#endif
|
||||
#else
|
||||
FORCE_INLINE void lcd_buttons_update() {}
|
||||
#endif
|
||||
|
|
@ -38,40 +34,8 @@
|
|||
extern int absPreheatHPBTemp;
|
||||
extern int absPreheatFanSpeed;
|
||||
|
||||
#ifdef NEWPANEL
|
||||
#define EN_C (1<<BLEN_C)
|
||||
#define EN_B (1<<BLEN_B)
|
||||
#define EN_A (1<<BLEN_A)
|
||||
|
||||
#define LCD_CLICKED (buttons&EN_C)
|
||||
#ifdef REPRAPWORLD_KEYPAD
|
||||
#define EN_REPRAPWORLD_KEYPAD_F3 (1<<BLEN_REPRAPWORLD_KEYPAD_F3)
|
||||
#define EN_REPRAPWORLD_KEYPAD_F2 (1<<BLEN_REPRAPWORLD_KEYPAD_F2)
|
||||
#define EN_REPRAPWORLD_KEYPAD_F1 (1<<BLEN_REPRAPWORLD_KEYPAD_F1)
|
||||
#define EN_REPRAPWORLD_KEYPAD_UP (1<<BLEN_REPRAPWORLD_KEYPAD_UP)
|
||||
#define EN_REPRAPWORLD_KEYPAD_RIGHT (1<<BLEN_REPRAPWORLD_KEYPAD_RIGHT)
|
||||
#define EN_REPRAPWORLD_KEYPAD_MIDDLE (1<<BLEN_REPRAPWORLD_KEYPAD_MIDDLE)
|
||||
#define EN_REPRAPWORLD_KEYPAD_DOWN (1<<BLEN_REPRAPWORLD_KEYPAD_DOWN)
|
||||
#define EN_REPRAPWORLD_KEYPAD_LEFT (1<<BLEN_REPRAPWORLD_KEYPAD_LEFT)
|
||||
|
||||
#define LCD_CLICKED ((buttons&EN_C) || (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F1))
|
||||
#define REPRAPWORLD_KEYPAD_MOVE_Y_DOWN (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_DOWN)
|
||||
#define REPRAPWORLD_KEYPAD_MOVE_Y_UP (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_UP)
|
||||
#define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_MIDDLE)
|
||||
#endif //REPRAPWORLD_KEYPAD
|
||||
#else
|
||||
//atomatic, do not change
|
||||
#define B_LE (1<<BL_LE)
|
||||
#define B_UP (1<<BL_UP)
|
||||
#define B_MI (1<<BL_MI)
|
||||
#define B_DW (1<<BL_DW)
|
||||
#define B_RI (1<<BL_RI)
|
||||
#define B_ST (1<<BL_ST)
|
||||
#define EN_B (1<<BLEN_B)
|
||||
#define EN_A (1<<BLEN_A)
|
||||
|
||||
#define LCD_CLICKED ((buttons&B_MI)||(buttons&B_ST))
|
||||
#endif//NEWPANEL
|
||||
void lcd_buzz(long duration,uint16_t freq);
|
||||
bool lcd_clicked();
|
||||
|
||||
#else //no lcd
|
||||
FORCE_INLINE void lcd_update() {}
|
||||
|
|
@ -79,6 +43,7 @@
|
|||
FORCE_INLINE void lcd_setstatus(const char* message) {}
|
||||
FORCE_INLINE void lcd_buttons_update() {}
|
||||
FORCE_INLINE void lcd_reset_alert_level() {}
|
||||
FORCE_INLINE void lcd_buzz(long duration,uint16_t freq) {}
|
||||
|
||||
#define LCD_MESSAGEPGM(x)
|
||||
#define LCD_ALERTMESSAGEPGM(x)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue