Skip to content

Commit a0ec46a

Browse files
MagoKimbraMagoKimbra
committed
Same fix
1 parent e74013a commit a0ec46a

File tree

13 files changed

+163
-135
lines changed

13 files changed

+163
-135
lines changed

‎MarlinKimbra4due/Configuration.h‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "boards.h"
55
#include "macros.h"
6+
#include "Default_Version.h"
67

78
//===========================================================================
89
//============================= Getting Started =============================
@@ -28,11 +29,10 @@
2829
// User-specified version info of this build to display in [Pronterface, etc] terminal window during
2930
// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
3031
// build by the user have been successfully uploaded into firmware.
31-
#define BUILD_VERSION "4.1.4 dev"
32-
#define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__ // build date and time
3332
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
34-
#define STRING_SPLASH_LINE1 "v" BUILD_VERSION // will be shown during bootup in line 1
35-
#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
33+
#define SHOW_BOOTSCREEN
34+
#define STRING_SPLASH_LINE1 "v" SHORT_BUILD_VERSION // will be shown during bootup in line 1
35+
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
3636

3737
// SERIAL_PORT selects which serial port should be used for communication with the host.
3838
// This allows the connection of wireless adapters (for instance) to non-default port pins.
@@ -43,8 +43,8 @@
4343
// 115200 - 250000 - 256000 - 460800 - 500000
4444
#define BAUDRATE 115200
4545

46-
// This enables the serial port associated to the Bluetooth interface on AT90USB devices
47-
//#define BTENABLED
46+
// Enable the Bluetooth serial interface on AT90USB devices
47+
//#define BLUETOOTH
4848

4949
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
5050
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
@@ -63,6 +63,13 @@
6363
//#define SCARA
6464
/***********************************************************************\
6565
66+
/***********************************************************************\
67+
************************ CORE X (YZ) MOLTIPLICATOR ********************
68+
***********************************************************************/
69+
// This define the moltiplicator axis from X to Y or Z in COREXY or
70+
// COREXZ. Normally is equal 1.
71+
#define COREX_MOLTIPLICATOR 1
72+
6673
/***********************************************************************\
6774
********************** Do not touch this section **********************
6875
***********************************************************************/

‎MarlinKimbra4due/Default_Version.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
* This file is a placeholder for a file which could be distributed in an archive
3+
* It takes the place of an automatically created "_Version.h" which is generated during the build process
4+
*/
5+
6+
// #error "You must specify the following parameters related to your distribution"
7+
8+
#if true
9+
#define SHORT_BUILD_VERSION "4.1.4 dev"
10+
#define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__ // build date and time
11+
// It might also be appropriate to define a location where additional information can be found
12+
#define SOURCE_CODE_URL "https://github.com/MagoKimbra/MarlinKimbra"
13+
#endif

