From 4b42ab554e45e4326466976028ed25123746205f Mon Sep 17 00:00:00 2001
From: Ben Reynwar
Date: Sun, 6 Feb 2011 14:02:44 -0700
Subject: Added trellis_constellation_metrics_cf.  It is equivalent to
 trellis_metrics_c but it uses the constellation object's calc_metric method. 
 This method is also added here.  trellis_metric_type.h is moved to
 gr_metric_type since constellation object is now dependent on it.

---
 gr-trellis/src/lib/trellis.i | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'gr-trellis/src/lib/trellis.i')

diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index d035cea54..fe74c8d9f 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -28,8 +28,11 @@
 #include "trellis_permutation.h"
 #include "trellis_siso_f.h"
 #include "trellis_siso_combined_f.h"
+#include "trellis_constellation_metrics_cf.h"
+#include "gr_constellation.h"
 %}
 
+
 // ----------------------------------------------------------------
 
 %include "fsm.i"
@@ -38,12 +41,19 @@
 %include "trellis_siso_f.i"
 %include "trellis_siso_combined_f.i"
 
-%include "trellis_metric_type.h"
 %include "trellis_siso_type.h"
 
+%include "trellis_constellation_metrics_cf.i"
 
 %include "trellis_generated.i"
 
+%import "gr_metric_type.h"
+%import "gr_constellation.i"
+
+%pythoncode %{
+  from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
+  %}
+
 #if SWIGGUILE
 %scheme %{
 (load-extension-global "libguile-gnuradio-trellis" "scm_init_gnuradio_trellis_module")
-- 
cgit 


From f6c10234d42f5b6913002ca3cd5723b9c5270f7c Mon Sep 17 00:00:00 2001
From: Ben Reynwar
Date: Tue, 10 May 2011 23:14:30 -0700
Subject: Modifying gr_trellis for gr_constellation -> digital_constellation
 change.

---
 gr-trellis/src/lib/trellis.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gr-trellis/src/lib/trellis.i')

diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index fe74c8d9f..7e379a918 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -29,7 +29,7 @@
 #include "trellis_siso_f.h"
 #include "trellis_siso_combined_f.h"
 #include "trellis_constellation_metrics_cf.h"
-#include "gr_constellation.h"
+#include "digital_constellation.h"
 %}
 
 
@@ -48,7 +48,7 @@
 %include "trellis_generated.i"
 
 %import "gr_metric_type.h"
-%import "gr_constellation.i"
+%import "digital_constellation.i"
 
 %pythoncode %{
   from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
-- 
cgit 


From 233621d6bbc3c68109998d0e68ffc7df7de69eb4 Mon Sep 17 00:00:00 2001
From: Ben Reynwar
Date: Tue, 21 Jun 2011 15:51:40 -0700
Subject: gr-digital, gr-trellis: Fixing gr-trellis to work with constellation
 now that it is in gr-digital.

---
 gr-trellis/src/lib/trellis.i | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'gr-trellis/src/lib/trellis.i')

diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index 84b77a286..a030ab906 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -41,14 +41,13 @@
 %include "trellis_siso_f.i"
 %include "trellis_siso_combined_f.i"
 
-%include "metric_type.h"
 %include "siso_type.h"
 
 %include "trellis_constellation_metrics_cf.i"
 
 %include "trellis_generated.i"
 
-%import "gr_metric_type.h"
+%import "digital_metric_type.h"
 %import "digital_constellation.i"
 
 %pythoncode %{
-- 
cgit 


From 7efeff11a41392c55d2e2a620c17b9e1bda21205 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 10 Jul 2011 20:30:25 -0400
Subject: digital: work on build to make gr-trellis dependent on gr-digital.

---
 gr-trellis/src/lib/trellis.i | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gr-trellis/src/lib/trellis.i')

diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index a030ab906..d01ab529a 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -50,9 +50,9 @@
 %import "digital_metric_type.h"
 %import "digital_constellation.i"
 
-%pythoncode %{
-  from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
-  %}
+ //%pythoncode %{
+ //  from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
+ //  %}
 
 #if SWIGGUILE
 %scheme %{
-- 
cgit