From d0e15a7450282348422ddf5953c8329022cd5299 Mon Sep 17 00:00:00 2001 From: likun17 Date: Sun, 26 Nov 2023 14:25:58 +0800 Subject: [PATCH] uorb:Adapt to new macro definition content. Signed-off-by: likun17 --- system/uorb/sensor/accel.c | 17 +++-------- system/uorb/sensor/baro.c | 15 ++-------- system/uorb/sensor/cap.c | 18 +++--------- system/uorb/sensor/co2.c | 13 ++------ system/uorb/sensor/dust.c | 13 ++------ system/uorb/sensor/ecg.c | 15 ++-------- system/uorb/sensor/force.c | 15 ++-------- system/uorb/sensor/gesture.c | 17 +++-------- system/uorb/sensor/gps.c | 57 +++++++++--------------------------- system/uorb/sensor/gyro.c | 18 +++--------- system/uorb/sensor/hall.c | 15 ++-------- system/uorb/sensor/hbeat.c | 14 ++------- system/uorb/sensor/hcho.c | 13 ++------ system/uorb/sensor/hrate.c | 13 ++------ system/uorb/sensor/humi.c | 13 ++------ system/uorb/sensor/impd.c | 15 ++-------- system/uorb/sensor/ir.c | 13 ++------ system/uorb/sensor/light.c | 17 +++-------- system/uorb/sensor/mag.c | 19 ++++-------- system/uorb/sensor/noise.c | 14 ++------- system/uorb/sensor/ots.c | 15 ++-------- system/uorb/sensor/ph.c | 13 ++------ system/uorb/sensor/pm10.c | 13 ++------ system/uorb/sensor/pm1p0.c | 13 ++------ system/uorb/sensor/pm25.c | 13 ++------ system/uorb/sensor/ppgd.c | 18 +++--------- system/uorb/sensor/ppgq.c | 21 ++++--------- system/uorb/sensor/prox.c | 14 ++------- system/uorb/sensor/rgb.c | 14 ++------- system/uorb/sensor/temp.c | 14 ++------- system/uorb/sensor/tvoc.c | 13 ++------ system/uorb/sensor/uv.c | 13 ++------ system/uorb/test/utility.c | 54 +++++++--------------------------- 33 files changed, 115 insertions(+), 457 deletions(-) diff --git a/system/uorb/sensor/accel.c b/system/uorb/sensor/accel.c index 2b15cf5ac..be39b55af 100644 --- a/system/uorb/sensor/accel.c +++ b/system/uorb/sensor/accel.c @@ -29,23 +29,14 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_accel_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_accel *message = buffer; - const orb_abstime now = orb_absolute_time(); +static const char sensor_accel_format[] = + "timestamp:%" PRIu64 ",x:%hf,y:%hf,z:%hf,temperature:%hf"; - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "temperature: %.2f x: %.2f y: %.2f z: %.2f", - meta->o_name, message->timestamp, now - message->timestamp, - message->temperature, message->x, message->y, message->z); -} #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_accel, struct sensor_accel, print_sensor_accel_message); -ORB_DEFINE(sensor_accel_uncal, struct sensor_accel, - print_sensor_accel_message); +ORB_DEFINE(sensor_accel, struct sensor_accel, sensor_accel_format); +ORB_DEFINE(sensor_accel_uncal, struct sensor_accel, sensor_accel_format); diff --git a/system/uorb/sensor/baro.c b/system/uorb/sensor/baro.c index fab5d321f..5ee66133e 100644 --- a/system/uorb/sensor/baro.c +++ b/system/uorb/sensor/baro.c @@ -29,21 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_baro_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_baro *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "temperature: %.2f pressure: %.2f", - meta->o_name, message->timestamp, now - message->timestamp, - message->temperature, message->pressure); -} +static const char sensor_baro_format[] = + "timestamp:%" PRIu64 ",pressure:%hf,temperature:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_baro, struct sensor_baro, print_sensor_baro_message); +ORB_DEFINE(sensor_baro, struct sensor_baro, sensor_baro_format); diff --git a/system/uorb/sensor/cap.c b/system/uorb/sensor/cap.c index e3a809a4d..b2dd05310 100644 --- a/system/uorb/sensor/cap.c +++ b/system/uorb/sensor/cap.c @@ -29,23 +29,13 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_cap_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_cap *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "status: %" PRIu32 " rawdata0: %" PRIu32 " rawdata1: " - "%" PRIu32 " rawdata2: %" PRIu32 " rawdata3: %" PRIu32 "", - meta->o_name, message->timestamp, now - message->timestamp, - message->status, message->rawdata[0], message->rawdata[1], - message->rawdata[2], message->rawdata[3]); -} +static const char sensor_cap_format[] = + "timestamp:%" PRIu64 ",status:%" PRIu32 ",rawdata0:%" PRIu32 "," + "rawdata1:%" PRIu32 ",rawdata2:%" PRIu32 ",rawdata3:%" PRIu32 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_cap, struct sensor_cap, print_sensor_cap_message); +ORB_DEFINE(sensor_cap, struct sensor_cap, sensor_cap_format); diff --git a/system/uorb/sensor/co2.c b/system/uorb/sensor/co2.c index 8dd09f425..9e23f73b2 100644 --- a/system/uorb/sensor/co2.c +++ b/system/uorb/sensor/co2.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_co2_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_co2 *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) co2: %.2f", - meta->o_name, message->timestamp, now - message->timestamp, - message->co2); -} +static const char sensor_co2_format[] = "timestamp:%" PRIu64 ",co2:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_co2, struct sensor_co2, print_sensor_co2_message); +ORB_DEFINE(sensor_co2, struct sensor_co2, sensor_co2_format); diff --git a/system/uorb/sensor/dust.c b/system/uorb/sensor/dust.c index c205952fa..b8f55152d 100644 --- a/system/uorb/sensor/dust.c +++ b/system/uorb/sensor/dust.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_dust_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_dust *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) dust: %.2f", - meta->o_name, message->timestamp, now - message->timestamp, - message->dust); -} +static const char sensor_dust_format[] = "timestamp:%" PRIu64 ",dust:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_dust, struct sensor_dust, print_sensor_dust_message); +ORB_DEFINE(sensor_dust, struct sensor_dust, sensor_dust_format); diff --git a/system/uorb/sensor/ecg.c b/system/uorb/sensor/ecg.c index f267c4c76..99f51854a 100644 --- a/system/uorb/sensor/ecg.c +++ b/system/uorb/sensor/ecg.c @@ -29,21 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_ecg_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_ecg *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) ecg: %.4f " - "status:0x%" PRIx32 "", - meta->o_name, message->timestamp, now - message->timestamp, - message->ecg, message->status); -} +static const char sensor_ecg_format[] = + "timestamp:%" PRIu64 ",ecg:%hf,status:%" PRIx32 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_ecg, struct sensor_ecg, print_sensor_ecg_message); +ORB_DEFINE(sensor_ecg, struct sensor_ecg, sensor_ecg_format); diff --git a/system/uorb/sensor/force.c b/system/uorb/sensor/force.c index f568befa4..4761ff82a 100644 --- a/system/uorb/sensor/force.c +++ b/system/uorb/sensor/force.c @@ -29,21 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_force_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_force *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "value: %.2f event: %" PRIi32 "", - meta->o_name, message->timestamp, now - message->timestamp, - message->force, message->event); -} +static const char sensor_force_format[] = + "timestamp:%" PRIu64 ",force:%hf,event:%" PRIi32 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_force, struct sensor_force, print_sensor_force_message); +ORB_DEFINE(sensor_force, struct sensor_force, sensor_force_format); diff --git a/system/uorb/sensor/gesture.c b/system/uorb/sensor/gesture.c index e012adbd7..f19a40a4b 100644 --- a/system/uorb/sensor/gesture.c +++ b/system/uorb/sensor/gesture.c @@ -29,17 +29,8 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void -print_sensor_wake_gesture_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_wake_gesture *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago)" - " event: %" PRIu32 "", meta->o_name, message->timestamp, - now - message->timestamp, message->event); -} +static const char sensor_wake_gesture_format[] = + "timestamp:%" PRIu64 ",event:%" PRIu32 ""; #endif /**************************************************************************** @@ -47,6 +38,6 @@ print_sensor_wake_gesture_message(FAR const struct orb_metadata *meta, ****************************************************************************/ ORB_DEFINE(sensor_wake_gesture, struct sensor_wake_gesture, - print_sensor_wake_gesture_message); + sensor_wake_gesture_format); ORB_DEFINE(sensor_wake_gesture_uncal, struct sensor_wake_gesture, - print_sensor_wake_gesture_message); + sensor_wake_gesture_format); diff --git a/system/uorb/sensor/gps.c b/system/uorb/sensor/gps.c index 84113972f..913356d2d 100644 --- a/system/uorb/sensor/gps.c +++ b/system/uorb/sensor/gps.c @@ -29,54 +29,25 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_gps_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_gps *message = buffer; - const orb_abstime now = orb_absolute_time(); +static const char sensor_gps_format[] = + "timestamp:%" PRIu64 ",time_utc:%" PRIu64 ",latitude:%hf,longitude:%hf," + "altitude:%hf,altitude_ellipsoid:%hf,eph:%hf,epv:%hf,hdop:%hf,pdop:%hf," + "vdop:%hf,ground_speed:%hf,course:%hf,satellites_used:%" PRIu32 ""; - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "time_utc: %" PRIu64 " latitude: %.4f longitude: %.4f", - meta->o_name, message->timestamp, now - message->timestamp, - message->time_utc, message->latitude, message->longitude); - - uorbinfo_raw("%s:\taltitude: %.4f altitude_ellipsoid: %.4f " - "ground_speed: %.4f course: %.4f", - meta->o_name, message->altitude, message->altitude_ellipsoid, - message->ground_speed, message->course); - - uorbinfo_raw("%s:\teph: %.4f epv: %.4f hdop: %.4f vdop: %.4f", - meta->o_name, message->eph, message->epv, - message->hdop, message->vdop); -} - -static void -print_sensor_gps_satellite_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_gps_satellite *message = buffer; - const orb_abstime now = orb_absolute_time(); - int i; - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago)", - meta->o_name, message->timestamp, now - message->timestamp); - - for (i = 0; i < message->count; i++) - { - uorbinfo_raw("%s:\tnumber:%d svid: %" PRIu32 - " elevation: %" PRIu32 " azimuth: %" PRIu32 - " snr: %" PRIu32 "", - meta->o_name, i, message->info[i].svid, - message->info[i].elevation, message->info[i].azimuth, - message->info[i].snr); - } -} +static const char sensor_gps_satellite_format[] = + "timestamp:%" PRIu64 ",count:%" PRIu32 ",satellites:%" PRIu32 "," + "svid0:%" PRIu32 ",elevation0:%" PRIu32 ",azimuth0:%" PRIu32 "," + "snr0:%" PRIu32 ",svid1:%" PRIu32 ",elevation1:%" PRIu32 "," + "azimuth1:%" PRIu32 ",snr1:%" PRIu32 ",svid2:%" PRIu32 "," + "elevation2:%" PRIu32 ",azimuth2:%" PRIu32 ",snr2:%" PRIu32 "," + "svid3:%" PRIu32 ",elevation3:%" PRIu32 ",azimuth3:%" PRIu32 "," + "snr3:%" PRIu32 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_gps, struct sensor_gps, print_sensor_gps_message); +ORB_DEFINE(sensor_gps, struct sensor_gps, sensor_gps_format); ORB_DEFINE(sensor_gps_satellite, struct sensor_gps_satellite, - print_sensor_gps_satellite_message); + sensor_gps_satellite_format); diff --git a/system/uorb/sensor/gyro.c b/system/uorb/sensor/gyro.c index d0df6a3d4..d28e1ab5b 100644 --- a/system/uorb/sensor/gyro.c +++ b/system/uorb/sensor/gyro.c @@ -29,23 +29,13 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_gyro_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_gyro *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "temperature: %.2f x: %.2f y: %.2f z: %.2f", - meta->o_name, message->timestamp, now - message->timestamp, - message->temperature, message->x, message->y, message->z); -} +static const char sensor_gyro_format[] = + "timestamp:%" PRIu64 ",x:%hf,y:%hf,z:%hf,temperature:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_gyro, struct sensor_gyro, print_sensor_gyro_message); -ORB_DEFINE(sensor_gyro_uncal, struct sensor_gyro, - print_sensor_gyro_message); +ORB_DEFINE(sensor_gyro, struct sensor_gyro, sensor_gyro_format); +ORB_DEFINE(sensor_gyro_uncal, struct sensor_gyro, sensor_gyro_format); diff --git a/system/uorb/sensor/hall.c b/system/uorb/sensor/hall.c index fa97e4e4d..54be04414 100644 --- a/system/uorb/sensor/hall.c +++ b/system/uorb/sensor/hall.c @@ -29,21 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_hall_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_hall *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "hall: %" PRIi32 "", - meta->o_name, message->timestamp, now - message->timestamp, - message->hall); -} +static const char sensor_hall_format[] = + "timestamp:%" PRIu64 ",hall:%" PRIi32 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_hall, struct sensor_hall, print_sensor_hall_message); +ORB_DEFINE(sensor_hall, struct sensor_hall, sensor_hall_format); diff --git a/system/uorb/sensor/hbeat.c b/system/uorb/sensor/hbeat.c index ead4d409a..45a317b64 100644 --- a/system/uorb/sensor/hbeat.c +++ b/system/uorb/sensor/hbeat.c @@ -29,20 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_hbeat_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_hbeat *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "heart beat: %.4f", meta->o_name, message->timestamp, - now - message->timestamp, message->beat); -} +static const char sensor_hbeat_format[] = + "timestamp:%" PRIu64 ",heart beat:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_hbeat, struct sensor_hbeat, print_sensor_hbeat_message); +ORB_DEFINE(sensor_hbeat, struct sensor_hbeat, sensor_hbeat_format); diff --git a/system/uorb/sensor/hcho.c b/system/uorb/sensor/hcho.c index 704cbe6c3..dea34d3b0 100644 --- a/system/uorb/sensor/hcho.c +++ b/system/uorb/sensor/hcho.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_hcho_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_hcho *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) hcho: %.4f", - meta->o_name, message->timestamp, now - message->timestamp, - message->hcho); -} +static const char sensor_hcho_format[] = "timestamp:%" PRIu64 ",hcho:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_hcho, struct sensor_hcho, print_sensor_hcho_message); +ORB_DEFINE(sensor_hcho, struct sensor_hcho, sensor_hcho_format); diff --git a/system/uorb/sensor/hrate.c b/system/uorb/sensor/hrate.c index 04961b305..2eb1df8de 100644 --- a/system/uorb/sensor/hrate.c +++ b/system/uorb/sensor/hrate.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_hrate_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_hrate *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "heart rate: %.4f", meta->o_name, message->timestamp, - now - message->timestamp, message->bpm); -} +static const char sensor_hrate_format[] = "timestamp:%" PRIu64 ",bpm:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_hrate, struct sensor_hrate, print_sensor_hrate_message); +ORB_DEFINE(sensor_hrate, struct sensor_hrate, sensor_hrate_format); diff --git a/system/uorb/sensor/humi.c b/system/uorb/sensor/humi.c index a765d85bd..b381dad42 100644 --- a/system/uorb/sensor/humi.c +++ b/system/uorb/sensor/humi.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_humi_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_humi *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) humi: %.4f", - meta->o_name, message->timestamp, now - message->timestamp, - message->humidity); -} +static const char sensor_humi_format[] = "timestamp:%" PRIu64 ",humi:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_humi, struct sensor_humi, print_sensor_humi_message); +ORB_DEFINE(sensor_humi, struct sensor_humi, sensor_humi_format); diff --git a/system/uorb/sensor/impd.c b/system/uorb/sensor/impd.c index 00ea5f5cc..680f3c9f7 100644 --- a/system/uorb/sensor/impd.c +++ b/system/uorb/sensor/impd.c @@ -29,21 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_impd_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_impd *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "real: %.2f imaginary: %.2f", meta->o_name, - message->timestamp, now - message->timestamp, - message->real, message->imag); -} +static const char sensor_impd_format[] = + "timestamp:%" PRIu64 ",real:%hf,imaginary:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_impd, struct sensor_impd, print_sensor_impd_message); +ORB_DEFINE(sensor_impd, struct sensor_impd, sensor_impd_format); diff --git a/system/uorb/sensor/ir.c b/system/uorb/sensor/ir.c index 1ee57f8a7..1f5233bc1 100644 --- a/system/uorb/sensor/ir.c +++ b/system/uorb/sensor/ir.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_ir_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_ir *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) ir: %.4f", - meta->o_name, message->timestamp, now - message->timestamp, - message->ir); -} +static const char sensor_ir_format[] = "timestamp:%" PRIu64 ",ir:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_ir, struct sensor_ir, print_sensor_ir_message); +ORB_DEFINE(sensor_ir, struct sensor_ir, sensor_ir_format); diff --git a/system/uorb/sensor/light.c b/system/uorb/sensor/light.c index 89b2fd530..27365f4c6 100644 --- a/system/uorb/sensor/light.c +++ b/system/uorb/sensor/light.c @@ -29,22 +29,13 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_light_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_light *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "light: %.2f ir: %.2f", meta->o_name, message->timestamp, - now - message->timestamp, message->light, message->ir); -} +static const char sensor_light_format[] = + "timestamp:%" PRIu64 ",light:%hf,ir:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_light, struct sensor_light, print_sensor_light_message); -ORB_DEFINE(sensor_light_uncal, struct sensor_light, - print_sensor_light_message); +ORB_DEFINE(sensor_light, struct sensor_light, sensor_light_format); +ORB_DEFINE(sensor_light_uncal, struct sensor_light, sensor_light_format); diff --git a/system/uorb/sensor/mag.c b/system/uorb/sensor/mag.c index c68fd71c5..dd4e4985c 100644 --- a/system/uorb/sensor/mag.c +++ b/system/uorb/sensor/mag.c @@ -29,23 +29,14 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_mag_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_mag *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "temperature: %.2f x: %.2f y: %.2f z: %.2f", - meta->o_name, message->timestamp, now - message->timestamp, - message->temperature, message->x, message->y, message->z); -} +static const char sensor_mag_format[] = + "timestamp:%" PRIu64 ",x:%hf,y:%hf,z:%hf,temperature:%hf," + "status:%" PRId32 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_mag, struct sensor_mag, print_sensor_mag_message); -ORB_DEFINE(sensor_mag_uncal, struct sensor_mag, - print_sensor_mag_message); +ORB_DEFINE(sensor_mag, struct sensor_mag, sensor_mag_format); +ORB_DEFINE(sensor_mag_uncal, struct sensor_mag, sensor_mag_format); diff --git a/system/uorb/sensor/noise.c b/system/uorb/sensor/noise.c index 46420e363..a87303bc4 100644 --- a/system/uorb/sensor/noise.c +++ b/system/uorb/sensor/noise.c @@ -29,20 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_noise_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_noise *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "noise: %.4f", meta->o_name, message->timestamp, - now - message->timestamp, message->db); -} +static const char sensor_noise_format[] = + "timestamp:%" PRIu64 ",noise:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_noise, struct sensor_noise, print_sensor_noise_message); +ORB_DEFINE(sensor_noise, struct sensor_noise, sensor_noise_format); diff --git a/system/uorb/sensor/ots.c b/system/uorb/sensor/ots.c index 100054c07..913e70366 100644 --- a/system/uorb/sensor/ots.c +++ b/system/uorb/sensor/ots.c @@ -29,21 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_ots_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_ots *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "x: % " PRIi32 " y: % " PRIi32 "", - meta->o_name, message->timestamp, now - message->timestamp, - message->x, message->y); -} +static const char sensor_ots_format[] = + "timestamp:%" PRIu64 ",x:%" PRIi32 ",y:%" PRIi32 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_ots, struct sensor_ots, print_sensor_ots_message); +ORB_DEFINE(sensor_ots, struct sensor_ots, sensor_ots_format); diff --git a/system/uorb/sensor/ph.c b/system/uorb/sensor/ph.c index 06028869e..35d51e03a 100644 --- a/system/uorb/sensor/ph.c +++ b/system/uorb/sensor/ph.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_ph_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_ph *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) ph: %.4f", - meta->o_name, message->timestamp, now - message->timestamp, - message->ph); -} +static const char sensor_ph_format[] = "timestamp:%" PRIu64 ",ph:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_ph, struct sensor_ph, print_sensor_ph_message); +ORB_DEFINE(sensor_ph, struct sensor_ph, sensor_ph_format); diff --git a/system/uorb/sensor/pm10.c b/system/uorb/sensor/pm10.c index b2e57f197..6ebb6ba47 100644 --- a/system/uorb/sensor/pm10.c +++ b/system/uorb/sensor/pm10.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_pm10_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_pm10 *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) pm10: %.4f", - meta->o_name, message->timestamp, now - message->timestamp, - message->pm10); -} +static const char sensor_pm10_format[] = "timestamp:%" PRIu64 ",pm10:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_pm10, struct sensor_pm10, print_sensor_pm10_message); +ORB_DEFINE(sensor_pm10, struct sensor_pm10, sensor_pm10_format); diff --git a/system/uorb/sensor/pm1p0.c b/system/uorb/sensor/pm1p0.c index 31a1db77e..4689d660f 100644 --- a/system/uorb/sensor/pm1p0.c +++ b/system/uorb/sensor/pm1p0.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_pm1p0_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_pm1p0 *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "pm1p0: %.4f", meta->o_name, message->timestamp, - now - message->timestamp, message->pm1p0); -} +static const char sensor_pm1p0_format[] = "timestamp:%" PRIu64 ",pm1p0:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_pm1p0, struct sensor_pm1p0, print_sensor_pm1p0_message); +ORB_DEFINE(sensor_pm1p0, struct sensor_pm1p0, sensor_pm1p0_format); diff --git a/system/uorb/sensor/pm25.c b/system/uorb/sensor/pm25.c index 83dee92cc..c64e56c0d 100644 --- a/system/uorb/sensor/pm25.c +++ b/system/uorb/sensor/pm25.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_pm25_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_pm25 *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) pm25: %.4f", - meta->o_name, message->timestamp, now - message->timestamp, - message->pm25); -} +static const char sensor_pm25_format[] = "timestamp:%" PRIu64 ",pm25:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_pm25, struct sensor_pm25, print_sensor_pm25_message); +ORB_DEFINE(sensor_pm25, struct sensor_pm25, sensor_pm25_format); diff --git a/system/uorb/sensor/ppgd.c b/system/uorb/sensor/ppgd.c index 9c6bceba1..abac23e60 100644 --- a/system/uorb/sensor/ppgd.c +++ b/system/uorb/sensor/ppgd.c @@ -29,23 +29,13 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_ppgd_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_ppgd *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "ppg1: %" PRIu32 " ppg2: %" PRIu32 " current: %" PRIu32 " " - "gain1: %" PRIu16 " gain2: %" PRIu16 "", - meta->o_name, message->timestamp, now - message->timestamp, - message->ppg[0], message->ppg[1], message->current, - message->gain[0], message->gain[1]); -} +static const char sensor_ppgd_format[] = + "timestamp:%" PRIu64 ",ppg0:%" PRIu32 ",ppg1:%" PRIu32 "," + "current:%" PRIu32 ",gain0:%" PRIu16 ",gain1:%" PRIu16 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_ppgd, struct sensor_ppgd, print_sensor_ppgd_message); +ORB_DEFINE(sensor_ppgd, struct sensor_ppgd, sensor_ppgd_format); diff --git a/system/uorb/sensor/ppgq.c b/system/uorb/sensor/ppgq.c index 92563ceb7..89e6e592c 100644 --- a/system/uorb/sensor/ppgq.c +++ b/system/uorb/sensor/ppgq.c @@ -29,25 +29,14 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_ppgq_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_ppgq *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "ppg1: %" PRIu32 " ppg2: %" PRIu32 " ppg3: %" PRIu32 " " - "ppg4: %" PRIu32 "current: %" PRIu32 " gain1: %" PRIu16 " " - "gain2: %" PRIu16 " gain3: %" PRIu16 " gain4: %" PRIu16 "", - meta->o_name, message->timestamp, now - message->timestamp, - message->ppg[0], message->ppg[1], message->ppg[2], - message->ppg[3], message->current, message->gain[0], - message->gain[1], message->gain[2], message->gain[3]); -} +static const char sensor_ppgq_format[] = + "timestamp:%" PRIu64 ",ppg0:%" PRIu32 ",ppg1:%" PRIu32 ",ppg2:%" PRIu32 "," + "ppg3:%" PRIu32 ",current:%" PRIu32 ",gain0:%" PRIu16 ",gain1:%" PRIu16 "," + "gain2:%" PRIu16 ",gain3:%" PRIu16 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_ppgq, struct sensor_ppgq, print_sensor_ppgq_message); +ORB_DEFINE(sensor_ppgq, struct sensor_ppgq, sensor_ppgq_format); diff --git a/system/uorb/sensor/prox.c b/system/uorb/sensor/prox.c index cc373d936..33d12d24d 100644 --- a/system/uorb/sensor/prox.c +++ b/system/uorb/sensor/prox.c @@ -29,20 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_prox_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_prox *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "proximity: %.4f", meta->o_name, message->timestamp, - now - message->timestamp, message->proximity); -} +static const char sensor_prox_format[] = + "timestamp:%" PRIu64 ",proximity:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_prox, struct sensor_prox, print_sensor_prox_message); +ORB_DEFINE(sensor_prox, struct sensor_prox, sensor_prox_format); diff --git a/system/uorb/sensor/rgb.c b/system/uorb/sensor/rgb.c index f5363a3fe..0f4830570 100644 --- a/system/uorb/sensor/rgb.c +++ b/system/uorb/sensor/rgb.c @@ -29,20 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_rgb_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_rgb *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) red: %.2f" - " green: %.2f blue: %.2f\n", meta->o_name, message->timestamp, - now - message->timestamp, message->r, message->g, message->b); -} +static const char sensor_rgb_format[] = + "timestamp:%" PRIu64 ",r:%hf,g:%hf,b:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_rgb, struct sensor_rgb, print_sensor_rgb_message); +ORB_DEFINE(sensor_rgb, struct sensor_rgb, sensor_rgb_format); diff --git a/system/uorb/sensor/temp.c b/system/uorb/sensor/temp.c index 428d51c6d..e24089d23 100644 --- a/system/uorb/sensor/temp.c +++ b/system/uorb/sensor/temp.c @@ -29,20 +29,12 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_temp_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_temp *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) " - "temperature: %.4f", meta->o_name, message->timestamp, - now - message->timestamp, message->temperature); -} +static const char sensor_temp_format[] = + "timestamp:%" PRIu64 ",temperature:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_temp, struct sensor_temp, print_sensor_temp_message); +ORB_DEFINE(sensor_temp, struct sensor_temp, sensor_temp_format); diff --git a/system/uorb/sensor/tvoc.c b/system/uorb/sensor/tvoc.c index b3cf21846..2ffb83141 100644 --- a/system/uorb/sensor/tvoc.c +++ b/system/uorb/sensor/tvoc.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_tvoc_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_tvoc *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) tvoc: %.4f", - meta->o_name, message->timestamp, now - message->timestamp, - message->tvoc); -} +static const char sensor_tvoc_format[] = "timestamp:%" PRIu64 ",tvoc:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_tvoc, struct sensor_tvoc, print_sensor_tvoc_message); +ORB_DEFINE(sensor_tvoc, struct sensor_tvoc, sensor_tvoc_format); diff --git a/system/uorb/sensor/uv.c b/system/uorb/sensor/uv.c index 0e827c675..7c4cd205b 100644 --- a/system/uorb/sensor/uv.c +++ b/system/uorb/sensor/uv.c @@ -29,20 +29,11 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_sensor_uv_message(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct sensor_uv *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %" PRIu64 " (%" PRIu64 " us ago) uvi: %.4f", - meta->o_name, message->timestamp, now - message->timestamp, - message->uvi); -} +static const char sensor_uv_format[] = "timestamp:%" PRIu64 ",uvi:%hf"; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(sensor_uv, struct sensor_uv, print_sensor_uv_message); +ORB_DEFINE(sensor_uv, struct sensor_uv, sensor_uv_format); diff --git a/system/uorb/test/utility.c b/system/uorb/test/utility.c index c56ea39b9..2b65258de 100644 --- a/system/uorb/test/utility.c +++ b/system/uorb/test/utility.c @@ -32,58 +32,24 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_UORB -static void print_orb_test_msg(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct orb_test_s *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %"PRIu64" (%"PRIu64" us ago) val: %"PRId32"", - meta->o_name, message->timestamp, now - message->timestamp, - message->val); -} - -static void print_orb_test_medium_msg(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct orb_test_medium_s *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %"PRIu64" (%"PRIu64" us ago) val: %"PRId32"", - meta->o_name, message->timestamp, now - message->timestamp, - message->val); -} - -static void print_orb_test_large_msg(FAR const struct orb_metadata *meta, - FAR const void *buffer) -{ - FAR const struct orb_test_large_s *message = buffer; - const orb_abstime now = orb_absolute_time(); - - uorbinfo_raw("%s:\ttimestamp: %"PRIu64" (%"PRIu64" us ago) val: %"PRId32"", - meta->o_name, message->timestamp, now - message->timestamp, - message->val); -} +static const char orb_test_format[] = + "timestamp:%" PRIu64 ",val:%" PRId32 ""; #endif /**************************************************************************** * Public Data ****************************************************************************/ -ORB_DEFINE(orb_test, struct orb_test_s, print_orb_test_msg); -ORB_DEFINE(orb_multitest, struct orb_test_s, print_orb_test_msg); -ORB_DEFINE(orb_test_medium, struct orb_test_medium_s, - print_orb_test_medium_msg); -ORB_DEFINE(orb_test_medium_multi, struct orb_test_medium_s, - print_orb_test_medium_msg); +ORB_DEFINE(orb_test, struct orb_test_s, orb_test_format); +ORB_DEFINE(orb_multitest, struct orb_test_s, orb_test_format); +ORB_DEFINE(orb_test_medium, struct orb_test_medium_s, orb_test_format); +ORB_DEFINE(orb_test_medium_multi, struct orb_test_medium_s, orb_test_format); ORB_DEFINE(orb_test_medium_wrap_around, struct orb_test_medium_s, - print_orb_test_medium_msg); -ORB_DEFINE(orb_test_medium_queue, struct orb_test_medium_s, - print_orb_test_medium_msg); + orb_test_format); +ORB_DEFINE(orb_test_medium_queue, struct orb_test_medium_s, orb_test_format); ORB_DEFINE(orb_test_medium_queue_poll, struct orb_test_medium_s, - print_orb_test_medium_msg); -ORB_DEFINE(orb_test_large, struct orb_test_large_s, - print_orb_test_large_msg); + orb_test_format); +ORB_DEFINE(orb_test_large, struct orb_test_large_s, orb_test_format); /**************************************************************************** * Public Functions