FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, GEOMAGNETIC_RV_SENSOR, 0, 1),
FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_EVENT_CALIBRATION_NEEDED, 0, 1),
- FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_EVENT_CHANGE_STATE, 0,1),
+ FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_CHANGE_STATE_EVENT, 0,1),
FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_EVENT_CHANGE_LEVEL, 0, 1),
- FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_EVENT_STATE_REPORT_ON_TIME, 0, 10),
- FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME, 0, 10),
+ FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_STATE_EVENT, 0, 10),
+ FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_DISTANCE_DATA_EVENT, 0, 10),
FILL_LOG_ELEMENT(LOG_ID_EVENT, CONTEXT_EVENT_REPORT, 0, 1),
FILL_LOG_ELEMENT(LOG_ID_EVENT, AUTO_ROTATION_EVENT_CHANGE_STATE, 0, 1),
FILL_LOG_ELEMENT(LOG_ID_EVENT, ACCELEROMETER_RAW_DATA_EVENT, 0, 10),
FILL_LOG_ELEMENT(LOG_ID_EVENT, ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
- FILL_LOG_ELEMENT(LOG_ID_DATA, PROXIMITY_BASE_DATA_SET, 0, 25),
- FILL_LOG_ELEMENT(LOG_ID_DATA, PROXIMITY_DISTANCE_DATA_SET, 0, 25),
FILL_LOG_ELEMENT(LOG_ID_DATA, PRESSURE_BASE_DATA_SET, 0, 25),
FILL_LOG_ELEMENT(LOG_ID_DATA, GEOMAGNETIC_BASE_DATA_SET, 0, 25),
FILL_LOG_ELEMENT(LOG_ID_DATA, LIGHT_BASE_DATA_SET, 0, 25),
{
switch (event_type ) {
case ACCELEROMETER_RAW_DATA_EVENT:
- case PROXIMITY_EVENT_STATE_REPORT_ON_TIME:
+ case PROXIMITY_STATE_EVENT:
case GYROSCOPE_RAW_DATA_EVENT:
case LIGHT_EVENT_LEVEL_DATA_REPORT_ON_TIME:
case GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME:
case LIGHT_EVENT_LUX_DATA_REPORT_ON_TIME:
- case PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME:
+ case PROXIMITY_DISTANCE_DATA_EVENT:
case GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME:
case LINEAR_ACCEL_EVENT_RAW_DATA_REPORT_ON_TIME:
case ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME:
switch (event_type) {
case GEOMAGNETIC_EVENT_CALIBRATION_NEEDED:
case LIGHT_EVENT_CHANGE_LEVEL:
- case PROXIMITY_EVENT_CHANGE_STATE:
+ case PROXIMITY_CHANGE_STATE_EVENT:
case AUTO_ROTATION_EVENT_CHANGE_STATE:
return true;
break;
* @{
*/
-enum proxi_data_id {
- PROXIMITY_BASE_DATA_SET = (PROXIMITY_SENSOR << 16) | 0x0001,
- PROXIMITY_DISTANCE_DATA_SET = (PROXIMITY_SENSOR << 16) | 0x0002,
-};
-
enum proxi_event_type {
- PROXIMITY_EVENT_CHANGE_STATE = (PROXIMITY_SENSOR << 16) | 0x0001,
- PROXIMITY_EVENT_STATE_REPORT_ON_TIME = (PROXIMITY_SENSOR << 16) | 0x0002,
- PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME = (PROXIMITY_SENSOR << 16) | 0x0004,
+ PROXIMITY_CHANGE_STATE_EVENT = (PROXIMITY_SENSOR << 16) | 0x0001,
+ PROXIMITY_STATE_EVENT = (PROXIMITY_SENSOR << 16) | 0x0002,
+ PROXIMITY_DISTANCE_DATA_EVENT = (PROXIMITY_SENSOR << 16) | 0x0004,
};
enum proxi_change_state {
{
m_name = string(SENSOR_NAME);
- register_supported_event(PROXIMITY_EVENT_CHANGE_STATE);
- register_supported_event(PROXIMITY_EVENT_STATE_REPORT_ON_TIME);
- register_supported_event(PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME);
+ register_supported_event(PROXIMITY_CHANGE_STATE_EVENT);
+ register_supported_event(PROXIMITY_STATE_EVENT);
+ register_supported_event(PROXIMITY_DISTANCE_DATA_EVENT);
physical_sensor::set_poller(proxi_sensor::working, this);
}
AUTOLOCK(m_mutex);
event.sensor_id = get_id();
- if (get_client_cnt(PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME)) {
- event.event_type = PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME;
+ if (get_client_cnt(PROXIMITY_DISTANCE_DATA_EVENT)) {
+ event.event_type = PROXIMITY_DISTANCE_DATA_EVENT;
raw_to_base(event.data);
push(event);
}
AUTOLOCK(m_value_mutex);
m_state = state;
- if (get_client_cnt(PROXIMITY_EVENT_CHANGE_STATE)) {
- event.event_type = PROXIMITY_EVENT_CHANGE_STATE;
+ if (get_client_cnt(PROXIMITY_CHANGE_STATE_EVENT)) {
+ event.event_type = PROXIMITY_CHANGE_STATE_EVENT;
raw_to_base(event.data);
push(event);
}
{
int state;
- if ((type != PROXIMITY_BASE_DATA_SET) && (type != PROXIMITY_DISTANCE_DATA_SET))
+ if ((type != PROXIMITY_CHANGE_STATE_EVENT) && (type != PROXIMITY_STATE_EVENT))
return -1;
state = m_sensor_hal->get_sensor_data(data);