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

Implement the FreeRTOS git repo as a submodule #26

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "libopencm3"]
path = libopencm3
url = https://github.com/libopencm3/libopencm3.git

[submodule "stlink"]
path = stlink
url = https://github.com/ve3wwg/stlink.git
[submodule "libopencm3"]
path = libopencm3
url = https://github.com/libopencm3/libopencm3
[submodule "rtos/FreeRTOS-latest"]
path = rtos/FreeRTOS-latest
url = https://github.com/FreeRTOS/FreeRTOS
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ libopencm3).
|- miniblink/ simple blink: libopencm3 only
| |- * miniblink files
|- uart/ UART example (no flow control)
| |- *
| |- *
|- uarthwfc/ UART example with hardware flow control
|- *
|- rtos/ FreeRTOS projects
|- FreeRTOSv10.0.0 Unzipped FreeRTOS sources (you create this)
|- FreeRTOS-latest git submodule
|- Makefile Used for creating new rtos projects
|- Makefile.rtos Rules for rtos project builds
|- src/
Expand All @@ -70,7 +70,7 @@ libopencm3).
| |- *
|- usbcdc USB CDC Demo
|- etc.

PREREQUISITES:
--------------

Expand All @@ -80,29 +80,29 @@ PREREQUISITES:
gcc for example will be arm-none-eabi-gcc etc. If your
prefix differs, edit Makefile.incl at the top level to
match, or use the shell: export PREFIX=whatever

0b. It is also assumed that you have the st-link command installed
on your system. You may need to download and install it.
Google is your friend.

1. If you didn't use a --recursive git clone, then you need to make
sure that libopencm3 is fetched now. From the top level apply
one of:

$ git submodule update --init --recursive # First time

$ git submodule update --recursive # Subsequent

2. Go into ./libopencm3 and type "make". This should build the
static libraries that will be needed. Any issues there should
go to the libopencm3 community.

3. For FreeRTOS, cd into ./rtos and unzip your FreeRTOS download
there. It should create a subdirectory FreeRTOSv10.0.0 or
similar. If the release differs, you'll need to change the
variable assignment in rtos/Project.mk FREERTOS ?= ....
to match, or use the shell: export FREERTOS=whatever

4. Do NOT compile FreeRTOS, since portions of it will be copied
to your project subdirectory for further customization. Each
project is capable of running a different FreeRTOS configuration.
Expand Down
2 changes: 1 addition & 1 deletion libopencm3
Submodule libopencm3 updated 903 files
1 change: 1 addition & 0 deletions rtos/FreeRTOS-latest
Submodule FreeRTOS-latest added at 00891e
2 changes: 1 addition & 1 deletion rtos/Project.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Edit this variable if your release differs from what is shown here:

FREERTOS ?= FreeRTOSv10.0.1
FREERTOS ?= FreeRTOS-latest

######################################################################
# Internal variables
Expand Down
4 changes: 2 additions & 2 deletions rtos/libwwg/src/getline.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* the #include <string.h> instead (comment out memory.h)
*/

#include <memory.h>
/* #include <string.h> */
//#include <memory.h>
#include <string.h>

#define CONTROL(c) ((c) & 0x1F)

Expand Down