Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

micropython
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

33bdd211

Commit 33bdd211 authored 11 years ago by Damien George

Downloads
- Plain Diff

Merge branch 'master' of github.com:micropython/micropython

Conflicts:
	stmhal/main.c

parents b30c02af deb413e8

No related branches found

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

stmhal/hal/src/stm32f4xx_hal.c 7 additions, 5 deletions

stmhal/hal/src/stm32f4xx_hal.c
stmhal/main.c 12 additions, 13 deletions

stmhal/main.c
stmhal/pybmodule.c 1 addition, 1 deletion

stmhal/pybmodule.c
stmhal/pyexec.c 2 additions, 2 deletions

stmhal/pyexec.c
stmhal/systick.c 8 additions, 40 deletions

stmhal/systick.c
stmhal/systick.h 0 additions, 3 deletions

stmhal/systick.h

with 30 additions and 64 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment