Merge pull request #74 from kamiyaowl/fix_#73

close #73 support arduino-cli v0.11.0

.github/workflows/build.yml

@@ -17,4 +17,4 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
         name: wfh_monitor.zip
-        path: wfh_monitor.ino.Seeeduino.samd.seeed_wio_terminal.*
+        path: wfh_monitor.ino.uf2

.gitignore

@@ -128,14 +128,16 @@ dmypy.json
 .pyre/
 
 # build binary
-*.bin
-*.elf
+*.ino.bin
+*.ino.elf
+*.ino.hex
+*.ino.map
+*.ino.uf2
+
+cache/
+sketch/
 bazel-*
-wfh_monitor.ino.Seeeduino.samd.seeed_wio_terminal.uf2
 
 # doxygen
 html
-latex
-
-# build cache
-cache
+latex

arduino-cli.Dockerfile

@@ -20,7 +20,7 @@ RUN arduino-cli core install Seeeduino:samd@1.7.6 --additional-urls https://file
 RUN arduino-cli core list
 
 # create work directory
-RUN mkdir /work
-WORKDIR /work
+RUN mkdir /wfh_monitor
+WORKDIR /wfh_monitor
 
 CMD ["/bin/sh"]

build.bat

@@ -1 +1 @@
-arduino-cli compile -b Seeeduino:samd:seeed_wio_terminal ./wfh_monitor.ino --verbose --log-level trace
+arduino-cli compile -b Seeeduino:samd:seeed_wio_terminal ./wfh_monitor.ino --output-dir ./ --verbose --log-level trace

build.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-arduino-cli compile -b Seeeduino:samd:seeed_wio_terminal ./wfh_monitor.ino --verbose --log-level trace
-python ./utils/uf2/utils/uf2conv.py -c -b 0x4000 -o ./wfh_monitor.ino.Seeeduino.samd.seeed_wio_terminal.uf2 ./wfh_monitor.ino.Seeeduino.samd.seeed_wio_terminal.bin
+arduino-cli compile -b Seeeduino:samd:seeed_wio_terminal ./wfh_monitor.ino --output-dir ./ --verbose --log-level trace
+python ./utils/uf2/utils/uf2conv.py -c -b 0x4000 -o ./wfh_monitor.ino.uf2 ./wfh_monitor.ino.bin

docker-compose.yml

@@ -6,7 +6,7 @@ services:
         context: .
         dockerfile: arduino-cli.Dockerfile
       volumes:
-        - ./:/work
+        - ./:/wfh_monitor
         - ./lib:/root/Arduino/libraries:ro
       command: >
         bash -c "chmod +x ./build.sh && ./build.sh"
@@ -15,7 +15,7 @@ services:
         context: .
         dockerfile: arduino-cli.Dockerfile
       volumes:
-        - ./:/work
+        - ./:/wfh_monitor
         - ./lib:/root/Arduino/libraries:ro
       devices: 
         - /dev/ttyS10:/dev/ttyTarget # ttyS10を自分のターゲットに置き換える
@@ -26,6 +26,6 @@ services:
         context: .
         dockerfile: ./doxygen.Dockerfile
       volumes:
-        - ./:/work
+        - ./:/wfh_monitor
         - ./lib:/root/Arduino/libraries:ro
       command: doxygen

doxygen.Dockerfile

@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y doxygen graphviz git
 
 # create work directory
-RUN mkdir /work
-WORKDIR /work
+RUN mkdir /wfh_monitor
+WORKDIR /wfh_monitor
 
 CMD ["/bin/sh"]