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.

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

Refactor quantum/split_common/i2c.c, quantum/split_common/serial.c #4522

Merged
merged 11 commits into from
Dec 15, 2018

Conversation

mtei
Copy link
Contributor

@mtei mtei commented Nov 30, 2018

Changed quantum/split_common/serial.o and quantum/split_common/i2c.o so that they are automatically selected when linking.

  • Enhance build_keyboard.mk, tmk_core/rules.mk.
    add LIB_SRC, QUANTUM_LIB_SRC support.
    Support compiled object enclosed in library.

  • Modify common_features.mk, quantum/split_common/i2c.c, quantum/split_common/serial.c.

    • Using QUANTUM_LIB_SRC, i2c.o and serial.o are stored in the library.
    • remove #if defined(USE_I2C) || defined(EH) from quantum/split_common/i2c.c
    • remove #ifndef USE_I2C from quantum/split_common/serial.c

#4254's "Support both I2C and Serial at the same time"

@mtei
Copy link
Contributor Author

mtei commented Dec 7, 2018

I posted this PR, but one week has passed without even knowing who will review it. I want someone to let me know what else to do.

@drashna
Copy link
Member

drashna commented Dec 14, 2018

Oh no!
@mtei looks like there is a merge conflict here, due to the other merge.

If you can resolve this, I'll merge it as soon as possible.

@drashna
Copy link
Member

drashna commented Dec 15, 2018

Awesome, thanks!

And closes #4650

@drashna drashna merged commit 8f79094 into qmk:master Dec 15, 2018
@mtei mtei deleted the refactor-split_common_i2c_serial branch December 25, 2018 09:31
ishtob pushed a commit to ishtob/qmk_firmware that referenced this pull request Jan 1, 2019
…mk#4522)

* add temporary compile test shell script

* Extended support of SKIP_VERSION to make invariant compile results during testing.

* build_keyboard.mk, tmk_core/rules.mk: add LIB_SRC, QUANTUM_LIB_SRC support

Support compiled object enclosed in library.

e.g.
```
LIB_SRC += xxxx.c
xxxx.c --> xxxx.o ---> xxxx.a
```

* remove 'ifdef/ifndef USE_I2C' from quantum/split_common/{i2c|serial}.c

* add SKIP_DEBUG_INFO into tmk_core/rules.mk

When SKIP_DEBUG_INFO=yes is specified, do not use the -g option at compile time.

* tmk_core/rules.mk: Library object need -fno-lto

* add SKIP_DEBUG_INFO=yes

* remove temporary compile test shell script

* add '#define SOFT_SERIAL_PIN D0' to keyboards/lets_split/rev?/config.h

* quantum/split_common/serial.c: Changed not to use USE_I2C.
yeliu84 pushed a commit to yeliu84/qmk_firmware that referenced this pull request Jan 7, 2019
…mk#4522)

* add temporary compile test shell script

* Extended support of SKIP_VERSION to make invariant compile results during testing.

* build_keyboard.mk, tmk_core/rules.mk: add LIB_SRC, QUANTUM_LIB_SRC support

Support compiled object enclosed in library.

e.g.
```
LIB_SRC += xxxx.c
xxxx.c --> xxxx.o ---> xxxx.a
```

* remove 'ifdef/ifndef USE_I2C' from quantum/split_common/{i2c|serial}.c

* add SKIP_DEBUG_INFO into tmk_core/rules.mk

When SKIP_DEBUG_INFO=yes is specified, do not use the -g option at compile time.

* tmk_core/rules.mk: Library object need -fno-lto

* add SKIP_DEBUG_INFO=yes

* remove temporary compile test shell script

* add '#define SOFT_SERIAL_PIN D0' to keyboards/lets_split/rev?/config.h

* quantum/split_common/serial.c: Changed not to use USE_I2C.
rseymour pushed a commit to rseymour/qmk_firmware that referenced this pull request Mar 13, 2019
…mk#4522)

* add temporary compile test shell script

* Extended support of SKIP_VERSION to make invariant compile results during testing.

* build_keyboard.mk, tmk_core/rules.mk: add LIB_SRC, QUANTUM_LIB_SRC support

Support compiled object enclosed in library.

e.g.
```
LIB_SRC += xxxx.c
xxxx.c --> xxxx.o ---> xxxx.a
```

* remove 'ifdef/ifndef USE_I2C' from quantum/split_common/{i2c|serial}.c

* add SKIP_DEBUG_INFO into tmk_core/rules.mk

When SKIP_DEBUG_INFO=yes is specified, do not use the -g option at compile time.

* tmk_core/rules.mk: Library object need -fno-lto

* add SKIP_DEBUG_INFO=yes

* remove temporary compile test shell script

* add '#define SOFT_SERIAL_PIN D0' to keyboards/lets_split/rev?/config.h

* quantum/split_common/serial.c: Changed not to use USE_I2C.
djthread pushed a commit to djthread/qmk_firmware that referenced this pull request Mar 17, 2019
…mk#4522)

* add temporary compile test shell script

* Extended support of SKIP_VERSION to make invariant compile results during testing.

* build_keyboard.mk, tmk_core/rules.mk: add LIB_SRC, QUANTUM_LIB_SRC support

Support compiled object enclosed in library.

e.g.
```
LIB_SRC += xxxx.c
xxxx.c --> xxxx.o ---> xxxx.a
```

* remove 'ifdef/ifndef USE_I2C' from quantum/split_common/{i2c|serial}.c

* add SKIP_DEBUG_INFO into tmk_core/rules.mk

When SKIP_DEBUG_INFO=yes is specified, do not use the -g option at compile time.

* tmk_core/rules.mk: Library object need -fno-lto

* add SKIP_DEBUG_INFO=yes

* remove temporary compile test shell script

* add '#define SOFT_SERIAL_PIN D0' to keyboards/lets_split/rev?/config.h

* quantum/split_common/serial.c: Changed not to use USE_I2C.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants