Browse Source

Overlord configs. Fix buzzer, redundant temp. (#14833)

pull/1/head
Tim Moore 5 years ago
committed by Scott Lahteine
parent
commit
77f637763c
  1. 2
      Marlin/src/Marlin.cpp
  2. 5
      Marlin/src/libs/buzzer.h
  3. 3
      Marlin/src/module/temperature.cpp
  4. 6
      Marlin/src/module/temperature.h
  5. 2335
      config/examples/delta/Dreammaker/Overlord/Configuration.h
  6. 2564
      config/examples/delta/Dreammaker/Overlord/Configuration_adv.h
  7. 35
      config/examples/delta/Dreammaker/Overlord/_Bootscreen.h
  8. 2346
      config/examples/delta/Dreammaker/Overlord_Pro/Configuration.h
  9. 2564
      config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h
  10. 35
      config/examples/delta/Dreammaker/Overlord_Pro/_Bootscreen.h

2
Marlin/src/Marlin.cpp

@ -688,7 +688,7 @@ void idle(
print_job_timer.tick();
#endif
#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER)
#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER) && DISABLED(PCA9632_BUZZER)
buzzer.tick();
#endif

5
Marlin/src/libs/buzzer.h

@ -27,6 +27,11 @@
#define BUZZ(d,f) ui.buzz(d,f)
#elif ENABLED(PCA9632_BUZZER)
#include "../feature/leds/pca9632.h"
#define BUZZ(d, f) pca9632_buzz(d,f)
#elif PIN_EXISTS(BEEPER)
#include "circularqueue.h"

3
Marlin/src/module/temperature.cpp

@ -2220,6 +2220,9 @@ void Temperature::readings_ready() {
#endif
HOTEND_LOOP() temp_hotend[e].acc = 0;
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
temp_hotend[1].acc = 0;
#endif
#if HAS_HEATED_BED
temp_bed.acc = 0;

6
Marlin/src/module/temperature.h

@ -268,7 +268,11 @@ class Temperature {
static volatile bool in_temp_isr;
static hotend_info_t temp_hotend[HOTENDS];
static hotend_info_t temp_hotend[HOTENDS
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
+ 1
#endif
];
#if HAS_HEATED_BED
static bed_info_t temp_bed;

2335
config/examples/delta/Dreammaker/Overlord/Configuration.h

File diff suppressed because it is too large

2564
config/examples/delta/Dreammaker/Overlord/Configuration_adv.h

File diff suppressed because it is too large

35
config/examples/delta/Dreammaker/Overlord/_Bootscreen.h

@ -0,0 +1,35 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#define CUSTOM_BOOTSCREEN_BMPWIDTH 80
const uint8_t custom_start_bmp[] PROGMEM = {
B00000011,B10000011,B00001101,B11111101,B11111000,B11000000,B00011100,B00011111,B10001111,B11000000,
B00011111,B11100011,B00001101,B11111101,B11111110,B11000000,B11111111,B00011111,B11001111,B11110000,
B00011100,B01100011,B00001101,B10000001,B10001110,B11000000,B11100011,B00011001,B11001100,B01110000,
B00011100,B01110011,B00001101,B10000001,B10001110,B11000000,B11100011,B10011000,B11001100,B00111000,
B00011000,B01110001,B10011001,B11111001,B10001110,B11000000,B11000011,B10011001,B11001100,B00011000,
B00011000,B01110001,B10011001,B11111001,B11111100,B11000000,B11000011,B10011111,B11001100,B00011000,
B00011000,B01110001,B11111001,B10000001,B11111000,B11000000,B11000011,B10011111,B10001100,B00111000,
B00011111,B11100000,B11110001,B11111101,B10001100,B11111100,B11111111,B00011001,B11001111,B11110000,
B00001111,B11000000,B11110001,B11111101,B10001100,B11111100,B01111110,B00011001,B11001111,B11100000,
B00000011,B10000000,B01100001,B11111101,B10001110,B11111100,B00011100,B00011000,B11001111,B11000000
};

2346
config/examples/delta/Dreammaker/Overlord_Pro/Configuration.h

File diff suppressed because it is too large

2564
config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h

File diff suppressed because it is too large

35
config/examples/delta/Dreammaker/Overlord_Pro/_Bootscreen.h

@ -0,0 +1,35 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#define CUSTOM_BOOTSCREEN_BMPWIDTH 80
const uint8_t custom_start_bmp[] PROGMEM = {
B00000011,B10000011,B00001101,B11111101,B11111000,B11000000,B00011100,B00011111,B10001111,B11000000,
B00011111,B11100011,B00001101,B11111101,B11111110,B11000000,B11111111,B00011111,B11001111,B11110000,
B00011100,B01100011,B00001101,B10000001,B10001110,B11000000,B11100011,B00011001,B11001100,B01110000,
B00011100,B01110011,B00001101,B10000001,B10001110,B11000000,B11100011,B10011000,B11001100,B00111000,
B00011000,B01110001,B10011001,B11111001,B10001110,B11000000,B11000011,B10011001,B11001100,B00011000,
B00011000,B01110001,B10011001,B11111001,B11111100,B11000000,B11000011,B10011111,B11001100,B00011000,
B00011000,B01110001,B11111001,B10000001,B11111000,B11000000,B11000011,B10011111,B10001100,B00111000,
B00011111,B11100000,B11110001,B11111101,B10001100,B11111100,B11111111,B00011001,B11001111,B11110000,
B00001111,B11000000,B11110001,B11111101,B10001100,B11111100,B01111110,B00011001,B11001111,B11100000,
B00000011,B10000000,B01100001,B11111101,B10001110,B11111100,B00011100,B00011000,B11001111,B11000000
};
Loading…
Cancel
Save