Skip to content

Commit 3744edf

Browse files
authored
Merge branch 'main' into actuator_testing
2 parents dc62363 + 0b516a1 commit 3744edf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+5874
-11
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
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#ifdef THRUSTER_TESTS_H
2+
3+
#include <Arduino.h>
4+
5+
void thruster_tests_setup();
6+
void thruster_tests_loop();
7+
8+
#endif

pio_workspace/lib/power_custom/adc_sensors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ADCSensors {
2222
ADCSensors();
2323

2424
// Initialization of ADCSensor
25-
bool begin(bool enableVoltage, bool enableCurrent, TwoWire* wire = &Wire1);
25+
bool begin(bool enableVoltage, bool enableCurrent, TwoWire* wire);
2626

2727
// Returns an array pointer to current measurements
2828
float* senseVoltage();

pio_workspace/platformio.ini

Lines changed: 29 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
@@ -55,3 +74,13 @@ build_flags =
5574
${env.build_flags}
5675
#upload_protocol = teensy-cli
5776
upload_port = /dev/power
77+
78+
[env:thruster_tests]
79+
platform = atmelavr
80+
board = uno
81+
framework = arduino
82+
build_flags =
83+
-D THRUSTER_TESTS_H
84+
lib_ignore = micro_ros_arduino
85+
monitor_speed= 57600
86+
lib_deps = HX711_ADC

0 commit comments

Comments
 (0)