Skip to content

Commit

Permalink
Reapply "Merge branch 'master' into CASE_testbranch"
Browse files Browse the repository at this point in the history
This reverts commit e062970.
  • Loading branch information
CL16gtgh committed May 22, 2024
1 parent e062970 commit 3d1aab3
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ EXTRACT_ALL = YES
# be included in the documentation.
# The default value is: NO.

EXTRACT_PRIVATE = NO
EXTRACT_PRIVATE = YES

# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
# methods of a class will be included in the documentation.
Expand Down
15 changes: 7 additions & 8 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ lib_ignore =
test_ignore=
test_interfaces*
lib_deps=
git+ssh://git@github.com/hytech-racing/CASE_lib.git#v45

https://github.com/hytech-racing/shared_firmware_systems.git
git+ssh://git@github.com/hytech-racing/CASE_lib.git#v45
https://github.com/hytech-racing/shared_firmware_systems.git#af96a63

[env:teensy41]
; Testing variables
Expand Down Expand Up @@ -52,9 +51,9 @@ lib_deps =
https://github.com/vjmuzik/NativeEthernet.git
https://github.com/hytech-racing/HT_params/releases/download/2024-05-07T06_59_33/ht_eth_pb_lib.tar.gz
https://github.com/hytech-racing/shared_firmware_interfaces.git
https://github.com/hytech-racing/shared_firmware_systems.git
https://github.com/RCMast3r/spi_libs
https://github.com/tonton81/FlexCAN_T4
https://github.com/hytech-racing/shared_firmware_systems.git#af96a63
https://github.com/RCMast3r/spi_libs#2214fee
https://github.com/tonton81/FlexCAN_T4#b928bcb
https://github.com/RCMast3r/hytech_can#testing_new_inv_ids
https://github.com/hytech-racing/HT_CAN/releases/download/97/can_lib.tar.gz
git+ssh://git@github.com/hytech-racing/CASE_lib.git#v49
Expand Down Expand Up @@ -84,8 +83,8 @@ board = teensy41
framework = arduino
upload_protocol = teensy-cli
lib_deps =
https://github.com/tonton81/FlexCAN_T4
https://github.com/RCMast3r/hytech_can
https://github.com/tonton81/FlexCAN_T4#b928bcb
https://github.com/RCMast3r/hytech_can#4ffbba4
https://github.com/hytech-racing/HT_CAN/releases/latest/download/can_lib.tar.gz


11 changes: 11 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,17 @@ void loop()
{
Serial.print("Steering system reported angle (deg): ");
Serial.println(steering_system.getSteeringSystemData().angle);
Serial.print("Steering system status: ");
Serial.println(static_cast<uint8_t>(steering_system.getSteeringSystemData().status))
Serial.print("Primary sensor angle: ");
Serial.println(steering1.convert().angle);
Serial.print("Secondary sensor angle: ");
Serial.print(a1.get().conversions[MCU15_STEERING_CHANNEL].conversion);
Serial.print(" raw: ");
Serial.println(a1.get().conversions[MCU15_STEERING_CHANNEL].raw);
Serial.print("Sensor divergence: ");
Serial.println(steering1.convert().angle - a1.get().conversions[MCU15_STEERING_CHANNEL].conversion);
Serial.println();

Serial.println();
}
Expand Down

0 comments on commit 3d1aab3

Please sign in to comment.