diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp index b0958fc6dc..1f6a2120cd 100644 --- a/src/drivers/px4fmu/fmu.cpp +++ b/src/drivers/px4fmu/fmu.cpp @@ -159,7 +159,7 @@ public: static int task_spawn(int argc, char *argv[]); /** @see ModuleBase */ - static PX4FMU *instanciate(int argc, char *argv[]); + static PX4FMU *instantiate(int argc, char *argv[]); /** @see ModuleBase */ static int custom_command(int argc, char *argv[]); @@ -3337,7 +3337,7 @@ PX4FMU::fake(int argc, char *argv[]) return 0; } -PX4FMU *PX4FMU::instanciate(int argc, char *argv[]) +PX4FMU *PX4FMU::instantiate(int argc, char *argv[]) { // No arguments to parse. We also know that we should run as task PX4FMU *dev = new PX4FMU(true); diff --git a/src/modules/logger/logger.cpp b/src/modules/logger/logger.cpp index e397ccfabc..dffcea5121 100644 --- a/src/modules/logger/logger.cpp +++ b/src/modules/logger/logger.cpp @@ -236,7 +236,7 @@ void Logger::print_statistics() _max_dropout_duration = 0.f; } -Logger *Logger::instanciate(int argc, char *argv[]) +Logger *Logger::instantiate(int argc, char *argv[]) { uint32_t log_interval = 3500; int log_buffer_size = 12 * 1024; diff --git a/src/modules/logger/logger.h b/src/modules/logger/logger.h index 33db7fdb01..1fbadcc623 100644 --- a/src/modules/logger/logger.h +++ b/src/modules/logger/logger.h @@ -100,7 +100,7 @@ public: static int task_spawn(int argc, char *argv[]); /** @see ModuleBase */ - static Logger *instanciate(int argc, char *argv[]); + static Logger *instantiate(int argc, char *argv[]); /** @see ModuleBase */ static int custom_command(int argc, char *argv[]); diff --git a/src/platforms/px4_module.h b/src/platforms/px4_module.h index 108edbe3eb..ab08cf7eb5 100644 --- a/src/platforms/px4_module.h +++ b/src/platforms/px4_module.h @@ -76,7 +76,7 @@ extern pthread_mutex_t px4_modules_mutex; // set _task_id and return 0 // on error return != 0 (and _task_id must be -1) } - static T *instanciate(int argc, char *argv[]) { + static T *instantiate(int argc, char *argv[]) { // this is called from within the new thread, from run_trampoline() // parse the arguments // create a new object T & return it @@ -141,7 +141,7 @@ public: /** * Entry point for px4_task_spawn_cmd() if the module runs in its own thread. * It does: - * - instanciate the object + * - instantiate the object * - call run() on it to execute the main loop * - cleanup: delete the object * @param argc start argument(s) @@ -156,14 +156,14 @@ public: argv += 1; #endif - _object = T::instanciate(argc, argv); + _object = T::instantiate(argc, argv); if (_object) { T *object = (T *)_object; object->run(); } else { - PX4_ERR("failed to instanciate object"); + PX4_ERR("failed to instantiate object"); } exit_and_cleanup();