Ver código fonte

vive: rename vive_sensor_packet to vive_headset_imu_packet.

Lubosz Sarnecki 7 anos atrás
pai
commit
7ad8a145f1
3 arquivos alterados com 8 adições e 8 exclusões
  1. 1 1
      src/drv_htc_vive/packet.c
  2. 3 3
      src/drv_htc_vive/vive.c
  3. 4 4
      src/drv_htc_vive/vive.h

+ 1 - 1
src/drv_htc_vive/packet.c

@@ -26,7 +26,7 @@ inline static uint32_t read32(const unsigned char** buffer)
 	return ret;
 }
 
-bool vive_decode_sensor_packet(vive_sensor_packet* pkt, const unsigned char* buffer, int size)
+bool vive_decode_sensor_packet(vive_headset_imu_packet* pkt, const unsigned char* buffer, int size)
 {
 	if(size != 52){
 		LOGE("invalid vive sensor packet size (expected 52 but got %d)", size);

+ 3 - 3
src/drv_htc_vive/vive.c

@@ -76,7 +76,7 @@ static bool process_error(vive_priv* priv)
 	return false;
 }
 
-vive_sensor_sample* get_next_sample(vive_sensor_packet* pkt, int last_seq)
+vive_headset_imu_sample* get_next_sample(vive_headset_imu_packet* pkt, int last_seq)
 {
 	int diff[3];
 
@@ -115,10 +115,10 @@ static void update_device(ohmd_device* device)
 
 	while((size = hid_read(priv->imu_handle, buffer, FEATURE_BUFFER_SIZE)) > 0){
 		if(buffer[0] == VIVE_IRQ_SENSORS){
-			vive_sensor_packet pkt;
+			vive_headset_imu_packet pkt;
 			vive_decode_sensor_packet(&pkt, buffer, size);
 
-			vive_sensor_sample* smp = NULL;
+			vive_headset_imu_sample* smp = NULL;
 
 			while((smp = get_next_sample(&pkt, priv->last_seq)) != NULL)
 			{

+ 4 - 4
src/drv_htc_vive/vive.h

@@ -19,13 +19,13 @@ typedef struct
 	int16_t rot[3];
 	uint32_t time_ticks;
 	uint8_t seq;
-} vive_sensor_sample;
+} vive_headset_imu_sample;
 
 typedef struct
 {
 	uint8_t report_id;
-	vive_sensor_sample samples[3];
-} vive_sensor_packet;
+	vive_headset_imu_sample samples[3];
+} vive_headset_imu_packet;
 
 typedef struct
 {
@@ -35,7 +35,7 @@ typedef struct
 } vive_config_packet;
 
 void vec3f_from_vive_vec(const int16_t* smp, vec3f* out_vec);
-bool vive_decode_sensor_packet(vive_sensor_packet* pkt, const unsigned char* buffer, int size);
+bool vive_decode_sensor_packet(vive_headset_imu_packet* pkt, const unsigned char* buffer, int size);
 bool vive_decode_config_packet(vive_config_packet* pkt, const unsigned char* buffer, uint16_t size);
 
 #endif