SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make sure binary.h is included as needed

Browse source
This commit is contained in:
Scott Lahteine 2018-02-01 04:12:45 -06:00
parent 6e3519abae
commit 6339b506c0
4 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/I2CPositionEncoder.cpp
View file

@ -37,7 +37,7 @@
#include "../module/temperature.h" #include "../module/temperature.h"
#include "../module/stepper.h" #include "../module/stepper.h"
#include "../gcode/parser.h" #include "../gcode/parser.h"
#include "binary.h" #include <binary.h>
#include <Wire.h> #include <Wire.h>

22
Marlin/src/feature/dac/dac_mcp4728.h
View file

@ -31,17 +31,17 @@
#define defaultVDD DAC_STEPPER_MAX //was 5000 but differs with internal Vref #define defaultVDD DAC_STEPPER_MAX //was 5000 but differs with internal Vref
#define BASE_ADDR 0x60 #define BASE_ADDR 0x60
#define RESET 0B00000110 #define RESET 0b00000110
#define WAKE 0B00001001 #define WAKE 0b00001001
#define UPDATE 0B00001000 #define UPDATE 0b00001000
#define MULTIWRITE 0B01000000 #define MULTIWRITE 0b01000000
#define SINGLEWRITE 0B01011000 #define SINGLEWRITE 0b01011000
#define SEQWRITE 0B01010000 #define SEQWRITE 0b01010000
#define VREFWRITE 0B10000000 #define VREFWRITE 0b10000000
#define GAINWRITE 0B11000000 #define GAINWRITE 0b11000000
#define POWERDOWNWRITE 0B10100000 #define POWERDOWNWRITE 0b10100000
#define GENERALCALL 0B00000000 #define GENERALCALL 0b00000000
#define GAINWRITE 0B11000000 #define GAINWRITE 0b11000000
// This is taken from the original lib, makes it easy to edit if needed // This is taken from the original lib, makes it easy to edit if needed
// DAC_OR_ADDRESS defined in pins_BOARD.h file // DAC_OR_ADDRESS defined in pins_BOARD.h file

2
Marlin/src/lcd/dogm/dogm_bitmaps.h
View file

@ -32,6 +32,8 @@
* Please note that using the high-res version takes 402Bytes of PROGMEM. * Please note that using the high-res version takes 402Bytes of PROGMEM.
*/ */
#include <binary.h>
//#define START_BMPHIGH //#define START_BMPHIGH
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)

8
Marlin/src/lcd/ultralcd_impl_HD44780.h
View file

@ -52,6 +52,8 @@
#endif #endif
#endif #endif
#include <binary.h>
extern volatile uint8_t buttons; //an extended version of the last checked buttons in a bit array. 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); 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); lcd.createChar(0, (uint8_t*)&new_char);
clear_custom_char(&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 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 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); lcd.createChar(1, (uint8_t*)&new_char);
clear_custom_char(&new_char); clear_custom_char(&new_char);
for (j = 0; j < ULTRA_Y_PIXELS_PER_CHAR; j++) 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); lcd.createChar(2, (uint8_t*)&new_char);
clear_custom_char(&new_char); clear_custom_char(&new_char);