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

waf: remove SKETCH and SKETCHNAME from build sysmte #26320

Merged
merged 1 commit into from
Feb 26, 2024
Merged

waf: remove SKETCH and SKETCHNAME from build sysmte #26320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Tools/ardupilotwaf/ap_library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def _vehicle_index(vehicle):
return _vehicle_indexes[vehicle]

# note that AP_NavEKF3_core.h is needed for AP_NavEKF3_feature.h
_vehicle_macros = ['SKETCHNAME', 'SKETCH', 'APM_BUILD_DIRECTORY',
_vehicle_macros = ['APM_BUILD_DIRECTORY', 'AP_BUILD_TARGET_NAME',
'APM_BUILD_TYPE', 'APM_BUILD_COPTER_OR_HELI',
'AP_NavEKF3_core.h', 'lua_generated_bindings.h']
_macros_re = re.compile(r'\b(%s)\b' % '|'.join(_vehicle_macros))
Expand Down
6 changes: 2 additions & 4 deletions Tools/ardupilotwaf/ardupilotwaf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,12 @@ def get_legacy_defines(sketch_name, bld):
if bld.cmd == 'heli' or 'heli' in bld.targets:
return [
'APM_BUILD_DIRECTORY=APM_BUILD_Heli',
'SKETCH="' + sketch_name + '"',
'SKETCHNAME="' + sketch_name + '"',
'AP_BUILD_TARGET_NAME="' + sketch_name + '"',
]

return [
'APM_BUILD_DIRECTORY=APM_BUILD_' + sketch_name,
'SKETCH="' + sketch_name + '"',
'SKETCHNAME="' + sketch_name + '"',
'AP_BUILD_TARGET_NAME="' + sketch_name + '"',
]

IGNORED_AP_LIBRARIES = [
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/HAL_ChibiOS_Class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ static void main_loop()
hal.scheduler->set_system_initialized();

thread_running = true;
chRegSetThreadName(SKETCHNAME);
chRegSetThreadName(AP_BUILD_TARGET_NAME);

/*
switch to high priority for main loop
Expand Down
4 changes: 2 additions & 2 deletions libraries/AP_HAL_ChibiOS/Storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ using namespace ChibiOS;
extern const AP_HAL::HAL& hal;

#ifndef HAL_STORAGE_FILE
// using SKETCHNAME allows the one microSD to be used
// using AP_BUILD_TARGET_NAME allows the one microSD to be used
// for multiple vehicle types
#define HAL_STORAGE_FILE "/APM/" SKETCHNAME ".stg"
#define HAL_STORAGE_FILE "/APM/" AP_BUILD_TARGET_NAME ".stg"
#endif

#ifndef HAL_STORAGE_BACKUP_FOLDER
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_Linux/Storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ using namespace Linux;

// name the storage file after the sketch so you can use the same board
// card for ArduCopter and ArduPlane
#define STORAGE_FILE SKETCHNAME ".stg"
#define STORAGE_FILE AP_BUILD_TARGET_NAME ".stg"

extern const AP_HAL::HAL& hal;

Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_SITL/SITL_cmdline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ void SITL_State::_parse_command_line(int argc, char * const argv[])
// default to CMAC
const char *home_str = nullptr;
const char *model_str = nullptr;
const char *vehicle_str = SKETCH;
const char *vehicle_str = AP_BUILD_TARGET_NAME;
_use_fg_view = false;
char *autotest_dir = nullptr;
_fg_address = "127.0.0.1";
Expand Down
Loading