diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
| commit | 2e0f2025bd9f400dd8f5b0cad8ba80667193408d (patch) | |
| tree | 2e3d0fb98b20bdd4e39b4719abdffe4e29e242e9 /keyboards/cannonkeys | |
| parent | 416dea2c54c885a1d58d6924be6b346c8eb87f47 (diff) | |
| parent | 9366ed728280f4875ebbba9c0ef1eade03c96d35 (diff) | |
| download | qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.tar.gz qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/cannonkeys')
| -rw-r--r-- | keyboards/cannonkeys/bluepill/keyboard.c | 4 | ||||
| -rw-r--r-- | keyboards/cannonkeys/bluepill/ws2812.c | 2 | ||||
| -rw-r--r-- | keyboards/cannonkeys/satisfaction75/led.c | 3 | ||||
| -rw-r--r-- | keyboards/cannonkeys/satisfaction75/satisfaction75.c | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/cannonkeys/bluepill/keyboard.c b/keyboards/cannonkeys/bluepill/keyboard.c index c2e5946d45..6a8edd4a93 100644 --- a/keyboards/cannonkeys/bluepill/keyboard.c +++ b/keyboards/cannonkeys/bluepill/keyboard.c @@ -1,5 +1,5 @@ -#include "ch.h" -#include "hal.h" +#include <ch.h> +#include <hal.h> #include "util.h" #include "quantum.h" diff --git a/keyboards/cannonkeys/bluepill/ws2812.c b/keyboards/cannonkeys/bluepill/ws2812.c index d30806d564..779e905198 100644 --- a/keyboards/cannonkeys/bluepill/ws2812.c +++ b/keyboards/cannonkeys/bluepill/ws2812.c @@ -6,7 +6,7 @@ */ #include "ws2812.h" -#include "stdlib.h" +#include <stdlib.h> #define BYTES_FOR_LED_BYTE 4 #define NB_COLORS 3 diff --git a/keyboards/cannonkeys/satisfaction75/led.c b/keyboards/cannonkeys/satisfaction75/led.c index 3ddcec2028..18ef06acf8 100644 --- a/keyboards/cannonkeys/satisfaction75/led.c +++ b/keyboards/cannonkeys/satisfaction75/led.c @@ -15,10 +15,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "hal.h" +#include <hal.h> #include "led_custom.h" #include "satisfaction75.h" -#include "printf.h" static void breathing_callback(PWMDriver *pwmp); diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c index c0ea68669b..fd85b8230b 100644 --- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c +++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c @@ -2,8 +2,8 @@ #include "print.h" #include "debug.h" -#include "ch.h" -#include "hal.h" +#include <ch.h> +#include <hal.h> #ifdef QWIIC_MICRO_OLED_ENABLE #include "micro_oled.h" |