From ee11c025b2cda2f0cca63ea7c7fd77a3d521cc17 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 14 May 2022 08:37:25 -0400 Subject: [PATCH] SENT --- .github/workflows/build-firmware.yaml | 4 ++++ SENT-box/{ => firmware}/Makefile | 2 +- SENT-box/{ => firmware}/can.cpp | 0 SENT-box/{ => firmware}/can.h | 0 SENT-box/{ => firmware}/chconf.h | 0 SENT-box/{ => firmware}/clean_build.bat | 0 SENT-box/{ => firmware}/compile.bat | 0 SENT-box/{ => firmware}/flash.bat | 0 SENT-box/{ => firmware}/halconf.h | 0 SENT-box/{ => firmware}/main.cpp | 0 SENT-box/{ => firmware}/mcuconf.h | 0 SENT-box/{ => firmware}/uart.cpp | 0 SENT-box/{ => firmware}/uart.h | 0 13 files changed, 5 insertions(+), 1 deletion(-) rename SENT-box/{ => firmware}/Makefile (99%) rename SENT-box/{ => firmware}/can.cpp (100%) rename SENT-box/{ => firmware}/can.h (100%) rename SENT-box/{ => firmware}/chconf.h (100%) rename SENT-box/{ => firmware}/clean_build.bat (100%) rename SENT-box/{ => firmware}/compile.bat (100%) rename SENT-box/{ => firmware}/flash.bat (100%) rename SENT-box/{ => firmware}/halconf.h (100%) rename SENT-box/{ => firmware}/main.cpp (100%) rename SENT-box/{ => firmware}/mcuconf.h (100%) rename SENT-box/{ => firmware}/uart.cpp (100%) rename SENT-box/{ => firmware}/uart.h (100%) diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index 54f4753..7d692d2 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -37,3 +37,7 @@ jobs: - name: Build Digital Inputs Firmware working-directory: ./digital-inputs/firmware run: make + + - name: Build SENT Firmware + working-directory: ./SENT-box/firmware + run: make diff --git a/SENT-box/Makefile b/SENT-box/firmware/Makefile similarity index 99% rename from SENT-box/Makefile rename to SENT-box/firmware/Makefile index 8413962..fe18c06 100644 --- a/SENT-box/Makefile +++ b/SENT-box/firmware/Makefile @@ -90,7 +90,7 @@ PROJECT = ch MCU = cortex-m3 # Imported source files and paths. -CHIBIOS = ../ChibiOS +CHIBIOS = ../../ChibiOS CONFDIR := ./cfg BUILDDIR := ./build DEPDIR := ./.dep diff --git a/SENT-box/can.cpp b/SENT-box/firmware/can.cpp similarity index 100% rename from SENT-box/can.cpp rename to SENT-box/firmware/can.cpp diff --git a/SENT-box/can.h b/SENT-box/firmware/can.h similarity index 100% rename from SENT-box/can.h rename to SENT-box/firmware/can.h diff --git a/SENT-box/chconf.h b/SENT-box/firmware/chconf.h similarity index 100% rename from SENT-box/chconf.h rename to SENT-box/firmware/chconf.h diff --git a/SENT-box/clean_build.bat b/SENT-box/firmware/clean_build.bat similarity index 100% rename from SENT-box/clean_build.bat rename to SENT-box/firmware/clean_build.bat diff --git a/SENT-box/compile.bat b/SENT-box/firmware/compile.bat similarity index 100% rename from SENT-box/compile.bat rename to SENT-box/firmware/compile.bat diff --git a/SENT-box/flash.bat b/SENT-box/firmware/flash.bat similarity index 100% rename from SENT-box/flash.bat rename to SENT-box/firmware/flash.bat diff --git a/SENT-box/halconf.h b/SENT-box/firmware/halconf.h similarity index 100% rename from SENT-box/halconf.h rename to SENT-box/firmware/halconf.h diff --git a/SENT-box/main.cpp b/SENT-box/firmware/main.cpp similarity index 100% rename from SENT-box/main.cpp rename to SENT-box/firmware/main.cpp diff --git a/SENT-box/mcuconf.h b/SENT-box/firmware/mcuconf.h similarity index 100% rename from SENT-box/mcuconf.h rename to SENT-box/firmware/mcuconf.h diff --git a/SENT-box/uart.cpp b/SENT-box/firmware/uart.cpp similarity index 100% rename from SENT-box/uart.cpp rename to SENT-box/firmware/uart.cpp diff --git a/SENT-box/uart.h b/SENT-box/firmware/uart.h similarity index 100% rename from SENT-box/uart.h rename to SENT-box/firmware/uart.h