From 6339b506c05bf2967c081493384d4967bc14d1fe Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 1 Feb 2018 04:12:45 -0600 Subject: [PATCH] Make sure binary.h is included as needed --- Marlin/src/feature/I2CPositionEncoder.cpp | 2 +- Marlin/src/feature/dac/dac_mcp4728.h | 22 +++++++++++----------- Marlin/src/lcd/dogm/dogm_bitmaps.h | 2 ++ Marlin/src/lcd/ultralcd_impl_HD44780.h | 8 +++++--- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Marlin/src/feature/I2CPositionEncoder.cpp b/Marlin/src/feature/I2CPositionEncoder.cpp index 181d1fcd3..1876e587c 100644 --- a/Marlin/src/feature/I2CPositionEncoder.cpp +++ b/Marlin/src/feature/I2CPositionEncoder.cpp @@ -37,7 +37,7 @@ #include "../module/temperature.h" #include "../module/stepper.h" #include "../gcode/parser.h" -#include "binary.h" +#include #include diff --git a/Marlin/src/feature/dac/dac_mcp4728.h b/Marlin/src/feature/dac/dac_mcp4728.h index 0e999afb7..aeacaaa0b 100644 --- a/Marlin/src/feature/dac/dac_mcp4728.h +++ b/Marlin/src/feature/dac/dac_mcp4728.h @@ -31,17 +31,17 @@ #define defaultVDD DAC_STEPPER_MAX //was 5000 but differs with internal Vref #define BASE_ADDR 0x60 -#define RESET 0B00000110 -#define WAKE 0B00001001 -#define UPDATE 0B00001000 -#define MULTIWRITE 0B01000000 -#define SINGLEWRITE 0B01011000 -#define SEQWRITE 0B01010000 -#define VREFWRITE 0B10000000 -#define GAINWRITE 0B11000000 -#define POWERDOWNWRITE 0B10100000 -#define GENERALCALL 0B00000000 -#define GAINWRITE 0B11000000 +#define RESET 0b00000110 +#define WAKE 0b00001001 +#define UPDATE 0b00001000 +#define MULTIWRITE 0b01000000 +#define SINGLEWRITE 0b01011000 +#define SEQWRITE 0b01010000 +#define VREFWRITE 0b10000000 +#define GAINWRITE 0b11000000 +#define POWERDOWNWRITE 0b10100000 +#define GENERALCALL 0b00000000 +#define GAINWRITE 0b11000000 // This is taken from the original lib, makes it easy to edit if needed // DAC_OR_ADDRESS defined in pins_BOARD.h file diff --git a/Marlin/src/lcd/dogm/dogm_bitmaps.h b/Marlin/src/lcd/dogm/dogm_bitmaps.h index 213c54469..c83c4a619 100644 --- a/Marlin/src/lcd/dogm/dogm_bitmaps.h +++ b/Marlin/src/lcd/dogm/dogm_bitmaps.h @@ -32,6 +32,8 @@ * Please note that using the high-res version takes 402Bytes of PROGMEM. */ +#include + //#define START_BMPHIGH #if ENABLED(SHOW_BOOTSCREEN) diff --git a/Marlin/src/lcd/ultralcd_impl_HD44780.h b/Marlin/src/lcd/ultralcd_impl_HD44780.h index 0331af681..0d011e30f 100644 --- a/Marlin/src/lcd/ultralcd_impl_HD44780.h +++ b/Marlin/src/lcd/ultralcd_impl_HD44780.h @@ -52,6 +52,8 @@ #endif #endif +#include + extern volatile uint8_t buttons; //an extended version of the last checked buttons in a bit array. //////////////////////////////////// @@ -1326,18 +1328,18 @@ static void lcd_implementation_status_screen() { } clear_custom_char(&new_char); - new_char.custom_char_bits[0] = 0B11111U; // char #0 is used for the top line of the box + new_char.custom_char_bits[0] = 0b11111U; // char #0 is used for the top line of the box lcd.createChar(0, (uint8_t*)&new_char); clear_custom_char(&new_char); k = (GRID_MAX_POINTS_Y) * pixels_per_y_mesh_pnt + 1; // row of pixels for the bottom box line l = k % (ULTRA_Y_PIXELS_PER_CHAR); // row within relevant character cell - new_char.custom_char_bits[l] = 0B11111U; // char #1 is used for the bottom line of the box + new_char.custom_char_bits[l] = 0b11111U; // char #1 is used for the bottom line of the box lcd.createChar(1, (uint8_t*)&new_char); clear_custom_char(&new_char); for (j = 0; j < ULTRA_Y_PIXELS_PER_CHAR; j++) - new_char.custom_char_bits[j] = 0B10000U; // char #2 is used for the left edge of the box + new_char.custom_char_bits[j] = 0b10000U; // char #2 is used for the left edge of the box lcd.createChar(2, (uint8_t*)&new_char); clear_custom_char(&new_char);