Skip to content

Commit 06c5c02

Browse files
authored
Disable specific warnings to mitigate compilation problems with KEEP_INTERMEDIATES=yes. (qmk#20339)
1 parent f1dbffe commit 06c5c02

File tree

7 files changed

+25
-6
lines changed

7 files changed

+25
-6
lines changed

keyboards/hazel/bad_wings/keymaps/default/config.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55

66
#define TAPPING_TERM 200
77
#define PERMISSIVE_HOLD
8-
#define IGNORE_MOD_TAP_INTERRUPT
98
#define TAPPING_FORCE_HOLD
109
#define TAPPING_TERM_PER_KEY
1110
#define ONESHOT_TAP_TOGGLE 10
1211
#define ONESHOT_TIMEOUT 500
1312
#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
1413
#define CIRQUE_PINNACLE_TAP_ENABLE
15-
#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE
16-
#define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE
14+
#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE
15+
#define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE

keyboards/mechlovin/mechlovin9/rev3/info.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"rows": ["B12", "B13", "B14", "B15", "A1"],
1717
"cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "C13", "B7", "B6", "B5", "B4", "B3"]
1818
},
19+
"diode_direction": "COL2ROW",
1920
"indicators": {
2021
"caps_lock": "B9"
2122
}

keyboards/splitkb/kyria/info.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@
99
"development_board": "elite_c",
1010
"split": {
1111
"enabled": true
12+
},
13+
"build": {
14+
"lto": true
1215
}
1316
}

platforms/avr/_wait.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
*/
1616
#pragma once
1717

18+
// Need to disable GCC's "maybe-uninitialized" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`.
19+
#pragma GCC diagnostic push
20+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
1821
#include <util/delay.h>
22+
#pragma GCC diagnostic pop
1923

2024
// http://ww1.microchip.com/downloads/en/devicedoc/atmel-0856-avr-instruction-set-manual.pdf
2125
// page 22: Table 4-2. Arithmetic and Logic Instructions

platforms/chibios/drivers/audio_dac_additive.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
#include <ch.h>
2020
#include <hal.h>
2121

22+
// Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
23+
#pragma GCC diagnostic push
24+
#pragma GCC diagnostic ignored "-Wtautological-compare"
25+
2226
/*
2327
Audio Driver: DAC
2428
@@ -335,3 +339,5 @@ void audio_driver_start(void) {
335339
active_tones_snapshot_length = 0;
336340
state = OUTPUT_SHOULD_START;
337341
}
342+
343+
#pragma GCC diagnostic pop

platforms/chibios/drivers/audio_dac_basic.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
#include "ch.h"
2020
#include "hal.h"
2121

22+
// Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
23+
#pragma GCC diagnostic push
24+
#pragma GCC diagnostic ignored "-Wtautological-compare"
25+
2226
/*
2327
Audio Driver: DAC
2428
@@ -247,3 +251,5 @@ void audio_driver_start(void) {
247251
}
248252
gptStartContinuous(&AUDIO_STATE_TIMER, 2U);
249253
}
254+
255+
#pragma GCC diagnostic pop

tmk_core/protocol/usb_hid/override_wiring.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* To keep Timer0 for common/timer.c override arduino/wiring.c.
33
*/
44
#define __DELAY_BACKWARD_COMPATIBLE__
5-
#include <util/delay.h>
5+
#include "wait.h"
66
#include "platforms/timer.h"
77

88

@@ -16,11 +16,11 @@ unsigned long micros(void)
1616
}
1717
void delay(unsigned long ms)
1818
{
19-
_delay_ms(ms);
19+
wait_ms(ms);
2020
}
2121
void delayMicroseconds(unsigned int us)
2222
{
23-
_delay_us(us);
23+
wait_us(us);
2424
}
2525
void init(void)
2626
{

0 commit comments

Comments
 (0)