Browse Source

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

Tim Moore 5 years ago
parent
commit
77f637763c

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

@@ -688,7 +688,7 @@ void idle(
688 688
     print_job_timer.tick();
689 689
   #endif
690 690
 
691
-  #if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER)
691
+  #if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER) && DISABLED(PCA9632_BUZZER)
692 692
     buzzer.tick();
693 693
   #endif
694 694
 

+ 5
- 0
Marlin/src/libs/buzzer.h View File

@@ -27,6 +27,11 @@
27 27
 
28 28
   #define BUZZ(d,f) ui.buzz(d,f)
29 29
 
30
+#elif ENABLED(PCA9632_BUZZER)
31
+
32
+  #include "../feature/leds/pca9632.h"
33
+  #define BUZZ(d, f) pca9632_buzz(d,f)
34
+
30 35
 #elif PIN_EXISTS(BEEPER)
31 36
 
32 37
   #include "circularqueue.h"

+ 3
- 0
Marlin/src/module/temperature.cpp View File

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

+ 5
- 1
Marlin/src/module/temperature.h View File

@@ -268,7 +268,11 @@ class Temperature {
268 268
 
269 269
     static volatile bool in_temp_isr;
270 270
 
271
-    static hotend_info_t temp_hotend[HOTENDS];
271
+    static hotend_info_t temp_hotend[HOTENDS
272
+      #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
273
+        + 1
274
+      #endif
275
+    ];
272 276
 
273 277
     #if HAS_HEATED_BED
274 278
       static bed_info_t temp_bed;

+ 2335
- 0
config/examples/delta/Dreammaker/Overlord/Configuration.h
File diff suppressed because it is too large
View File


+ 2564
- 0
config/examples/delta/Dreammaker/Overlord/Configuration_adv.h
File diff suppressed because it is too large
View File


+ 35
- 0
config/examples/delta/Dreammaker/Overlord/_Bootscreen.h View File

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

+ 2346
- 0
config/examples/delta/Dreammaker/Overlord_Pro/Configuration.h
File diff suppressed because it is too large
View File


+ 2564
- 0
config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h
File diff suppressed because it is too large
View File


+ 35
- 0
config/examples/delta/Dreammaker/Overlord_Pro/_Bootscreen.h View File

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

Loading…
Cancel
Save