Skip to content

Commit 0fa1062

Browse files
BernardXiongBernardXiong
committed
[Sensor] code cleanup
1 parent c319182 commit 0fa1062

File tree

2 files changed

+113
-99
lines changed

2 files changed

+113
-99
lines changed

‎components/drivers/sensors/sensor.cpp‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#include <stddef.h>
22
#include "sensor.h"
33

4-
/**
4+
/**
55
* Sensor
66
*/
77
Sensor::Sensor()
88
{
9-
this->next = this->prev = NULL;
10-
Subscribe(NULL, NULL);
9+
this->next = this->prev = NULL;
10+
Subscribe(NULL, NULL);
1111
}
1212

1313
Sensor::~Sensor()
@@ -19,21 +19,21 @@ int Sensor::GetType(void)
1919
return this->type;
2020
}
2121

22-
int Sensor::Subscribe(SensorEventHandler_t *handler, void* user_data)
22+
int Sensor::Subscribe(SensorEventHandler_t *handler, void *user_data)
2323
{
2424
this->evtHandler = handler;
2525
this->userData = user_data;
2626

2727
return 0;
2828
}
2929

30-
int Sensor::Publish(sensors_event_t* event)
30+
int Sensor::Publish(sensors_event_t *event)
3131
{
32-
if (this->evtHandler != NULL)
33-
{
34-
/* invoke subscribed handler */
35-
(*evtHandler)(this, event, this->userData);
36-
}
32+
if (this->evtHandler != NULL)
33+
{
34+
/* invoke subscribed handler */
35+
(*evtHandler)(this, event, this->userData);
36+
}
3737

3838
return 0;
3939
}
@@ -46,89 +46,89 @@ static SensorManager _sensor_manager;
4646

4747
SensorManager::SensorManager()
4848
{
49-
sensorList = NULL;
49+
sensorList = NULL;
5050
}
5151

5252
SensorManager::~SensorManager()
5353
{
5454
}
5555

56-
int SensorManager::RegisterSensor(Sensor* sensor)
56+
int SensorManager::RegisterSensor(Sensor *sensor)
5757
{
58-
SensorManager* self = &_sensor_manager;
59-
58+
SensorManager *self = &_sensor_manager;
59+
6060
RT_ASSERT(sensor != RT_NULL);
6161

62-
/* add sensor into the list */
63-
if (self->sensorList = NULL)
64-
{
65-
sensor->prev = sensor->next = sensor;
66-
}
67-
else
68-
{
69-
sensor->prev = self->sensorList;
70-
sensor->next = self->sensorList->next;
62+
/* add sensor into the list */
63+
if (self->sensorList = NULL)
64+
{
65+
sensor->prev = sensor->next = sensor;
66+
}
67+
else
68+
{
69+
sensor->prev = self->sensorList;
70+
sensor->next = self->sensorList->next;
7171

72-
self->sensorList->next->prev = sensor;
73-
self->sensorList->next = sensor;
74-
}
72+
self->sensorList->next->prev = sensor;
73+
self->sensorList->next = sensor;
74+
}
7575

76-
/* point the sensorList to this sensor */
77-
self->sensorList = sensor;
76+
/* point the sensorList to this sensor */
77+
self->sensorList = sensor;
7878

79-
return 0;
79+
return 0;
8080
}
8181

82-
int SensorManager::DeregisterSensor(Sensor* sensor)
82+
int SensorManager::DeregisterSensor(Sensor *sensor)
8383
{
84-
SensorManager* self = &_sensor_manager;
84+
SensorManager *self = &_sensor_manager;
8585

86-
/* disconnect sensor list */
87-
sensor->next->prev = sensor->prev;
88-
sensor->prev->next = sensor->next;
86+
/* disconnect sensor list */
87+
sensor->next->prev = sensor->prev;
88+
sensor->prev->next = sensor->next;
8989

90-
/* check the sensorList */
91-
if (sensor == self->sensorList)
92-
{
93-
if (sensor->next == sensor) self->sensorList = NULL; /* empty list */
94-
else self->sensorList = sensor->next;
95-
}
90+
/* check the sensorList */
91+
if (sensor == self->sensorList)
92+
{
93+
if (sensor->next == sensor) self->sensorList = NULL; /* empty list */
94+
else self->sensorList = sensor->next;
95+
}
9696

97-
/* re-initialize sensor node */
98-
sensor->next = sensor->prev = sensor;
97+
/* re-initialize sensor node */
98+
sensor->next = sensor->prev = sensor;
9999

100100
return 0;
101101
}
102102

