Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix parentheses in macros, and in general clean up quantum.h #5021

Merged
merged 14 commits into from
Jul 9, 2019
Merged

Fix parentheses in macros, and in general clean up quantum.h #5021

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2762e7b
Fix up GPIO macros
vomindoraan Jan 31, 2019
fd56d76
Fix up send string macros
vomindoraan Jan 31, 2019
7936c00
Fix up miscellaneous macros
vomindoraan Jan 31, 2019
d027f37
Make indentation uniform (4 spaces)
vomindoraan Jan 31, 2019
bd5bbc3
Make #ifdef vs #if defined usage consistent
vomindoraan Jan 31, 2019
8987f72
Reorder standard includes
vomindoraan Jan 31, 2019
8f17065
Merge branch 'master' into quantum_macros_fixup
vomindoraan Feb 11, 2019
74986fc
Merge branch 'master' into quantum_macros_fixup
vomindoraan Feb 22, 2019
fd193bc
Revert indentation changes as per review comments
vomindoraan Mar 19, 2019
798a426
Revert #if defined(__AVR__) → #ifdef __AVR__ change
vomindoraan Mar 29, 2019
ffd3162
Merge branch 'master' into quantum_macros_fixup
vomindoraan May 3, 2019
6e9d357
Change 2 space indent to 4 spaces on a couple of lines
vomindoraan May 3, 2019
da12c81
Merge branch 'master' into quantum_macros_fixup
vomindoraan Jul 9, 2019
ffb7b62
Replace include guard with #pragma once
vomindoraan Jul 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert #if defined(__AVR__) → #ifdef __AVR__ change
  • Loading branch information
@vomindoraan
vomindoraan committed Mar 29, 2019
commit 798a4265fcd35812233f5eea08202ad54c19ed49
4 changes: 2 additions & 2 deletions quantum/quantum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
#ifndef QUANTUM_H
#define QUANTUM_H

#ifdef __AVR__
#if defined(__AVR__)
#include <avr/pgmspace.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#ifdef PROTOCOL_CHIBIOS
#if defined(PROTOCOL_CHIBIOS)
#include "hal.h"
#endif

Expand Down