Skip to content

Commit ad6550b

Browse files
authored
Merge branch 'main' into thrusterTests
2 parents 1cb12d1 + 9f80edb commit ad6550b

File tree

17 files changed

+4565
-10
lines changed

17 files changed

+4565
-10
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @JPGC04 @andrew-kan @majdkhalife @Rain1618 @Coldstuff1 @farahmehzabeen @thirteenlizards @YHLiu2001 @celineshao
1+
* @JPGC04 @andrew-kan @thirteenlizards @asiancooki

.github/workflows/platformio-ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ name: PlatformIO CI
22

33
on:
44
push:
5-
branches:
6-
- main
5+
branches: [main]
76
pull_request:
8-
branches:
9-
- main
7+
branches: [main]
8+
workflow_dispatch:
9+
schedule:
10+
- cron: '0 0,12 * * *' # Runs at 00:00 and 12:00 UTC every day
1011

1112
jobs:
1213
build:

pio_workspace/include/dvl_main.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#ifdef DVL_H
2+
3+
#include <Arduino.h>
4+
5+
void dvl_setup();
6+
void dvl_loop();
7+
8+
#endif

pio_workspace/platformio.ini

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,25 @@ build_flags =
3333
${env.build_flags}
3434
#upload_protocol = teensy-cli
3535
upload_port = /dev/display
36+
lib_deps =
37+
adafruit/Adafruit BusIO
38+
adafruit/Adafruit GFX Library
39+
adafruit/Adafruit ILI9341
40+
adafruit/Adafruit SH110X
41+
adafruit/Adafruit TouchScreen
42+
https://github.com/adafruit/Adafruit_TSC2007
43+
PaulStoffregen/XPT2046_Touchscreen
44+
https://github.com/bluerobotics/BlueRobotics_MS5837_Library
45+
46+
[env:dvl]
47+
platform = teensy
48+
board = teensy40
49+
framework = arduino
50+
build_flags =
51+
-D DVL_H
52+
${env.build_flags}
53+
#upload_protocol = teensy-cli
54+
upload_port = /dev/dvl
3655

3756
[env:power]
3857
platform = teensy

0 commit comments

Comments
 (0)