Merge pull request #2848 from japzi/RCBugFix
Fixing Rigidbot LCD Panel Support
This commit is contained in:
		| @@ -195,11 +195,7 @@ void CardReader::initsd() { | ||||
|   cardOK = false; | ||||
|   if (root.isOpen()) root.close(); | ||||
|  | ||||
|   #if ENABLED(SDEXTRASLOW) | ||||
|     #define SPI_SPEED SPI_QUARTER_SPEED | ||||
|   #elif ENABLED(SDSLOW) | ||||
|     #define SPI_SPEED SPI_HALF_SPEED | ||||
|   #else | ||||
|   #ifndef SPI_SPEED | ||||
|     #define SPI_SPEED SPI_FULL_SPEED | ||||
|   #endif | ||||
|  | ||||
|   | ||||
| @@ -649,8 +649,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -618,8 +618,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -658,8 +658,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo | ||||
| #define ULTRA_LCD  //general LCD support, also 16x2 | ||||
| //#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) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -654,8 +654,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -666,8 +666,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| #define ULTRA_LCD  //general LCD support, also 16x2 | ||||
| //#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) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| #define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -219,6 +219,11 @@ Here are some standard links for getting your machine calibrated: | ||||
|   //#define  DEFAULT_Ki 0.85 | ||||
|   //#define  DEFAULT_Kd 245 | ||||
|  | ||||
|   // E3D w/ rigidbot cartridge | ||||
|   //#define  DEFAULT_Kp 16.30 | ||||
|   //#define  DEFAULT_Ki 0.95 | ||||
|   //#define  DEFAULT_Kd 69.69 | ||||
|  | ||||
| #endif // PIDTEMP | ||||
|  | ||||
| //=========================================================================== | ||||
| @@ -611,7 +616,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). | ||||
| // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to. | ||||
| //define this to enable EEPROM support | ||||
| //#define EEPROM_SETTINGS | ||||
| #define EEPROM_SETTINGS | ||||
|  | ||||
| #if ENABLED(EEPROM_SETTINGS) | ||||
|   // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: | ||||
| @@ -651,10 +656,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
|  | ||||
| //#define ULTRA_LCD  //general LCD support, also 16x2 | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| #define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| #define SPI_SPEED SPI_EIGHTH_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -279,9 +279,9 @@ | ||||
| //=============================Additional Features=========================== | ||||
| //=========================================================================== | ||||
|  | ||||
| #define ENCODER_RATE_MULTIPLIER         // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly | ||||
| #define ENCODER_10X_STEPS_PER_SEC 75    // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value | ||||
| #define ENCODER_100X_STEPS_PER_SEC 160  // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value | ||||
| //#define ENCODER_RATE_MULTIPLIER         // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly | ||||
| //#define ENCODER_10X_STEPS_PER_SEC 75    // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value | ||||
| //#define ENCODER_100X_STEPS_PER_SEC 160  // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value | ||||
|  | ||||
| //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ | ||||
| #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again | ||||
| @@ -414,7 +414,7 @@ const unsigned int dropsegments = 5; //everything with less than this number of | ||||
|  | ||||
| //The ASCII buffer for receiving from the serial: | ||||
| #define MAX_CMD_SIZE 96 | ||||
| #define BUFSIZE 4 | ||||
| #define BUFSIZE 8 | ||||
|  | ||||
| // Bad Serial-connections can miss a received command by sending an 'ok' | ||||
| // Therefore some clients abort after 30 seconds in a timeout. | ||||
|   | ||||
| @@ -674,8 +674,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -685,8 +685,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| #define ENCODER_PULSES_PER_STEP 2 // Increase if you have a high resolution encoder | ||||
| #define ENCODER_STEPS_PER_MENU_ITEM 1 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -657,8 +657,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo | ||||
| #define ULTRA_LCD  //general LCD support, also 16x2 | ||||
| //#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) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -666,8 +666,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| //#define ULTRA_LCD  //general LCD support, also 16x2 | ||||
| //#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) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| #define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -788,8 +788,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -789,8 +789,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -793,8 +793,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -783,8 +783,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| //#define ULTRA_LCD  //general LCD support, also 16x2 | ||||
| //#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) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -668,8 +668,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l | ||||
| //#define ULTRA_LCD  //general LCD support, also 16x2 | ||||
| //#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) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| #define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -661,8 +661,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo | ||||
| //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) | ||||
| //#define SDSUPPORT // Enable SD Card Support in Hardware Console | ||||
| // Changed behaviour! If you need SDSUPPORT uncomment it! | ||||
| //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) | ||||
| //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication | ||||
| //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder | ||||
| //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking | ||||
|   | ||||
| @@ -5,7 +5,10 @@ | ||||
| #include "pins_RAMPS_13.h" | ||||
|  | ||||
| #if ENABLED(Z_MIN_PROBE_ENDSTOP) | ||||
|   #define Z_MIN_PROBE_PIN  19 | ||||
|   #undef Z_MAX_PIN | ||||
|   #define Z_MAX_PIN -1 | ||||
|   #undef Z_MIN_PROBE_PIN | ||||
|   #define Z_MIN_PROBE_PIN  19    // Z-MAX pin J14 End Stops | ||||
| #endif | ||||
|  | ||||
| #undef HEATER_0_PIN | ||||
| @@ -25,24 +28,22 @@ | ||||
|   #undef BEEPER_PIN | ||||
|   #define BEEPER_PIN -1 | ||||
|  | ||||
|   #undef SD_DETECT_PIN | ||||
|   #define SD_DETECT_PIN 22 | ||||
|  | ||||
|   // Extra button definitions, substitute for EN1 / EN2 | ||||
|   #define BTN_UP  37 // BTN_EN1 | ||||
|   #define BTN_DWN 35 // BTN_EN2 | ||||
|   #define BTN_LFT 33 | ||||
|   #define BTN_RT  32 | ||||
|  | ||||
|   // Marlin can respond to UP/DOWN by default | ||||
|   // #undef  BTN_EN1 | ||||
|   // #undef  BTN_EN2 | ||||
|   //#define BTN_EN1 -1 | ||||
|   //#define BTN_EN2 -1 | ||||
|   // Direction buttons | ||||
|   #define BTN_UP           37 | ||||
|   #define BTN_DWN          35 | ||||
|   #define BTN_LFT          33 | ||||
|   #define BTN_RT           32 | ||||
|  | ||||
|   // 'R' button | ||||
|   #undef  BTN_ENC | ||||
|   #define BTN_ENC 31 | ||||
|  | ||||
|   // Disable encoder | ||||
|   #undef  BTN_EN1 | ||||
|   #define BTN_EN1 -1 | ||||
|   #undef  BTN_EN2 | ||||
|   #define BTN_EN2 -1 | ||||
|  | ||||
|   #undef  SD_DETECT_PIN | ||||
|   #define SD_DETECT_PIN 22 | ||||
|  | ||||
|   | ||||
| @@ -1524,11 +1524,15 @@ void lcd_init() { | ||||
|   lcd_implementation_init(); | ||||
|  | ||||
|   #if ENABLED(NEWPANEL) | ||||
|     #if BTN_EN1 > 0 | ||||
|       SET_INPUT(BTN_EN1); | ||||
|       WRITE(BTN_EN1, HIGH); | ||||
|     #endif | ||||
|  | ||||
|     SET_INPUT(BTN_EN1); | ||||
|     SET_INPUT(BTN_EN2); | ||||
|     WRITE(BTN_EN1, HIGH); | ||||
|     WRITE(BTN_EN2, HIGH); | ||||
|     #if BTN_EN2 > 0 | ||||
|       SET_INPUT(BTN_EN2); | ||||
|       WRITE(BTN_EN2, HIGH); | ||||
|     #endif | ||||
|  | ||||
|     #if BTN_ENC > 0 | ||||
|       SET_INPUT(BTN_ENC); | ||||
| @@ -1543,6 +1547,13 @@ void lcd_init() { | ||||
|       WRITE(SHIFT_LD, HIGH); | ||||
|     #endif | ||||
|  | ||||
|     #ifdef RIGIDBOT_PANEL | ||||
|       SET_INPUT(BTN_UP); | ||||
|       SET_INPUT(BTN_DWN); | ||||
|       SET_INPUT(BTN_LFT); | ||||
|       SET_INPUT(BTN_RT); | ||||
|     #endif | ||||
|  | ||||
|   #else  // Not NEWPANEL | ||||
|  | ||||
|     #if ENABLED(SR_LCD_2W_NL) // Non latching 2 wire shift register | ||||
| @@ -1670,7 +1681,7 @@ void lcd_update() { | ||||
|               int32_t encoderMovementSteps = abs(encoderDiff) / ENCODER_PULSES_PER_STEP; | ||||
|  | ||||
|               if (lastEncoderMovementMillis != 0) { | ||||
|                 // Note that the rate is always calculated between to passes through the  | ||||
|                 // Note that the rate is always calculated between to passes through the | ||||
|                 // loop and that the abs of the encoderDiff value is tracked. | ||||
|                 float encoderStepRate = (float)(encoderMovementSteps) / ((float)(ms - lastEncoderMovementMillis)) * 1000.0; | ||||
|  | ||||
| @@ -1843,10 +1854,37 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } | ||||
|   void lcd_buttons_update() { | ||||
|     #if ENABLED(NEWPANEL) | ||||
|       uint8_t newbutton = 0; | ||||
|       if (READ(BTN_EN1) == 0) newbutton |= EN_A; | ||||
|       if (READ(BTN_EN2) == 0) newbutton |= EN_B; | ||||
|       #if BTN_EN1 > 0 | ||||
|         if (READ(BTN_EN1) == 0) newbutton |= EN_A; | ||||
|       #endif | ||||
|       #if BTN_EN2 > 0 | ||||
|         if (READ(BTN_EN2) == 0) newbutton |= EN_B; | ||||
|       #endif | ||||
|       #if ENABLED(RIGIDBOT_PANEL) || BTN_ENC > 0 | ||||
|         millis_t now = millis(); | ||||
|       #endif | ||||
|       #if ENABLED(RIGIDBOT_PANEL) | ||||
|         if (now > next_button_update_ms) { | ||||
|           if (READ(BTN_UP) == 0) { | ||||
|             encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; | ||||
|             next_button_update_ms = now + 300; | ||||
|           } | ||||
|           else if (READ(BTN_DWN) == 0) { | ||||
|             encoderDiff = ENCODER_STEPS_PER_MENU_ITEM; | ||||
|             next_button_update_ms = now + 300; | ||||
|           } | ||||
|           else if (READ(BTN_LFT) == 0) { | ||||
|             encoderDiff = -1 * ENCODER_PULSES_PER_STEP; | ||||
|             next_button_update_ms = now + 300; | ||||
|           } | ||||
|           else if (READ(BTN_RT) == 0) { | ||||
|             encoderDiff = ENCODER_PULSES_PER_STEP; | ||||
|             next_button_update_ms = now + 300; | ||||
|           } | ||||
|         } | ||||
|       #endif | ||||
|       #if BTN_ENC > 0 | ||||
|         if (millis() > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; | ||||
|         if (now > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; | ||||
|       #endif | ||||
|       buttons = newbutton; | ||||
|       #if ENABLED(LCD_HAS_SLOW_BUTTONS) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user