diff --git a/.github/workflows/format-commit.yml b/.github/workflows/format-commit.yml index e252b51b..4ed8f2f8 100644 --- a/.github/workflows/format-commit.yml +++ b/.github/workflows/format-commit.yml @@ -11,11 +11,15 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Get changed files + - name: Get origin/master base ref + id: get-base-sha + run: | + echo "base_sha=$(git rev-parse "$(git merge-base origin/master "$(git rev-parse --abbrev-ref HEAD )")") >> $GITHUB_OUTPUT" + - name: Get changed files from origin/master id: changed-files - uses: tj-actions/changed-files@v28.0.0 + uses: tj-actions/changed-files@v35 with: - use_fork_point: true + base_sha: ${{ steps.get-base-sha.outputs.base_sha }} files_ignore: | **/*.yml .clang* diff --git a/common/log.c b/common/log.c index a11e8ad0..3c187b32 100644 --- a/common/log.c +++ b/common/log.c @@ -182,6 +182,7 @@ void log_dump(void (*f)(const char *s)) { f(b.data + b.last + 1); f(b.data); + f("\033[0m\r\n"); // turn off color and add a newline to ensure that everything is cleaned up. } void ApolloLog(log_Event *ev) diff --git a/projects/cm_mcu/I2CSlaveTask.c b/projects/cm_mcu/I2CSlaveTask.c index 32a1b008..a5abfa6c 100644 --- a/projects/cm_mcu/I2CSlaveTask.c +++ b/projects/cm_mcu/I2CSlaveTask.c @@ -55,8 +55,8 @@ static uint8_t getSlaveData(uint8_t address) case 0x0U: // reserved value = testreg; break; - case 0x10U: // MCU temperature - value = (uint8_t)getADCvalue(20) + 0.5f; // always valid + case 0x10U: // MCU temperature + value = (uint8_t)(getADCvalue(20) + 0.5f); // always valid break; case 0x12U: // FPGA F2 temp value = (uint8_t)(local_fpga_f2 >= 0 ? fpga_args.pm_values[local_fpga_f2] : 0U); diff --git a/projects/cm_mcu/cm_mcu.c b/projects/cm_mcu/cm_mcu.c index 7c6e8f5c..dbfc306a 100644 --- a/projects/cm_mcu/cm_mcu.c +++ b/projects/cm_mcu/cm_mcu.c @@ -184,8 +184,6 @@ void SystemInitInterrupts(void) #endif // I2C slave - ROM_I2CSlaveDisable(I2C0_BASE); // I don't understand why this is neeeded - ROM_I2CSlaveAddressSet(I2C0_BASE, 0, I2C0_SLAVE_ADDRESS); ROM_IntPrioritySet(INT_I2C0, configKERNEL_INTERRUPT_PRIORITY);