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

Added support for ErgoDox with STM32 Microcontroller #5398

Merged
merged 25 commits into from
Sep 25, 2019
Merged

Added support for ErgoDox with STM32 Microcontroller #5398

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a392fb4
Began Work On STM32 Ergodox
Codetector1374 Jan 16, 2019
079fbc4
test
Codetector1374 Jan 17, 2019
304cd5b
Now it compile. Not linking thou
Codetector1374 Jan 17, 2019
c2b9529
Screw this Linker. It links now!
Codetector1374 Jan 17, 2019
06f9f2a
Blinkly Keyboard
Codetector1374 Jan 17, 2019
4927abe
bootloader test code
Codetector1374 Jan 18, 2019
23b445a
Working on matrix / i2c stuff
Codetector1374 Jan 23, 2019
3c5251f
Progress (LED Blink)
Codetector1374 Jan 24, 2019
0365c92
Progress on MCP_23017 Status Flag
Codetector1374 Jan 24, 2019
cf99732
[WIP]
Codetector1374 Jan 24, 2019
fd84782
update
Codetector1374 Jan 25, 2019
1f1f23c
Works! Remeber to change back the bootloader address when the new boo…
Codetector1374 Jan 26, 2019
ee657d7
Time to go debug the i2c
Codetector1374 Jan 26, 2019
ec07114
Finally, it now works with PCB Rev 1.0.2
Codetector1374 Jan 29, 2019
222e791
updated for rev.2 pcb
Codetector1374 Feb 23, 2019
082de2c
minor compilation fix
Codetector1374 Mar 13, 2019
4378d6c
Merge remote-tracking branch 'upstream/master' into ergodox_stm32
Codetector1374 Mar 13, 2019
224637b
Why when debugger is enabled then everything works.
Codetector1374 Mar 13, 2019
3438cad
Remeber to call init functions.
Codetector1374 Mar 13, 2019
35591b3
Update arm i2c driver to support STM32F103 series device.
Codetector1374 Mar 14, 2019
f7b501d
fix include once header. Replaced with #pragma once.
Codetector1374 Mar 14, 2019
86db0c2
Merge remote-tracking branch 'source/master' into ergodox_stm32
Codetector1374 Jul 9, 2019
c4ec830
complication test
Codetector1374 Jul 9, 2019
20ae9ce
Merge branch 'master' into ergodox_stm32
Codetector1374 Sep 21, 2019
6ef3d88
fix conflict and support for latest gcc
Codetector1374 Sep 23, 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
Merge branch 'master' into ergodox_stm32
  • Loading branch information
@Codetector1374
Codetector1374 authored Sep 21, 2019
commit 20ae9cea8606dac33944169d64d5303d78db9119
12 changes: 5 additions & 7 deletions drivers/arm/i2c_master.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,13 @@ __attribute__((weak)) void i2c_init(void) {
palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_INPUT);

chThdSleepMilliseconds(10);

#ifdef STM32F103xB
palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
#ifdef USE_I2CV1
palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_STM32_ALTERNATE_OPENDRAIN);
#else
palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);
palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);
palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_ALTERNATE(I2C1_SCL_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN);
palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_ALTERNATE(I2C1_SDA_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN);
#endif
//i2cInit(); //This is invoked by halInit() so no need to redo it.
}

i2c_status_t i2c_start(uint8_t address) {
Expand Down
1 change: 0 additions & 1 deletion tmk_core/protocol/chibios/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ void console_task(void);
// }
// }


/* Main thread
*/
int main(void) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.