diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e619c76..347e2ca 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index 072cf2a..e2b104a 100644 --- a/.gitignore +++ b/.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 \ No newline at end of file +latex \ No newline at end of file diff --git a/arduino-cli.Dockerfile b/arduino-cli.Dockerfile index 97012a6..f7981c0 100644 --- a/arduino-cli.Dockerfile +++ b/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"] \ No newline at end of file diff --git a/build.bat b/build.bat index 98324f7..1bb3bdb 100644 --- a/build.bat +++ b/build.bat @@ -1 +1 @@ -arduino-cli compile -b Seeeduino:samd:seeed_wio_terminal ./wfh_monitor.ino --verbose --log-level trace \ No newline at end of file +arduino-cli compile -b Seeeduino:samd:seeed_wio_terminal ./wfh_monitor.ino --output-dir ./ --verbose --log-level trace \ No newline at end of file diff --git a/build.sh b/build.sh index 4968519..98a7544 100644 --- a/build.sh +++ b/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 diff --git a/docker-compose.yml b/docker-compose.yml index 326db66..3ed4abd 100644 --- a/docker-compose.yml +++ b/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 \ No newline at end of file diff --git a/doxygen.Dockerfile b/doxygen.Dockerfile index 648091a..7028d5a 100644 --- a/doxygen.Dockerfile +++ b/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"] \ No newline at end of file