103103
Sensor *SensorManager::GetDefaultSensor(int type)
104104
{
105-
SensorManager* self = &_sensor_manager;
106-
Sensor *sensor = self->sensorList;
105+
SensorManager *self = &_sensor_manager;
106+
Sensor *sensor = self->sensorList;
107107

108-
if (sensor == NULL) return NULL;
108+
if (sensor == NULL) return NULL;
109109

110-
do
111-
{
112-
/* find the same type */
113-
if (sensor->GetType() == type) return sensor;
110+
do
111+
{
112+
/* find the same type */
113+
if (sensor->GetType() == type) return sensor;
114114

115-
sensor = sensor->next;
116-
}
117-
while (sensor != self->sensorList);
115+
sensor = sensor->next;
116+
}
117+
while (sensor != self->sensorList);
118118

119119
return NULL;
120120
}
121121

122-
int SensorManager::Subscribe(int type, SensorEventHandler_t *handler, void* user_data)
122+
int SensorManager::Subscribe(int type, SensorEventHandler_t *handler, void *user_data)
123123
{
124-
Sensor *sensor;
125-
126-
sensor = SensorManager::GetDefaultSensor(type);
127-
if (sensor != NULL)
128-
{
129-
sensor->Subscribe(handler, user_data);
130-
return 0;
131-
}
124+
Sensor *sensor;
125+
126+
sensor = SensorManager::GetDefaultSensor(type);
127+
if (sensor != NULL)
128+
{
129+
sensor->Subscribe(handler, user_data);
130+
return 0;
131+
}
132132

133133
return -1;
134134
}

‎components/drivers/sensors/sensor.h‎

