RbGps 0.1 → 0.2

data/rb_gps.c

@@ -33,7 +33,14 @@ struct _symbols {
   VALUE fix_longitude;
   VALUE fix_altitude;
   VALUE fix_speed;
-
+  VALUE fix_heading;
+  VALUE fix_climb;
+
+  VALUE sat_prn;
+  VALUE sat_elevation;
+  VALUE sat_azimuth;
+  VALUE sat_ss;
+  VALUE sat_used;
 };
 
 static struct _symbols symbolTable;
@@ -159,15 +166,19 @@ static VALUE rbGps_get_fix(VALUE self) {
   if (fix->mode==MODE_2D || fix->mode==MODE_3D) {
     rb_hash_aset(ret,symbolTable.fix_latitude,rb_float_new(fix->latitude));
     rb_hash_aset(ret,symbolTable.fix_longitude,rb_float_new(fix->longitude));
+    rb_hash_aset(ret,symbolTable.fix_heading,rb_float_new(fix->track));
   } else {
     rb_hash_aset(ret,symbolTable.fix_latitude,Qnil);
     rb_hash_aset(ret,symbolTable.fix_longitude,Qnil);
+    rb_hash_aset(ret,symbolTable.fix_heading,Qnil);
   }
 
   if (fix->mode==MODE_3D) {
     rb_hash_aset(ret,symbolTable.fix_altitude,rb_float_new(fix->altitude));
+    rb_hash_aset(ret,symbolTable.fix_climb,rb_float_new(fix->climb));
   } else {
     rb_hash_aset(ret,symbolTable.fix_altitude,Qnil);
+    rb_hash_aset(ret,symbolTable.fix_climb,Qnil);
   }
   rb_hash_aset(ret,symbolTable.fix_speed,rb_float_new(fix->speed));
 
@@ -175,6 +186,26 @@ static VALUE rbGps_get_fix(VALUE self) {
 }
 
 
+static VALUE rbGps_get_sat(VALUE self) {
+  rb_Gps_cls *obj=0;
+  Data_Get_Struct(self, rb_Gps_cls, obj);
+  struct gps_data_t *data=obj->gps_data;
+  if (!obj->gps_data)
+    eturn Qnil;
+  
+  VALUE ret=rb_ary_new();
+  int sat=0;
+  for (sat=0;sat<data->satellites;sat++) {
+    VALUE sat_elem=rb_hash_new();
+    rb_hash_aset(sat_elem,symbolTable.sat_prn,INT2NUM(data->PRN[sat]));
+    rb_hash_aset(sat_elem,symbolTable.sat_elevation,INT2NUM(data->elevation[sat]));
+    rb_hash_aset(sat_elem,symbolTable.sat_azimuth,INT2NUM(data->azimuth[sat]));
+    rb_hash_aset(sat_elem,symbolTable.sat_ss,INT2NUM(data->ss[sat]));
+    rb_hash_aset(sat_elem,symbolTable.sat_used,data->used[sat]?Qtrue:Qfalse);
+    rb_ary_push(ret,sat_elem);
+  }
+  return ret;
+}
 
 static void fill_symbol_table() {
   symbolTable.online=ID2SYM(rb_intern("online"));
@@ -196,6 +227,15 @@ static void fill_symbol_table() {
   symbolTable.fix_longitude=ID2SYM(rb_intern("longitude"));
   symbolTable.fix_altitude=ID2SYM(rb_intern("altitude"));
   symbolTable.fix_speed=ID2SYM(rb_intern("speed"));
+  symbolTable.fix_heading=ID2SYM(rb_intern("heading"));
+  symbolTable.fix_climb=ID2SYM(rb_intern("climb"));
+
+  symbolTable.sat_prn=ID2SYM(rb_intern("PRN"));
+  symbolTable.sat_elevation=ID2SYM(rb_intern("elevation"));
+  symbolTable.sat_azimuth=ID2SYM(rb_intern("azimuth"));
+  symbolTable.sat_ss=ID2SYM(rb_intern("ss"));
+  symbolTable.sat_used=ID2SYM(rb_intern("used"));
+
 
 }
 
@@ -211,6 +251,7 @@ 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, "query"       , rbGps_query                 , 1);
  
 }

data/test.rb

@@ -1,9 +1,25 @@
 require 'RbGps'
 require 'yaml'
 
+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(' ')
+    end 
+end
+
+def dump_fix(fix)
+      line=fix.keys.collect { |key| "#{key} #{fix[key]}" }
+      puts line.join(' ')
+end
+
+
 gps=RbGps.new('localhost','2947')
 
 gps.query("w+x\n")
+
 puts "begin loop"
 loop do
 	 gps.query("O=?")
@@ -12,8 +28,8 @@ loop do
 	 puts "get"
 	 res=gps.get
 	 puts res.to_yaml
-	 fix=gps.get_fix
-	 puts fix.to_yaml
+	 dump_fix(gps.get_fix)
 	 puts "next"
+	 dump_sats(gps.get_sat)
 	 sleep 1
 end

metadata

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