Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parameter Document modification and Carbonix Build script addition #91

Merged
merged 2 commits into from
Jan 8, 2024
Merged

Parameter Document modification and Carbonix Build script addition #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e318282
Parameter docs Update: modified multiple param comments
loki077 Jan 4, 2024
25e408f
Tools: Carbonix board Build script
loki077 Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ArduPlane/Parameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ const AP_Param::Info Plane::var_info[] = {
// @DisplayName: Crash Detection
// @Description: Automatically detect a crash during AUTO flight and perform the bitmask selected action(s). Disarm will turn off motor for safety and to help against burning out ESC and motor. Set to 0 to disable crash detection.
// @Values: 0:Disabled
// @Bitmask: 0:Disarm
// @Bitmask: 0:Disarm, 1:Arm
// @User: Advanced
ASCALAR(crash_detection_enable, "CRASH_DETECT", 0),

Expand Down
22 changes: 22 additions & 0 deletions Tools/Carbonix_scripts/carbonix_board_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

# Exit immediately if a command exits with a non-zero status
set -e

# The board to build for is passed as an argument to the script
BOARD=$1

if [ "$BOARD" == "CubeOrange" ] || [ "$BOARD" == "CarbonixCubeOrange" ] || [ "$BOARD" == "sitl" ]
then
echo "Compiling Plane for $BOARD..."
./Tools/scripts/build_bootloaders.py "$BOARD"
./waf configure --board "$BOARD"
./waf plane
else
echo "Compiling AP_Periph for $BOARD..."
./Tools/scripts/build_bootloaders.py "$BOARD"
./waf configure --board "$BOARD"
./waf AP_Periph
fi

echo "Build for $BOARD completed."
4 changes: 2 additions & 2 deletions libraries/AP_BattMonitor/AP_BattMonitor_Analog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ const AP_Param::GroupInfo AP_BattMonitor_Analog::var_info[] = {
// @Param: VOLT_PIN
// @DisplayName: Battery Voltage sensing pin
// @Description: Sets the analog input pin that should be used for voltage monitoring.
// @Values: -1:Disabled, 2:Pixhawk/Pixracer/Navio2/Pixhawk2_PM1, 5:Navigator, 13:Pixhawk2_PM2/CubeOrange_PM2, 14:CubeOrange, 16:Durandal, 100:PX4-v1
// @Values: -1:Disabled, 2:Pixhawk/Pixracer/Navio2/Pixhawk2_PM1, 5:Navigator, 13:Pixhawk2_PM2/CubeOrange_PM2, 14:CubeOrange, 50:AD7091R5_ADC_PIN_0, 16:Durandal, 100:PX4-v1
// @User: Standard
// @RebootRequired: True
AP_GROUPINFO("VOLT_PIN", 1, AP_BattMonitor_Analog, _volt_pin, AP_BATT_VOLT_PIN),

// @Param: CURR_PIN
// @DisplayName: Battery Current sensing pin
// @Description: Sets the analog input pin that should be used for current monitoring.
// @Values: -1:Disabled, 3:Pixhawk/Pixracer/Navio2/Pixhawk2_PM1, 4:CubeOrange_PM2/Navigator, 14:Pixhawk2_PM2, 15:CubeOrange, 17:Durandal, 101:PX4-v1
// @Values: -1:Disabled, 3:Pixhawk/Pixracer/Navio2/Pixhawk2_PM1, 4:CubeOrange_PM2/Navigator, 14:Pixhawk2_PM2, 15:CubeOrange, 17:Durandal, 51:AD7091R5_ADC_PIN_1, 52:AD7091R5_ADC_PIN_2, 101:PX4-v1
// @User: Standard
// @RebootRequired: True
AP_GROUPINFO("CURR_PIN", 2, AP_BattMonitor_Analog, _curr_pin, AP_BATT_CURR_PIN),
Expand Down
1 change: 1 addition & 0 deletions libraries/AP_Motors/AP_MotorsMulticopter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ const AP_Param::GroupInfo AP_MotorsMulticopter::var_info[] = {
// @DisplayName: Motor Spin armed
// @Description: Point at which the motors start to spin expressed as a number from 0 to 1 in the entire output range. Should be lower than MOT_SPIN_MIN.
// @Values: 0.0:Low, 0.1:Default, 0.2:High
// @Range: 0 0.2
// @User: Advanced
AP_GROUPINFO("SPIN_ARM", 19, AP_MotorsMulticopter, _spin_arm, AP_MOTORS_SPIN_ARM_DEFAULT),

Expand Down