summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/main.yml8
-rw-r--r--.gitignore15
-rw-r--r--Doxyfile2
-rwxr-xr-xapps/accelerometer-test/make/.gitignore1
-rwxr-xr-xapps/beats-time/make/.gitignore1
-rwxr-xr-xapps/buzzer-test/make/.gitignore1
-rwxr-xr-xapps/spi-test/make/.gitignore1
-rwxr-xr-xapps/starter-project/make/.gitignore1
8 files changed, 15 insertions, 15 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ba485570..f07c5db0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,7 +10,11 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- - name: Compile Starter Project
+ - name: Compile beats-time app
run: make
working-directory: 'apps/beats-time/make'
-
+ - name: Upload UF2
+ uses: actions/upload-artifact@v2
+ with:
+ name: watch.uf2
+ path: apps/beats-time/make/build/watch.uf2
diff --git a/.gitignore b/.gitignore
index 4c97e2d4..6c5ca630 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,18 @@
-.DS_Store
-*.s#*
+**/build/
*.b#*
-*.pro
-*.job
-
*.bin
+*.d
*.elf
*.hex
+*.job
*.lss
*.map
+*.o
+*.pro
+*.s#*
*.uf2
*srec
-*.o
-*.d
+.DS_Store
.vs
.vscode
+docs/ \ No newline at end of file
diff --git a/Doxyfile b/Doxyfile
index da710195..7f04a047 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -8,7 +8,7 @@ PROJECT_NAME = "Sensor Watch"
PROJECT_NUMBER = "0.0.0"
PROJECT_BRIEF = "A board replacement for the classic Casio F-91W wristwatch, powered by a Microchip SAM L22 microcontroller."
PROJECT_LOGO =
-OUTPUT_DIRECTORY = "../Sensor-Watch-Documentation"
+OUTPUT_DIRECTORY = "."
CREATE_SUBDIRS = NO
ALLOW_UNICODE_NAMES = NO
OUTPUT_LANGUAGE = English
diff --git a/apps/accelerometer-test/make/.gitignore b/apps/accelerometer-test/make/.gitignore
deleted file mode 100755
index 567609b1..00000000
--- a/apps/accelerometer-test/make/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/
diff --git a/apps/beats-time/make/.gitignore b/apps/beats-time/make/.gitignore
deleted file mode 100755
index 3722ac63..00000000
--- a/apps/beats-time/make/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/
diff --git a/apps/buzzer-test/make/.gitignore b/apps/buzzer-test/make/.gitignore
deleted file mode 100755
index 3722ac63..00000000
--- a/apps/buzzer-test/make/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/
diff --git a/apps/spi-test/make/.gitignore b/apps/spi-test/make/.gitignore
deleted file mode 100755
index 3722ac63..00000000
--- a/apps/spi-test/make/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/
diff --git a/apps/starter-project/make/.gitignore b/apps/starter-project/make/.gitignore
deleted file mode 100755
index 3722ac63..00000000
--- a/apps/starter-project/make/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/