RbGps 0.2 → 0.3

data/rb_gps.c

@@ -1,10 +1,9 @@
 
-
-#include <ruby.h>
-#include <errno.h>
 #include "version.h"
-#include "gps.h"
-
+#include <errno.h>
+#include <gps.h>
+#include <math.h>
+#include <ruby.h>
 #include <stdio.h>
 
 /* classes */
@@ -37,10 +36,25 @@ struct _symbols {
   VALUE fix_climb;
 
   VALUE sat_prn;
+
   VALUE sat_elevation;
   VALUE sat_azimuth;
   VALUE sat_ss;
   VALUE sat_used;
+
+  VALUE prec_time;
+  VALUE prec_horiz;
+  VALUE prec_spheric;
+  VALUE prec_speed;
+  VALUE prec_vert;
+  VALUE prec_climb;
+  VALUE prec_sat_used;
+  VALUE prec_sat_visible;
+  VALUE prec_pdop;
+  VALUE prec_hdop;
+  VALUE prec_vdop;
+  VALUE prec_tdop;
+  VALUE prec_gdop;
 };
 
 static struct _symbols symbolTable;
@@ -149,9 +163,11 @@ static VALUE rbGps_get_fix(VALUE self) {
   if (!fix)
     return Qnil;
   VALUE ret=rb_hash_new();
-  
-  rb_hash_aset(ret,symbolTable.fix_time,rb_float_new(fix->time));
-
+  if (isnan(fix->time)) {
+    rb_hash_aset(ret,symbolTable.fix_time,Qnil);  
+  } else {
+    rb_hash_aset(ret,symbolTable.fix_time,rb_float_new(fix->time));
+  }
   if (fix->mode==MODE_NO_FIX) {
     rb_hash_aset(ret,symbolTable.fix_mode,symbolTable.mode_no_fix);
   } else if (fix->mode==MODE_2D) {
@@ -207,6 +223,58 @@ static VALUE rbGps_get_sat(VALUE self) {
   return ret;
 }
 
+
+
+static VALUE rbGps_get_prec(VALUE self) {
+  rb_Gps_cls *obj=0;
+  Data_Get_Struct(self, rb_Gps_cls, obj);
+  if (!obj->gps_data)
+    return Qnil;
+  const struct gps_data_t *gps_data=obj->gps_data;
+  const struct gps_fix_t *fix=&(gps_data->fix);  
+  if (!fix)
+    return Qnil;
+  VALUE ret=rb_hash_new();
+  
+  rb_hash_aset(ret,symbolTable.prec_time,rb_float_new(fix->ept));
+
+  if (fix->mode==MODE_2D || fix->mode==MODE_3D) {
+    rb_hash_aset(ret,symbolTable.prec_horiz,rb_float_new(fix->eph));
+    rb_hash_aset(ret,symbolTable.prec_spheric,rb_float_new(gps_data->epe));
+    rb_hash_aset(ret,symbolTable.prec_speed,rb_float_new(fix->eps));
+  } else {
+    rb_hash_aset(ret,symbolTable.prec_horiz,Qnil);
+    rb_hash_aset(ret,symbolTable.prec_spheric,Qnil);
+    rb_hash_aset(ret,symbolTable.prec_speed,Qnil);
+  }
+
+  if (fix->mode==MODE_3D) {
+    rb_hash_aset(ret,symbolTable.prec_vert,rb_float_new(fix->epv));
+    rb_hash_aset(ret,symbolTable.prec_climb,rb_float_new(fix->epc));
+  } else {
+    rb_hash_aset(ret,symbolTable.prec_vert,Qnil);
+    rb_hash_aset(ret,symbolTable.prec_climb,Qnil);
+  }
+  rb_hash_aset(ret,symbolTable.prec_sat_used,INT2NUM(gps_data->satellites_used));
+  rb_hash_aset(ret,symbolTable.prec_sat_visible,INT2NUM(gps_data->satellites));
+
+  rb_hash_aset(ret,symbolTable.prec_pdop,rb_float_new(gps_data->pdop));
+  rb_hash_aset(ret,symbolTable.prec_hdop,rb_float_new(gps_data->hdop));
+  rb_hash_aset(ret,symbolTable.prec_vdop,rb_float_new(gps_data->vdop));
+  rb_hash_aset(ret,symbolTable.prec_tdop,rb_float_new(gps_data->tdop));
+  rb_hash_aset(ret,symbolTable.prec_gdop,rb_float_new(gps_data->gdop));
+
+
+  return ret;
+}
+
+
+
+
+
+
+
+
 static void fill_symbol_table() {
   symbolTable.online=ID2SYM(rb_intern("online"));
 
@@ -236,6 +304,22 @@ static void fill_symbol_table() {
   symbolTable.sat_ss=ID2SYM(rb_intern("ss"));
   symbolTable.sat_used=ID2SYM(rb_intern("used"));
 
+  symbolTable.prec_time=ID2SYM(rb_intern("prec_time"));
+  symbolTable.prec_horiz=ID2SYM(rb_intern("prec_horizontal"));
+  symbolTable.prec_spheric=ID2SYM(rb_intern("prec_spherical"));
+  symbolTable.prec_speed=ID2SYM(rb_intern("prec_speed"));
+  symbolTable.prec_vert=ID2SYM(rb_intern("prec_vertical"));
+  symbolTable.prec_climb=ID2SYM(rb_intern("prec_climb"));
+
+  symbolTable.prec_sat_used=ID2SYM(rb_intern("prec_sat_used"));
+  symbolTable.prec_sat_visible=ID2SYM(rb_intern("prec_sat_visible"));
+
+  symbolTable.prec_pdop=ID2SYM(rb_intern("prec_pdop"));
+  symbolTable.prec_hdop=ID2SYM(rb_intern("prec_hdop"));
+  symbolTable.prec_vdop=ID2SYM(rb_intern("prec_vdop"));
+  symbolTable.prec_tdop=ID2SYM(rb_intern("prec_tdop"));
+  symbolTable.prec_gdop=ID2SYM(rb_intern("prec_gdop"));
+
 
 }
 
@@ -251,7 +335,8 @@ void Init_RbGps() {
   rb_define_method(cRbGps, "poll"        , rbGps_poll                    , 0);
   rb_define_method(cRbGps, "get"         , rbGps_get                     , 0);
   rb_define_method(cRbGps, "get_fix"     , rbGps_get_fix                 , 0);
-  rb_define_method(cRbGps, "get_sat"     , rbGps_get_sat                 , 0);
+  rb_define_method(cRbGps, "get_sat"     , rbGps_get_sat                 , 0); 
+  rb_define_method(cRbGps, "get_prec"    , rbGps_get_prec                 , 0);
   rb_define_method(cRbGps, "query"       , rbGps_query                 , 1);
  
 }

data/test.rb

@@ -5,16 +5,22 @@ def  dump_sats(sats)
      count=0
     sats.each do |sat|
       count=count+1
-      line=sat.keys.collect { |key| "#{key} #{sat[key]}" }
-      puts "#{count} "+line.join(' ')
+      line=sat.keys.collect { |key| "#{key} #{sprintf("%-5s",sat[key])}" }
+      puts "#{sprintf("%2i ",count)} "+line.join(' ')
     end 
 end
 
 def dump_fix(fix)
+      fix[:time]=Time::at(fix[:time]) unless fix[:time].nil?
       line=fix.keys.collect { |key| "#{key} #{fix[key]}" }
       puts line.join(' ')
 end
 
+def dump_prec(fix)
+      line=fix.keys.collect { |key| "#{key.to_s.gsub(/^prec_/,'')} #{fix[key]}" }
+      puts "prec "+line.join(' ')
+end
+
 
 gps=RbGps.new('localhost','2947')
 
@@ -29,7 +35,9 @@ loop do
 	 res=gps.get
 	 puts res.to_yaml
 	 dump_fix(gps.get_fix)
-	 puts "next"
+	 dump_prec(gps.get_prec)
 	 dump_sats(gps.get_sat)
+	 puts "next"
+
 	 sleep 1
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RbGps
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Jurgen Van Ham
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-22 00:00:00 +01:00
+date: 2009-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ files:
 - ./rb_gps.c
 - ./test.rb
 - ./extconf.rb
+- ./RbGps.so
 has_rdoc: false
 homepage: http://gpsd.berlios.de/
 post_install_message: