update makefile and pipeline workflow

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f07c5db04260ecf984cebdb76ed5c4ebbdf87b8f..7112d820464b122eeac982b400c0bdb609e982fe 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,11 +10,14 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Compile beats-time app
+      - name: Compile starter-project app
         run: make
-        working-directory: 'apps/beats-time/make'
+        working-directory: 'apps/starter-project'
+      - name: Compile accelerometer-test app
+        run: make
+        working-directory: 'apps/accelerometer-test'
       - name: Upload UF2
         uses: actions/upload-artifact@v2
         with:
-          name: watch.uf2
-          path: apps/beats-time/make/build/watch.uf2
+          name: watch.uf2.uf2
+          path: apps/**/build/watch.uf2

diff --git a/.gitignore b/.gitignore
index 6c5ca6304893e204858ce84079f2e000f725b53a..1100e911542d8468df7dce1a6242d88ac89d3c17 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 *.uf2
 *srec
 .DS_Store
+.idea/
 .vs
 .vscode
 docs/
\ No newline at end of file

diff --git a/apps/accelerometer-test/Makefile b/apps/accelerometer-test/Makefile
new file mode 100755 (executable)
index 0000000..5534c17
--- /dev/null
+++ b/apps/accelerometer-test/Makefile
@@ -0,0 +1,10 @@
+TOP = ../..
+include $(TOP)/make.mk
+
+INCLUDES += \
+  -I./
+
+SRCS += \
+  ./app.c
+
+include $(TOP)/rules.mk

diff --git a/apps/accelerometer-test/make/Makefile b/apps/accelerometer-test/make/Makefile
deleted file mode 100755 (executable)
index c66ad20..0000000
--- a/apps/accelerometer-test/make/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-TOP = ../../..
-include $(TOP)/make.mk
-
-INCLUDES += \
-  -I../
-
-SRCS += \
-  ../app.c
-
-include $(TOP)/rules.mk

diff --git a/apps/starter-project/Makefile b/apps/starter-project/Makefile
new file mode 100755 (executable)
index 0000000..7cb3c48
--- /dev/null
+++ b/apps/starter-project/Makefile
@@ -0,0 +1,26 @@
+# Leave these lines at the top of the file.
+# TOP should get us to the root of the project...
+TOP = ../..
+# ...and make.mk has all the watch library sources and includes.
+include $(TOP)/make.mk
+
+# If you add any other subdirectories with header files you wish to include, add them after ./
+# Note that you will need to add a backslash at the end of any line you wish to continue, i.e.
+# INCLUDES += \
+#   -I./ \
+#   -I drivers/ \
+#   -I utils/
+INCLUDES += \
+  -I./ \
+
+# If you add any other source files you wish to compile, add them after app.c
+# Note that you will need to add a backslash at the end of any line you wish to continue, i.e.
+# SRCS += \
+#   ./app.c \
+#   ./drivers/bmp280.c \
+#   ./utils/temperature.c
+SRCS += \
+  ./app.c \
+
+# Leave this line at the bottom of the file; rules.mk has all the targets for making your project.
+include $(TOP)/rules.mk

diff --git a/apps/starter-project/make/Makefile b/apps/starter-project/make/Makefile
deleted file mode 100755 (executable)
index 09a59a0..0000000
--- a/apps/starter-project/make/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Leave these lines at the top of the file.
-# TOP should get us to the root of the project...
-TOP = ../../..
-# ...and make.mk has all the watch library sources and includes.
-include $(TOP)/make.mk
-
-# If you add any other subdirectories with header files you wish to include, add them after ../
-# Note that you will need to add a backslash at the end of any line you wish to continue, i.e.
-# INCLUDES += \
-#   -I../ \
-#   -I../drivers/ \
-#   -I../utils/
-INCLUDES += \
-  -I../ \
-
-# If you add any other source files you wish to compile, add them after ../app.c
-# Note that you will need to add a backslash at the end of any line you wish to continue, i.e.
-# SRCS += \
-#   ../app.c \
-#   ../drivers/bmp280.c \
-#   ../utils/temperature.c
-SRCS += \
-  ../app.c \
-
-# Leave this line at the bottom of the file; rules.mk has all the targets for making your project.
-include $(TOP)/rules.mk