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

Single Location Custom Firmware Print Method #93

Merged
merged 4 commits into from
Jan 9, 2024
Merged

Single Location Custom Firmware Print Method #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44c374e
hwdef: Removal of Custom Firmware define from Carbonix boards
loki077 Jan 9, 2024
a002e79
AP_Common: AP_FWVersion Added define for CarboPilot firmware version
loki077 Jan 9, 2024
dbfeaf0
Tools: Carbonix waf build update to add define CARBOPILOT=1
loki077 Jan 9, 2024
0e51f86
workflow: Carbonix CI build update to add define CARBOPILOT=1
loki077 Jan 9, 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
4 changes: 2 additions & 2 deletions .github/workflows/carbonix_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:
for board in "${boards[@]}"; do
echo "Compiling AP_Periph for $board..."
./Tools/scripts/build_bootloaders.py "$board"
./waf configure --board "$board"
./waf configure --board "$board" --define=CARBOPILOT=1
./waf plane
done
echo "Script completed successfully."
Expand All @@ -183,7 +183,7 @@ jobs:
for board in "${boards[@]}"; do
echo "Compiling AP_Periph for $board..."
./Tools/scripts/build_bootloaders.py "$board"
./waf configure --board "$board"
./waf configure --board "$board" --define=CARBOPILOT=1
./waf AP_Periph
done
echo "Script completed successfully."
Expand Down
4 changes: 2 additions & 2 deletions Tools/Carbonix_scripts/carbonix_waf_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ main_boards=("CarbonixCubeOrange" "CubeOrange" "sitl")
for board in "${main_boards[@]}"; do
echo "Compiling Plane for $board..."
./Tools/scripts/build_bootloaders.py "$board"
./waf configure --board "$board"
./waf configure --board "$board" --define=CARBOPILOT=1
./waf plane
done

Expand All @@ -35,7 +35,7 @@ periph_boards=("CarbonixF405" "Volanti-M1" "Volanti-M2" "Volanti-M3" "Volanti-M4
for board in "${periph_boards[@]}"; do
echo "Compiling AP_Periph for $board..."
./Tools/scripts/build_bootloaders.py "$board"
./waf configure --board "$board"
./waf configure --board "$board" --define=CARBOPILOT=1
./waf AP_Periph
done

Expand Down
4 changes: 4 additions & 0 deletions libraries/AP_Common/AP_FWVersionDefine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
#include <AP_Common/AP_FWVersion.h>
#include <AP_Vehicle/AP_Vehicle_Type.h>

#ifdef CARBOPILOT
#define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta3"
#endif

/*
allow vendors to set AP_CUSTOM_FIRMWARE_STRING in hwdef.dat
*/
Expand Down
2 changes: 0 additions & 2 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixCubeOrange/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

include ../CubeOrange/hwdef.dat

define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta3"

undef HAL_NAVEKF3_AVAILABLE
undef HAL_NAVEKF2_AVAILABLE
undef HAL_EXTERNAL_AHRS_ENABLED
Expand Down
2 changes: 0 additions & 2 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ env AP_PERIPH 1
# crystal frequency set to 0 to use internal clock; currently configured for external crystal 12MHZ
OSCILLATOR_HZ 12000000

define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta3"

#MCU F405 Flash 1024
FLASH_SIZE_KB 1024

Expand Down
2 changes: 0 additions & 2 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ env AP_PERIPH 1
# crystal frequency
OSCILLATOR_HZ 12000000

define AP_CUSTOM_FIRMWARE_STRING "CarboPilot V5.0.0-beta3"

# assume the 256k flash part
FLASH_SIZE_KB 256

Expand Down