TEMPERATURE_BASE_DATA_SET and TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME were the same.
TEMPERATURE_BASE_DATA_SET has been removed.
TEMPERATURE_BASE_DATA_SET was used for polling events and TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME was used for event driven.
Since both these represent the same pressure event, DATA_SET type has been removed and TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME has been renamed to TEMPERATURE_RAW_DATA_EVENT to make it simpler.
These representations have been shifted to sensor_deprecated.h in case other packages outside sensord are using these representations.
Change-Id: I7ebe005fcb2dd236cabf4c209a4456973f4597d1
FILL_LOG_ELEMENT(LOG_ID_EVENT, LINEAR_ACCEL_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
FILL_LOG_ELEMENT(LOG_ID_EVENT, ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_RAW_DATA_EVENT, 0, 10),
- FILL_LOG_ELEMENT(LOG_ID_EVENT, TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
+ FILL_LOG_ELEMENT(LOG_ID_EVENT, TEMPERATURE_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, GRAVITY_BASE_DATA_SET, 0, 25),
FILL_LOG_ELEMENT(LOG_ID_DATA, LINEAR_ACCEL_BASE_DATA_SET, 0, 25),
FILL_LOG_ELEMENT(LOG_ID_DATA, ORIENTATION_BASE_DATA_SET, 0, 25),
- FILL_LOG_ELEMENT(LOG_ID_DATA, TEMPERATURE_BASE_DATA_SET, 0, 25),
};
typedef unordered_map<unsigned int, log_attr* > log_map;
#define ACCELEROMETER_EVENT_CALIBRATION_NEEDED 0x01
#define ACCELEROMETER_EVENT_SET_WAKEUP 0x02
+#define TEMPERATURE_BASE_DATA_SET (TEMPERATURE_SENSOR << 16) | 0x0001
+#define TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME (TEMPERATURE_SENSOR << 16) | 0x0001
+
enum accelerometer_rotate_state {
ROTATION_UNKNOWN = 0,
ROTATION_LANDSCAPE_LEFT = 1,
* @{
*/
-enum temperature_data_id {
- TEMPERATURE_BASE_DATA_SET = (TEMPERATURE_SENSOR << 16) | 0x0001,
-};
-
enum temperature_event_type {
- TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME = (TEMPERATURE_SENSOR << 16) | 0x0001,
+ TEMPERATURE_RAW_DATA_EVENT = (TEMPERATURE_SENSOR << 16) | 0x0001,
};
/**
{
m_name = string(SENSOR_NAME);
- register_supported_event(TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME);
+ register_supported_event(TEMPERATURE_RAW_DATA_EVENT);
physical_sensor::set_poller(temperature_sensor::working, this);
}
AUTOLOCK(m_client_info_mutex);
- if (get_client_cnt(TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME)) {
+ if (get_client_cnt(TEMPERATURE_RAW_DATA_EVENT)) {
event.sensor_id = get_id();
- event.event_type = TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME;
+ event.event_type = TEMPERATURE_RAW_DATA_EVENT;
raw_to_base(event.data);
push(event);
}
if (ret < 0)
return -1;
- if (type == TEMPERATURE_BASE_DATA_SET) {
+ if (type == TEMPERATURE_RAW_DATA_EVENT) {
raw_to_base(data);
return 0;
}
result = check_sensor_api(ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, interval);
fprintf(fp, "Rotation Vector - RAW_DATA_REPORT_ON_TIME - %d\n", result);
- result = check_sensor_api(TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME, interval);
+ result = check_sensor_api(TEMPERATURE_RAW_DATA_EVENT, interval);
fprintf(fp, "Temperature - RAW_DATA_REPORT_ON_TIME - %d\n", result);
printf("Logs printed in ./auto_test.output\n");
break;
case TEMPERATURE_SENSOR:
if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0)
- return TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME;
+ return TEMPERATURE_RAW_DATA_EVENT;
break;
case PROXIMITY_SENSOR:
if (strcmp(str, "EVENT_CHANGE_STATE") == 0)
}
else if (strcmp(argv[1], "temperature") == 0) {
sensor_type = TEMPERATURE_SENSOR;
- event = TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME;
+ event = TEMPERATURE_RAW_DATA_EVENT;
}
else if (strcmp(argv[1], "geomagnetic") == 0) {
sensor_type = GEOMAGNETIC_SENSOR;