Browse Source

Make sure binary.h is included as needed

Scott Lahteine 6 years ago
parent
commit
6339b506c0

+ 1
- 1
Marlin/src/feature/I2CPositionEncoder.cpp View File

37
 #include "../module/temperature.h"
37
 #include "../module/temperature.h"
38
 #include "../module/stepper.h"
38
 #include "../module/stepper.h"
39
 #include "../gcode/parser.h"
39
 #include "../gcode/parser.h"
40
-#include "binary.h"
40
+#include <binary.h>
41
 
41
 
42
 #include <Wire.h>
42
 #include <Wire.h>
43
 
43
 

+ 11
- 11
Marlin/src/feature/dac/dac_mcp4728.h View File

31
 
31
 
32
 #define defaultVDD     DAC_STEPPER_MAX //was 5000 but differs with internal Vref
32
 #define defaultVDD     DAC_STEPPER_MAX //was 5000 but differs with internal Vref
33
 #define BASE_ADDR      0x60
33
 #define BASE_ADDR      0x60
34
-#define RESET          0B00000110
35
-#define WAKE           0B00001001
36
-#define UPDATE         0B00001000
37
-#define MULTIWRITE     0B01000000
38
-#define SINGLEWRITE    0B01011000
39
-#define SEQWRITE       0B01010000
40
-#define VREFWRITE      0B10000000
41
-#define GAINWRITE      0B11000000
42
-#define POWERDOWNWRITE 0B10100000
43
-#define GENERALCALL    0B00000000
44
-#define GAINWRITE      0B11000000
34
+#define RESET          0b00000110
35
+#define WAKE           0b00001001
36
+#define UPDATE         0b00001000
37
+#define MULTIWRITE     0b01000000
38
+#define SINGLEWRITE    0b01011000
39
+#define SEQWRITE       0b01010000
40
+#define VREFWRITE      0b10000000
41
+#define GAINWRITE      0b11000000
42
+#define POWERDOWNWRITE 0b10100000
43
+#define GENERALCALL    0b00000000
44
+#define GAINWRITE      0b11000000
45
 
45
 
46
 // This is taken from the original lib, makes it easy to edit if needed
46
 // This is taken from the original lib, makes it easy to edit if needed
47
 // DAC_OR_ADDRESS defined in pins_BOARD.h  file
47
 // DAC_OR_ADDRESS defined in pins_BOARD.h  file

+ 2
- 0
Marlin/src/lcd/dogm/dogm_bitmaps.h View File

32
  * Please note that using the high-res version takes 402Bytes of PROGMEM.
32
  * Please note that using the high-res version takes 402Bytes of PROGMEM.
33
  */
33
  */
34
 
34
 
35
+#include <binary.h>
36
+
35
 //#define START_BMPHIGH
37
 //#define START_BMPHIGH
36
 
38
 
37
 #if ENABLED(SHOW_BOOTSCREEN)
39
 #if ENABLED(SHOW_BOOTSCREEN)

+ 5
- 3
Marlin/src/lcd/ultralcd_impl_HD44780.h View File

52
   #endif
52
   #endif
53
 #endif
53
 #endif
54
 
54
 
55
+#include <binary.h>
56
+
55
 extern volatile uint8_t buttons;  //an extended version of the last checked buttons in a bit array.
57
 extern volatile uint8_t buttons;  //an extended version of the last checked buttons in a bit array.
56
 
58
 
57
 ////////////////////////////////////
59
 ////////////////////////////////////
1326
         }
1328
         }
1327
 
1329
 
1328
         clear_custom_char(&new_char);
1330
         clear_custom_char(&new_char);
1329
-        new_char.custom_char_bits[0] = 0B11111U;              // char #0 is used for the top line of the box
1331
+        new_char.custom_char_bits[0] = 0b11111U;              // char #0 is used for the top line of the box
1330
         lcd.createChar(0, (uint8_t*)&new_char);
1332
         lcd.createChar(0, (uint8_t*)&new_char);
1331
 
1333
 
1332
         clear_custom_char(&new_char);
1334
         clear_custom_char(&new_char);
1333
         k = (GRID_MAX_POINTS_Y) * pixels_per_y_mesh_pnt + 1;  // row of pixels for the bottom box line
1335
         k = (GRID_MAX_POINTS_Y) * pixels_per_y_mesh_pnt + 1;  // row of pixels for the bottom box line
1334
         l = k % (ULTRA_Y_PIXELS_PER_CHAR);                    // row within relevant character cell
1336
         l = k % (ULTRA_Y_PIXELS_PER_CHAR);                    // row within relevant character cell
1335
-        new_char.custom_char_bits[l] = 0B11111U;              // char #1 is used for the bottom line of the box
1337
+        new_char.custom_char_bits[l] = 0b11111U;              // char #1 is used for the bottom line of the box
1336
         lcd.createChar(1, (uint8_t*)&new_char);
1338
         lcd.createChar(1, (uint8_t*)&new_char);
1337
 
1339
 
1338
         clear_custom_char(&new_char);
1340
         clear_custom_char(&new_char);
1339
         for (j = 0; j < ULTRA_Y_PIXELS_PER_CHAR; j++)
1341
         for (j = 0; j < ULTRA_Y_PIXELS_PER_CHAR; j++)
1340
-          new_char.custom_char_bits[j] = 0B10000U;            // char #2 is used for the left edge of the box
1342
+          new_char.custom_char_bits[j] = 0b10000U;            // char #2 is used for the left edge of the box
1341
         lcd.createChar(2, (uint8_t*)&new_char);
1343
         lcd.createChar(2, (uint8_t*)&new_char);
1342
 
1344
 
1343
         clear_custom_char(&new_char);
1345
         clear_custom_char(&new_char);

Loading…
Cancel
Save