First working version of json_to_ecss_src block

grc/satnogs_json_to_ecss_src.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0"?>
 <block>
-	<name>JSON to ECSS source</name>
+	<name>JSON to ECSS</name>
 	<key>satnogs_json_to_ecss_src</key>
 	<category>satnogs</category>
 	<import>import satnogs</import>
-	<make>satnogs.json_to_ecss()</make>
+	<make>satnogs.json_to_ecss_src()</make>
+	
 
-	<source>
-		<name>out</name>
-		<type>message</type>
-	</source>
 	<sink>
 		<name>in</name>
 		<type>message</type>
 	</sink>
+	
+	<source>
+        <name>out</name>
+        <type>message</type>
+    </source>
 </block>

include/satnogs/json_to_ecss_src.h

@@ -690,7 +690,7 @@ namespace gr {
      * \ingroup satnogs
      *
      */
-    class SATNOGS_API json_to_ecss_src : virtual public gr::sync_block
+    class SATNOGS_API json_to_ecss_src : virtual public gr::block
     {
      public:
       typedef boost::shared_ptr<json_to_ecss_src> sptr;
@@ -703,7 +703,7 @@ namespace gr {
        * class. satnogs::json_to_ecss_src::make is the public interface for
        * creating new instances.
        */
-      static sptr make(const std::string& addr, uint16_t port, size_t mtu);
+      static sptr make();
 
     };
 

lib/json_to_ecss_src_impl.cc

@@ -685,22 +685,24 @@
 #include <sstream>
 #include <map>
 
+#define BUFFER_SIZE 2048
+
 
 namespace gr {
   namespace satnogs {
 
     json_to_ecss_src::sptr
-    json_to_ecss_src::make(const std::string& addr, uint16_t port, size_t mtu)
+    json_to_ecss_src::make()
     {
       return gnuradio::get_initial_sptr
-        (new json_to_ecss_src_impl(addr, port, mtu));
+        (new json_to_ecss_src_impl());
     }
 
     /*
      * The private constructor
      */
-    json_to_ecss_src_impl::json_to_ecss_src_impl(const std::string& addr, uint16_t port, size_t mtu)
+    json_to_ecss_src_impl::json_to_ecss_src_impl()
-      : gr::sync_block("json_to_ecss_src",
+      : gr::block("json_to_ecss_src",
 		       gr::io_signature::make (0, 0, 0),
 		       gr::io_signature::make (0, 0, 0)),
 			   is_running(true),
@@ -710,6 +712,8 @@ namespace gr {
     	message_port_register_out(d_out_port);
     	message_port_register_in(d_in_port);
 
+    	d_buf = (uint8_t*)malloc(BUFFER_SIZE * sizeof(uint8_t));
+
     	new boost::thread (
     		      boost::bind (&json_to_ecss_src_impl::json_accepter, this));
     }
@@ -724,50 +728,20 @@ namespace gr {
     void
 	json_to_ecss_src_impl::json_accepter(){
     	pmt::pmt_t message;
-    	uint8_t *buf;
     	size_t length;
 
     	while(is_running){
-    		tc_tm_pkt pkt;
     		message = delete_head_blocking(d_in_port,0);
     		length = blob_length(message);
-    		buf = uint8_t(length);
+    		d_buf = (uint8_t*)blob_data(message);
-    		buf = blob_data(message);
+    		std::istringstream ss(std::string(d_buf, d_buf + length));
-    		std::istringstream ss(std::string(buf, buf + length));
     		ptree tree;
     		read_json(ss,tree);
-    		print_ptree(tree,0);
+    		BOOST_FOREACH(const ptree::value_type &v, tree) {
-
+    			std::cout<<"First = "<<v.first << "Second = "<<v.second.data()<<std::endl ;
+    		}
     	}
     }
-    std::string
-    json_to_ecss_src_impl::indent(int level){
-    	  std::string s;
-    	  for (int i=0; i<level; i++) s += "  ";
-    	  return s;
-    }
-    void
-	json_to_ecss_src_impl::print_ptree(ptree &pt, int level){
-    	 if (pt.empty()) {
-    	    std::cout << "\""<< pt.data()<< "\"";
-    	  } else {
-    	    if (level) std::cout << std::endl;
-    	    std::cout << indent(level) << "{" << std::endl;
-    	    for (ptree::iterator pos = pt.begin(); pos != pt.end();) {
-    	      std::cout << indent(level+1) << "\"" << pos.first << "\": ";
-    	      print_ptree(pos.second, level + 1);
-    	      ++pos;
-    	      if (pos != pt.end()) {
-    	        std::cout << ",";
-    	      }
-    	      std::cout << std::endl;
-    	    }
-    	    std::cout << indent(level) << " }";
-    	  }
-    	  return;
-    }
-
-
 
   } /* namespace satnogs */
 } /* namespace gr */

lib/json_to_ecss_src_impl.h

@@ -679,7 +679,6 @@
 #define INCLUDED_SATNOGS_JSON_TO_ECSS_SRC_IMPL_H
 
 #include <satnogs/json_to_ecss_src.h>
-#include <satnogs/tc_tm.h>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
@@ -699,13 +698,12 @@ namespace gr {
     	pmt::pmt_t d_in_port;
     	pmt::pmt_t d_out_port;
 
+    	uint8_t*	d_buf;
+
     	void json_accepter();
-        void
-		print_ptree(ptree &pt, int level);
-        std::string indent(int level);
 
      public:
-      json_to_ecss_src_impl(const std::string& addr, uint16_t port, size_t mtu);
+      json_to_ecss_src_impl();
       ~json_to_ecss_src_impl();
 
       // Where all the action really happens

lib/udp_msg_source_impl.cc

@@ -100,7 +100,7 @@ namespace gr
       }
 
       /* All good until now. Allocate buffer memory and proceed */
-      buf = new uint8_t(d_mtu);
+      buf = (uint8_t*)malloc(d_mtu*sizeof(uint8_t));
 
       while(d_running){
 	ret = recvfrom(sock, buf, d_mtu, 0, &client_addr, &client_addr_len);