‎MarlinKimbra4due/Marlin_main.cpp‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -747,9 +747,6 @@ void setup() {
747747
Config_RetrieveSettings();
748748

749749
lcd_init();
750-
#if DISABLED(NEXTION)
751-
delay(SPLASH_SCREEN_DURATION); // wait to display the splash screen
752-
#endif
753750

754751
tp_init(); // Initialize temperature loop
755752
plan_init(); // Initialize planner;
@@ -767,7 +764,7 @@ void setup() {
767764
enableStepperDrivers();
768765
#endif
769766

770-
#ifdef DIGIPOT_I2C
767+
#if ENABLED(DIGIPOT_I2C)
771768
digipot_i2c_init();
772769
#endif
773770

@@ -1497,6 +1494,15 @@ static void clean_up_after_endstop_move() {
14971494

14981495
return measured_z;
14991496
}
1497+
1498+
#if HAS_SERVO_ENDSTOPS && DISABLED(Z_PROBE_SLED)
1499+
void raise_z_for_servo() {
1500+
float zpos = current_position[Z_AXIS], z_dest = Z_RAISE_BEFORE_PROBING;
1501+
z_dest += axis_known_position[Z_AXIS] ? zprobe_zoffset : zpos;
1502+
if (zpos < z_dest) do_blocking_move_to_z(z_dest); // also updates current_position
1503+
}
1504+
#endif
1505+
15001506
#endif //AUTO_BED_LEVELING_FEATURE
15011507

15021508
static void homeaxis(AxisEnum axis) {
@@ -3778,10 +3784,17 @@ inline void gcode_G28() {
37783784
}
37793785

37803786
#if DISABLED(Z_PROBE_SLED)
3787+
/**
3788+
* G30: Do a single Z probe at the current XY
3789+
*/
37813790
inline void gcode_G30() {
3791+
#if HAS_SERVO_ENDSTOPS
3792+
raise_z_for_servo();
3793+
#endif
37823794
deploy_z_probe(); // Engage Z Servo endstop if available
3795+
37833796
st_synchronize();
3784-
// TODO: make sure the bed_level_rotation_matrix is identity or the planner will get set incorectly
3797+
// TODO: clear the leveling matrix or the planner will be set incorrectly
37853798
setup_for_endstop_move();
37863799

37873800
feedrate = homing_feedrate[Z_AXIS];
@@ -3793,6 +3806,11 @@ inline void gcode_G28() {
37933806
ECHO_EMV(" Z: ", current_position[Z_AXIS] + 0.0001);
37943807

37953808
clean_up_after_endstop_move();
3809+
3810+
#if HAS_SERVO_ENDSTOPS
3811+
raise_z_for_servo();
3812+
#endif
3813+
37963814
stow_z_probe(); // Retract Z Servo endstop if available
37973815
}
37983816
#endif // !Z_PROBE_SLED
@@ -5756,21 +5774,13 @@ inline void gcode_M226() {
57565774
*/
57575775
inline void gcode_M400() { st_synchronize(); }
57585776

5759-
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && DISABLED(Z_PROBE_SLED) && SERVO_LEVELING
5760-
5761-
#if SERVO_LEVELING
5762-
void raise_z_for_servo() {
5763-
float zpos = current_position[Z_AXIS], z_dest = Z_RAISE_BEFORE_HOMING;
5764-
z_dest += axis_known_position[Z_AXIS] ? zprobe_zoffset : zpos;
5765-
if (zpos < z_dest) do_blocking_move_to_z(z_dest); // also updates current_position
5766-
}
5767-
#endif
5777+
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && DISABLED(Z_PROBE_SLED) && HAS_SERVO_ENDSTOPS
57685778

57695779
/**
57705780
* M401: Engage Z Servo endstop if available
57715781
*/
57725782
inline void gcode_M401() {
5773-
#if SERVO_LEVELING
5783+
#if HAS_SERVO_ENDSTOPS
57745784
raise_z_for_servo();
57755785
#endif
57765786
deploy_z_probe();
@@ -5780,13 +5790,13 @@ inline void gcode_M400() { st_synchronize(); }
57805790
* M402: Retract Z Servo endstop if enabled
57815791
*/
57825792
inline void gcode_M402() {
5783-
#if SERVO_LEVELING
5793+
#if HAS_SERVO_ENDSTOPS
57845794
raise_z_for_servo();
57855795
#endif
57865796
stow_z_probe(false);
57875797
}
57885798

5789-
#endif
5799+
#endif // AUTO_BED_LEVELING_FEATURE && (HAS_SERVO_ENDSTOPS && !Z_PROBE_SLED)
57905800

57915801
#ifdef FILAMENT_SENSOR
57925802

‎MarlinKimbra4due/SdBaseFile.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ bool SdBaseFile::getFilename(char* name) {
294294
return true;
295295
}
296296
//------------------------------------------------------------------------------
297-
void SdBaseFile::getpos(fpos_t* pos) {
297+
void SdBaseFile::getpos(FatPos_t* pos) {
298298
pos->position = curPosition_;
299299
pos->cluster = curCluster_;
300300
}
@@ -936,7 +936,7 @@ bool SdBaseFile::openRoot(SdVolume* vol) {
936936
* \return The byte if no error and not at eof else -1;
937937
*/
938938
int SdBaseFile::peek() {
939-
fpos_t pos;
939+
FatPos_t pos;
940940
getpos(&pos);
941941
int c = read();
942942
if (c >= 0) setpos(&pos);
@@ -1492,7 +1492,7 @@ bool SdBaseFile::seekSet(uint32_t pos) {
14921492
return false;
14931493
}
14941494
//------------------------------------------------------------------------------
1495-
void SdBaseFile::setpos(fpos_t* pos) {
1495+
void SdBaseFile::setpos(FatPos_t* pos) {
14961496
curPosition_ = pos->position;
14971497
curCluster_ = pos->cluster;
14981498
}

‎MarlinKimbra4due/SdBaseFile.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
#include "SdVolume.h"
3232
//------------------------------------------------------------------------------
3333
/**
34-
* \struct fpos_t
34+
* \struct FatPos_t
3535
* \brief internal type for istream
3636
* do not use in user apps
3737
*/
38-
struct fpos_t {
38+
struct FatPos_t {
3939
/** stream position */
4040
uint32_t position;
4141
/** cluster for position */
4242
uint32_t cluster;
43-
fpos_t() : position(0), cluster(0) {}
43+
FatPos_t() : position(0), cluster(0) {}
4444
};
4545

4646
// use the gnu style oflag in open()
@@ -196,11 +196,11 @@ class SdBaseFile {
196196
/** get position for streams
197197
* \param[out] pos struct to receive position
198198
*/
199-
void getpos(fpos_t* pos);
199+
void getpos(FatPos_t* pos);
200200
/** set position for streams
201201
* \param[out] pos struct with value for new position
202202
*/
203-
void setpos(fpos_t* pos);
203+
void setpos(FatPos_t* pos);
204204
//----------------------------------------------------------------------------
205205
bool close();
206206
bool contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock);

‎MarlinKimbra4due/comunication.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525

2626
#include "WString.h"
2727

28-
#ifdef AT90USB
29-
#ifdef BTENABLED
30-
#define MYSERIAL bt
28+
#ifdef USBCON
29+
#if ENABLED(BLUETOOTH)
30+
#define MYSERIAL bluetoothSerial
3131
#else
3232
#define MYSERIAL Serial
33-
#endif // BTENABLED
33+
#endif // BLUETOOTH
3434
#else
3535
#ifdef __SAM3X8E__
3636
#define MYSERIAL Serial
3737
#else
38-
#define MYSERIAL MSerial
38+
#define MYSERIAL customizedSerial
3939
#endif
4040
#endif
4141

‎MarlinKimbra4due/conditionals.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,6 @@
223223
#undef HAS_LCD_CONTRAST
224224
#endif
225225
#endif
226-
227-
/**
228-
* SPLASH_SCREEN_DURATION for no DOGLCD display
229-
*/
230-
#if DISABLED(DOGLCD)
231-
#undef SPLASH_SCREEN_DURATION
232-
#define SPLASH_SCREEN_DURATION 500
233-
#endif
234226

235227
#else // CONFIGURATION_LCD
236228
#define CONDITIONALS_H

‎MarlinKimbra4due/dogm_bitmaps.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,32 @@
33
// Please note that using the high-res version takes 402Bytes of PROGMEM.
44
#define START_BMPHIGH
55

6-
#if ENABLED(START_BMPHIGH)
7-
#define START_BMPWIDTH 128
8-
#define START_BMPHEIGHT 64
9-
#define START_BMPBYTEWIDTH 16
10-
#define START_BMPBYTES 1024 // START_BMPWIDTH * START_BMPHEIGHT / 8
6+
#if ENABLED(SHOW_BOOTSCREEN)
7+
#if ENABLED(START_BMPHIGH)
8+
#define START_BMPWIDTH 128
9+
#define START_BMPHEIGHT 64
10+
#define START_BMPBYTEWIDTH 16
11+
#define START_BMPBYTES 1024 // START_BMPWIDTH * START_BMPHEIGHT / 8
12+
13+
const unsigned char start_bmp[START_BMPBYTES] PROGMEM = {
14+
0x3,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xc0,0xf,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf0,0x1e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x78,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c,0x70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe,0x60,0x0,0x0,0x0,0x0,0x30,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x6,0xe0,0x1f,0x7c,0x0,0x0,0x33,0x0,0x0,0x0,0x0,0x1,0x80,0x3,0x87,0xc0,0x3f,0xfe,0x0,0x0,0x33,0x0,0x0,0x0,0x0,0x1,0xc0,0x2,0x83,
15+
0xc0,0x73,0xce,0x0,0x0,0x30,0x0,0x0,0x0,0x0,0x3,0xc0,0x3,0x83,0xc0,0xf3,0xce,0x3c,0xf,0x33,0xf,0x0,0x0,0x0,0x3,0xc0,0x2,0x83,0xc0,0xe3,0x8e,0x7e,0x1f,0xb3,0x1f,0x80,0x0,0x0,0x1f,0xe0,0x0,0x3,0xc0,0xe3,0x8e,0xe7,0x39,0xb3,0x39,0xc0,0x0,0x0,0xff,0xfc,0x3,0x83,0xc0,0xe3,0x8e,0xc3,0x31,0xb3,0x38,0xc0,0x0,0x0,0x3f,0xff,0x2,0x3,0xc0,0xe3,0x8e,0xc3,0x30,0x33,0x38,0xc0,0x0,0x0,0x7,0xf0,0x2,0x3,0xc0,0xe3,0x8e,0xe3,0x30,0x33,0x38,0xc0,0x0,0x1,0x7,0xf0,0x3,0x83,0xc0,0xe3,0x8e,0xfb,0xf0,0x3f,0xf8,0xc0,0x0,0x3,0x83,0xf0,0x0,0x3,
16+
0xc0,0x63,0x8e,0x7b,0xf0,0x1f,0xf8,0xc0,0x0,0x7,0xc1,0xf8,0x0,0x3,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x9f,0xfe,0x0,0x3,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff,0xff,0x80,0x43,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f,0xff,0xf8,0xc3,0xf0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x33,0xff,0xff,0xc3,0xf8,0x0,0x0,0x30,0xf0,0x0,0x3,0x0,0x0,0x0,0x19,0xff,0xff,0x83,0xfc,0x0,0x0,0x71,0xe6,0x0,0x3,0x0,0x0,0x0,0xc,0x7f,0xff,0x3,0xfe,0x0,0x0,0x73,0xc6,0x0,0x3,0x0,0x0,0x0,0x6,0x7f,0xff,0x3,
17+
0xff,0x0,0x0,0x77,0x80,0x0,0x3,0x0,0x0,0x0,0x3,0x3f,0xfe,0x3,0xff,0x80,0x0,0x7f,0x6,0x7f,0xe3,0xf0,0xf0,0xf0,0x1,0x9f,0xfc,0x3,0xff,0xc0,0x0,0x7e,0x6,0xff,0xf3,0xf9,0xf9,0xf8,0x0,0xcf,0xf8,0x3,0xff,0xe0,0x0,0x7c,0x6,0xe7,0x33,0x9b,0x9b,0x9c,0x0,0x67,0xf0,0x3,0xff,0xf0,0x0,0x7e,0x6,0xe3,0x1b,0x1b,0x1b,0xc,0x0,0x33,0xc0,0x3,0xff,0xf8,0x0,0x7f,0x6,0xe3,0x1b,0x1b,0x3,0xc,0x0,0x19,0x0,0x3,0xff,0xfc,0x0,0x73,0x86,0xe3,0x1b,0x3b,0x3,0x8c,0x0,0xc,0x0,0x3,0xff,0xfe,0x0,0x71,0xc6,0xe3,0x1b,0xf3,0x3,0xef,0x0,0x6,0x0,0x7,
18+
0xff,0xff,0x0,0x30,0xe6,0x63,0x19,0xe3,0x1,0xef,0x0,0x2,0x0,0x6,0xff,0xff,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe,0xff,0xff,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c,0xff,0xff,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x78,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xc0
19+
};
20+
#else
21+
#define START_BMPWIDTH 56
22+
#define START_BMPHEIGHT 19
23+
#define START_BMPBYTEWIDTH 7
24+
#define START_BMPBYTES 133 // START_BMPWIDTH * START_BMPHEIGHT / 8
1125

12-
const unsigned char start_bmp[START_BMPBYTES] PROGMEM = {
13-
0x3,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xc0,0xf,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf0,0x1e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x78,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c,0x70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe,0x60,0x0,0x0,0x0,0x0,0x30,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x6,0xe0,0x1f,0x7c,0x0,0x0,0x33,0x0,0x0,0x0,0x0,0x1,0x80,0x3,0x87,0xc0,0x3f,0xfe,0x0,0x0,0x33,0x0,0x0,0x0,0x0,0x1,0xc0,0x2,0x83,
14-
0xc0,0x73,0xce,0x0,0x0,0x30,0x0,0x0,0x0,0x0,0x3,0xc0,0x3,0x83,0xc0,0xf3,0xce,0x3c,0xf,0x33,0xf,0x0,0x0,0x0,0x3,0xc0,0x2,0x83,0xc0,0xe3,0x8e,0x7e,0x1f,0xb3,0x1f,0x80,0x0,0x0,0x1f,0xe0,0x0,0x3,0xc0,0xe3,0x8e,0xe7,0x39,0xb3,0x39,0xc0,0x0,0x0,0xff,0xfc,0x3,0x83,0xc0,0xe3,0x8e,0xc3,0x31,0xb3,0x38,0xc0,0x0,0x0,0x3f,0xff,0x2,0x3,0xc0,0xe3,0x8e,0xc3,0x30,0x33,0x38,0xc0,0x0,0x0,0x7,0xf0,0x2,0x3,0xc0,0xe3,0x8e,0xe3,0x30,0x33,0x38,0xc0,0x0,0x1,0x7,0xf0,0x3,0x83,0xc0,0xe3,0x8e,0xfb,0xf0,0x3f,0xf8,0xc0,0x0,0x3,0x83,0xf0,0x0,0x3,
15-
0xc0,0x63,0x8e,0x7b,0xf0,0x1f,0xf8,0xc0,0x0,0x7,0xc1,0xf8,0x0,0x3,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x9f,0xfe,0x0,0x3,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff,0xff,0x80,0x43,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f,0xff,0xf8,0xc3,0xf0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x33,0xff,0xff,0xc3,0xf8,0x0,0x0,0x30,0xf0,0x0,0x3,0x0,0x0,0x0,0x19,0xff,0xff,0x83,0xfc,0x0,0x0,0x71,0xe6,0x0,0x3,0x0,0x0,0x0,0xc,0x7f,0xff,0x3,0xfe,0x0,0x0,0x73,0xc6,0x0,0x3,0x0,0x0,0x0,0x6,0x7f,0xff,0x3,
16-
0xff,0x0,0x0,0x77,0x80,0x0,0x3,0x0,0x0,0x0,0x3,0x3f,0xfe,0x3,0xff,0x80,0x0,0x7f,0x6,0x7f,0xe3,0xf0,0xf0,0xf0,0x1,0x9f,0xfc,0x3,0xff,0xc0,0x0,0x7e,0x6,0xff,0xf3,0xf9,0xf9,0xf8,0x0,0xcf,0xf8,0x3,0xff,0xe0,0x0,0x7c,0x6,0xe7,0x33,0x9b,0x9b,0x9c,0x0,0x67,0xf0,0x3,0xff,0xf0,0x0,0x7e,0x6,0xe3,0x1b,0x1b,0x1b,0xc,0x0,0x33,0xc0,0x3,0xff,0xf8,0x0,0x7f,0x6,0xe3,0x1b,0x1b,0x3,0xc,0x0,0x19,0x0,0x3,0xff,0xfc,0x0,0x73,0x86,0xe3,0x1b,0x3b,0x3,0x8c,0x0,0xc,0x0,0x3,0xff,0xfe,0x0,0x71,0xc6,0xe3,0x1b,0xf3,0x3,0xef,0x0,0x6,0x0,0x7,
17-
0xff,0xff,0x0,0x30,0xe6,0x63,0x19,0xe3,0x1,0xef,0x0,0x2,0x0,0x6,0xff,0xff,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe,0xff,0xff,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c,0xff,0xff,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x78,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xc0
18-
};
19-
#else
20-
#define START_BMPWIDTH 56
21-
#define START_BMPHEIGHT 19
22-
#define START_BMPBYTEWIDTH 7
23-
#define START_BMPBYTES 133 // START_BMPWIDTH * START_BMPHEIGHT / 8
24-
25-
const unsigned char start_bmp[START_BMPBYTES] PROGMEM = {
26-
0x1f,0xff,0xff,0xff,0xff,0xff,0xfc,0x30,0x0,0x0,0x0,0x0,0x0,0x6,0x60,0x0,0x0,0x0,0x0,0x0,0x3,0xc3,0x60,0x5,0x0,0x0,0x8,0x1,0x84,0x90,0x4,0x0,0x0,0x18,0x1,0x84,0x97,0x75,0x70,0x0,0x3c,0x1,0x84,0x95,0x45,0x50,0x0,0x7f,0x1,0x84,0x95,0x45,0x50,0x0,0x1c,0x1,
27-
0x84,0x97,0xc5,0x50,0x1,0x8e,0x1,0x80,0x0,0x0,0x0,0x0,0xff,0x81,0xc0,0x0,0x0,0x10,0x0,0x5f,0xf9,0xe0,0x2,0xd0,0x10,0x0,0x27,0xf1,0xf0,0x3,0x80,0x10,0x0,0x17,0xf1,0xf8,0x3,0x17,0xde,0xee,0xb,0xe1,0xfc,0x3,0x15,0x52,0x8a,0x5,0x81,0xfe,0x3,0x95,0x52,0x8a,0x2,0x1,
28-
0xff,0x2,0xd5,0x5e,0x8f,0x1,0x1,0xff,0x80,0x0,0x0,0x0,0x0,0x3,0xff,0xff,0xff,0xff,0xff,0xff,0xfe
29-
};
26+
const unsigned char start_bmp[START_BMPBYTES] PROGMEM = {
27+
0x1f,0xff,0xff,0xff,0xff,0xff,0xfc,0x30,0x0,0x0,0x0,0x0,0x0,0x6,0x60,0x0,0x0,0x0,0x0,0x0,0x3,0xc3,0x60,0x5,0x0,0x0,0x8,0x1,0x84,0x90,0x4,0x0,0x0,0x18,0x1,0x84,0x97,0x75,0x70,0x0,0x3c,0x1,0x84,0x95,0x45,0x50,0x0,0x7f,0x1,0x84,0x95,0x45,0x50,0x0,0x1c,0x1,
28+
0x84,0x97,0xc5,0x50,0x1,0x8e,0x1,0x80,0x0,0x0,0x0,0x0,0xff,0x81,0xc0,0x0,0x0,0x10,0x0,0x5f,0xf9,0xe0,0x2,0xd0,0x10,0x0,0x27,0xf1,0xf0,0x3,0x80,0x10,0x0,0x17,0xf1,0xf8,0x3,0x17,0xde,0xee,0xb,0xe1,0xfc,0x3,0x15,0x52,0x8a,0x5,0x81,0xfe,0x3,0x95,0x52,0x8a,0x2,0x1,
29+
0xff,0x2,0xd5,0x5e,0x8f,0x1,0x1,0xff,0x80,0x0,0x0,0x0,0x0,0x3,0xff,0xff,0xff,0xff,0xff,0xff,0xfe
30+
};
31+
#endif
3032
#endif
3133

3234
// Here comes a compile-time operation to match the extruder symbols
@@ -186,5 +188,3 @@
186188
0x0C,0x00,0x00,0x06,0x00,0x00,0x06,0x00,0x01,0xFF,0xFF,0x80,0x00,0x00,0x00
187189
};
188190
#endif // Extruders
189-
190-

0 commit comments

Comments
 (0)