Skip to content

Commit

Permalink
Merge branch 'main' into i2c_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
riyapatel25 authored Oct 15, 2024
2 parents ce6d045 + 4501304 commit 93e47aa
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 4 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/clang-format-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: C Coding Style Check

# Runs on pushes to pull request
on: pull_request

jobs:
# Build job
clang-format-style-check:
name: C Coding Style Check (clang-format check)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install clang-format 19
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 19
sudo apt install clang-format-19
- name: Download Waterloo Rocketry team-wide clang-format config
run: wget https://raw.githubusercontent.com/waterloo-rocketry/rocketlib/refs/heads/master/.clang-format
- name: clang-format code formatting check
run: clang-format-19 --dry-run -Werror *.c *.h
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ disassembly/
*.map
*.log
*.log.inx
*.yml
2 changes: 1 addition & 1 deletion fxls8974cf_regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define FXLS_WHO_AM_I 0x13

#define INT_STATUS_REG 0x00
#define SRC_DRDY_MASK 0x80 // 10000000 in binary, bit 7 mask
#define SRC_DRDY_MASK 0x80 // 10000000 in binary, bit 7 mask

#define FXLS_SENS_CONFIG1 0x15
#define SENS_CONFIG1_MASK 0x01
Expand Down
4 changes: 2 additions & 2 deletions slf3s.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef SLF3S4000B_H
#define SLF3S4000B_H
#define SLF3S4000B_H

#include <stdint.h>

void slf3s_init(void);
void read_flow_sensor_data(uint16_t *flow, uint16_t *temperature);

#endif /* SLF3S_H */
#endif /* SLF3S_H */

0 comments on commit 93e47aa

Please sign in to comment.