Lines changed: 52 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,17 @@
5555
* Availability: SENSORS_DEVICE_API_VERSION_1_0
5656
* see (*batch)() documentation for details
5757
*/
58-
enum {
58+
enum
59+
{
5960
SENSORS_BATCH_DRY_RUN = 0x00000001,
6061
SENSORS_BATCH_WAKE_UPON_FIFO_FULL = 0x00000002
6162
};
6263

6364
/*
6465
* what field for meta_data_event_t
6566
*/
66-
enum {
67+
enum
68+
{
6769
/* a previous flush operation has completed */
6870
META_DATA_FLUSH_COMPLETE = 1,
6971
META_DATA_VERSION /* always last, leave auto-assigned */
@@ -749,14 +751,17 @@ enum {
749751
*/
750752
typedef struct
751753
{
752-
union {
754+
union
755+
{
753756
float v[3];
754-
struct {
757+
struct
758+
{
755759
float x;
756760
float y;
757761
float z;
758762
};
759-
struct {
763+
struct
764+
{
760765
float azimuth;
761766
float pitch;
762767
float roll;
@@ -771,22 +776,26 @@ typedef struct
771776
*/
772777
typedef struct
773778
{
774-
union {
775-
float uncalib[3];
776-
struct {
777-
float x_uncalib;
778-
float y_uncalib;
779-
float z_uncalib;
779+
union
780+
{
781+
float uncalib[3];
782+
struct
783+
{
784+
float x_uncalib;
785+
float y_uncalib;
786+
float z_uncalib;
787+
};
780788
};
781-
};
782-
union {
783-
float bias[3];
784-
struct {
785-
float x_bias;
786-
float y_bias;
787-
float z_bias;
789+
union
790+
{
791+
float bias[3];
792+
struct
793+
{
794+
float x_bias;
795+
float y_bias;
796+
float z_bias;
797+
};
788798
};
789-
};
790799
} uncalibrated_event_t;
791800

792801
typedef struct meta_data_event
@@ -799,7 +808,8 @@ typedef struct meta_data_event
799808
* Union of the various types of sensor data
800809
* that can be returned.
801810
*/
802-
typedef struct sensors_event_t {
811+
typedef struct sensors_event_t
812+
{
803813
/* must be sizeof(struct sensors_event_t) */
804814
int32_t version;
805815

@@ -815,8 +825,10 @@ typedef struct sensors_event_t {
815825
/* time is in nanosecond */
816826
int64_t timestamp;
817827

818-
union {
819-
union {
828+
union
829+
{
830+
union
831+
{
820832
float data[16];
821833

822834
/* acceleration values are in meter per second per second (m/s^2) */
@@ -859,7 +871,8 @@ typedef struct sensors_event_t {
859871
meta_data_event_t meta_data;
860872
};
861873

862-
union {
874+
union
875+
{
863876
uint64_t data[8];
864877

865878
/* step-counter */
@@ -872,15 +885,16 @@ typedef struct sensors_event_t {
872885
/* see SENSOR_TYPE_META_DATA */
873886
typedef sensors_event_t sensors_meta_data_event_t;
874887

875-
typedef struct sensor_t {
888+
typedef struct sensor_t
889+
{
876890

877891
/* Name of this sensor.
878892
* All sensors of the same "type" must have a different "name".
879893
*/
880-
const char* name;
894+
const char *name;
881895

882896
/* vendor of the hardware part */
883-
const char* vendor;
897+
const char *vendor;
884898

885899
/* version of the hardware part + driver. The value of this field
886900
* must increase when the driver is updated in a way that changes the
@@ -929,7 +943,7 @@ typedef struct sensor_t {
929943
uint32_t fifoMaxEventCount;
930944

931945
/* reserved fields, must be zero */
932-
void* reserved[6];
946+
void *reserved[6];
933947
} sensor_t;
934948

935949
class SensorConfigure
@@ -939,7 +953,7 @@ class SensorConfigure
939953

940954
class Sensor;
941955
class SensorManager;
942-
typedef void (*SensorEventHandler_t)(Sensor* sensor, sensors_event_t* event, void* user_data);
956+
typedef void (*SensorEventHandler_t)(Sensor *sensor, sensors_event_t *event, void *user_data);
943957

944958
/**
945959
* Sensor Base Class
@@ -961,17 +975,17 @@ class Sensor
961975

962976
int GetType(void);
963977

964-
int Subscribe(SensorEventHandler_t *handler, void* user_data);
965-
int Publish(sensors_event_t* event);
978+
int Subscribe(SensorEventHandler_t *handler, void *user_data);
979+
int Publish(sensors_event_t *event);
966980

967-
protected:
981+
protected:
968982
Sensor *next;
969-
Sensor *prev;
983+
Sensor *prev;
970984

971985
SensorEventHandler_t *evtHandler;
972986
void *userData;
973987

974-
friend class SensorManager;
988+
friend class SensorManager;
975989
};
976990

977991
/**
@@ -982,15 +996,15 @@ class SensorManager
982996
public:
983997
SensorManager();
984998
~SensorManager();
985-
986-
static int RegisterSensor(Sensor* sensor);
987-
static int DeregisterSensor(Sensor* sensor);
999+
1000+
static int RegisterSensor(Sensor *sensor);
1001+
static int DeregisterSensor(Sensor *sensor);
9881002

9891003
static Sensor *GetDefaultSensor(int type);
990-
static int Subscribe(int type, SensorEventHandler_t *handler, void* user_data);
1004+
static int Subscribe(int type, SensorEventHandler_t *handler, void *user_data);
9911005

9921006
private:
993-
Sensor* sensorList;
1007+
Sensor *sensorList;
9941008
};
9951009

9961010
#endif

0 commit comments

Comments
 (0)