rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

OP-1122 OP-1125 renamed method autoUpdated to instanceAutoUpdated

Browse Source 
also fixed some method help comments
This commit is contained in:
Philippe Renon 2013-12-11 22:24:38 +01:00
parent e0115a25b0
commit ff14b8d28c
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
flight/uavobjects/uavobjectmanager.c
View File

@ -183,7 +183,7 @@ static int32_t connectObj(UAVObjHandle obj_handle, xQueueHandle queue,
UAVObjEventCallback cb, uint8_t eventMask); UAVObjEventCallback cb, uint8_t eventMask);
static int32_t disconnectObj(UAVObjHandle obj_handle, xQueueHandle queue, static int32_t disconnectObj(UAVObjHandle obj_handle, xQueueHandle queue,
UAVObjEventCallback cb); UAVObjEventCallback cb);
static void autoUpdated(UAVObjHandle obj_handle, uint16_t instId); static void instanceAutoUpdated(UAVObjHandle obj_handle, uint16_t instId);
// Private variables // Private variables
static xSemaphoreHandle mutex; static xSemaphoreHandle mutex;
@ -391,8 +391,8 @@ UAVObjHandle UAVObjRegister(uint32_t id,
} }
// fire events for outer object and its embedded meta object // fire events for outer object and its embedded meta object
autoUpdated((UAVObjHandle)uavo_data, 0); instanceAutoUpdated((UAVObjHandle)uavo_data, 0);
autoUpdated((UAVObjHandle) & (uavo_data->metaObj), 0); instanceAutoUpdated((UAVObjHandle) & (uavo_data->metaObj), 0);
unlock_exit: unlock_exit:
xSemaphoreGiveRecursive(mutex); xSemaphoreGiveRecursive(mutex);
@ -1583,8 +1583,8 @@ void UAVObjRequestUpdate(UAVObjHandle obj_handle)
} }
/** /**
* Request an update of the object's data from the GCS. The call will not wait for the response, a EV_UPDATED event * Request an update of the object's data from the GCS.
* will be generated as soon as the object is updated. * The call will not wait for the response, a EV_UPDATED event will be generated as soon as the object is updated.
* \param[in] obj The object handle * \param[in] obj The object handle
* \param[in] instId Object instance ID to update * \param[in] instId Object instance ID to update
*/ */
@ -1597,7 +1597,7 @@ void UAVObjRequestInstanceUpdate(UAVObjHandle obj_handle, uint16_t instId)
} }
/** /**
* Send the object's data to the GCS (triggers a EV_UPDATED_MANUAL event on this object). * Trigger a EV_UPDATED_MANUAL event for an object.
* \param[in] obj The object handle * \param[in] obj The object handle
*/ */
void UAVObjUpdated(UAVObjHandle obj_handle) void UAVObjUpdated(UAVObjHandle obj_handle)
@ -1606,7 +1606,7 @@ void UAVObjUpdated(UAVObjHandle obj_handle)
} }
/** /**
* Send the object's data to the GCS (triggers a EV_UPDATED_MANUAL event on this object). * Trigger a EV_UPDATED_MANUAL event for an object instance.
* \param[in] obj The object handle * \param[in] obj The object handle
* \param[in] instId The object instance ID * \param[in] instId The object instance ID
*/ */
@ -1619,12 +1619,11 @@ void UAVObjInstanceUpdated(UAVObjHandle obj_handle, uint16_t instId)
} }
/** /**
<<<<<<< HEAD * Trigger a EV_UPDATED event for an object instance.
* Send the object's data to the GCS (triggers a EV_UPDATED_MANUAL event on this object).
* \param[in] obj The object handle * \param[in] obj The object handle
* \param[in] instId The object instance ID * \param[in] instId The object instance ID
*/ */
static void autoUpdated(UAVObjHandle obj_handle, uint16_t instId) static void instanceAutoUpdated(UAVObjHandle obj_handle, uint16_t instId)
{ {
PIOS_Assert(obj_handle); PIOS_Assert(obj_handle);
xSemaphoreTakeRecursive(mutex, portMAX_DELAY); xSemaphoreTakeRecursive(mutex, portMAX_DELAY);
@ -1760,7 +1759,7 @@ static InstanceHandle createInstance(struct UAVOData *obj, uint16_t instId)
((struct UAVOMulti *)obj)->num_instances++; ((struct UAVOMulti *)obj)->num_instances++;
// Fire event // Fire event
autoUpdated((UAVObjHandle)obj, instId); instanceAutoUpdated((UAVObjHandle)obj, instId);
// Done // Done
return InstanceDataOffset(instEntry); return InstanceDataOffset(instEntry);