wcdma_bb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab5ead80aefe54e00afea4b50c8fd7978ea21228
-  data.tar.gz: 9b37cd9452a8579db93432fd2fb4541c4abda3fc
+  metadata.gz: 52845974a6b3f4d061ab8b0fa1fbb847d8ec23bc
+  data.tar.gz: 99290b320ab8c1cf44ad9e2aa6add6d3d760aee0
 SHA512:
-  metadata.gz: 61638c9169a25860a5c313edf38ef643c9e1b3c0609309327b895701b619e8b445c6f30c9bfc34acfa47f44e3006975d148addc081f4b9b23f4661fd8912e556
-  data.tar.gz: de6446a0fefe6f1a2b87c90aac05ca5e51d110431f4933076a9f90b4efbf5a96e4729bced4a72ae1559b7e4434503984ff93e9f73f90bb796031b6ea5c9a397b
+  metadata.gz: c31b4919781399d542e578223bdea5685b48792b53bd40af41b413edc383b6eb26829525829931f2456b34c63ad487142af747a0eaf6b4ad84e286b7ece25f35
+  data.tar.gz: 81bcc1260acb1ece5ee666a40c96ed0ac19a7396d41d7ec76bc883b941c5d37ff347a35c457228772dc5fdfb500c4ab1dc50455169ac1d0d2cccc3a8f9eb3292

data/lib/enum.rb

@@ -0,0 +1,28 @@
+
+class Enum < Hash
+
+    # Create a new Enum instance
+    # @param *members [Array of String] list of strings becoming symbols
+    # @return [Enum]
+    def initialize(*members)
+        super()
+        @rev = {}
+        members.each_with_index {|m,i| self[i] = m}
+    end
+
+    # Get index by symbol or get symbol by index
+    # @param k [symbol or Integer]
+    # @return [Integer or symbol]
+    def [](k)
+        super || @rev[k]
+    end
+
+    # Change or add enum pair
+    # @param k [String] the symbol name
+    # @param v [Integer] the index
+    # @return [nil]
+    def []=(k, v)
+        @rev[v] = k
+        super
+    end
+end

data/lib/wcdma_bb/rel10/ts25_211.rb

@@ -1,4 +1,5 @@
 require 'wcdma_bb/acronym'
+require 'enum'
 
 # 4 Services offered to higher layers
 # 4.1 Transport channels
@@ -30,6 +31,11 @@ SUBFRAME_LENGTH_IN_CHIPS    = 7680
 
 # 5.2 Uplink physical channels
 # 5.2.1 Dedicated uplink physical channels
+Acronym.add('DPDCH',        'Dedicated Physical Data Channel')
+Acronym.add('DPCCH',        'Dedicated Physical Control Channel')
+Acronym.add('E-DPDCH',      'E-DCH Dedicated Physical Data Channel')
+Acronym.add('E-DPCCH',      'E-DCH Dedicated Physical Control Channel')
+Acronym.add('HS-DPCCH',     'Dedicated Control Channel associated with HS-DSCH transmission')
 
 # types of uplink dedicated physical channels
 UL_DEDICATED_PHY_CHANNEL_LIST   = ["DPDCH", "DPCCH", "E-DPDCH", "E-DPCCH", "HS-DPCCH"]
@@ -66,30 +72,81 @@ class PhysicalChannel
     end
 end
 
+# Uplink DPDCH slot formats
+UplinkDpdchSlotFormatEnum = Enum.new(:UL_DPDCH_slot_format_0,
+                                    :UL_DPDCH_slot_format_1,
+                                    :UL_DPDCH_slot_format_2,
+                                    :UL_DPDCH_slot_format_3,
+                                    :UL_DPDCH_slot_format_4,
+                                    :UL_DPDCH_slot_format_5,
+                                    :UL_DPDCH_slot_format_6)
+
 class UplinkDPDCH < PhysicalChannel
     @@DPDCH_MIN_SF_FACTOR = 256
     @@DPDCH_MAX_SF_FACTOR = 4
 
-    attr_reader :sf, :k, :N__data
+    attr_reader :sf, :k, :N__data, :slot_format, :kbps, :ksps, :bit_per_slot, :bit_per_frame
 
     # Create a new instance
-    # @param sf [Integer] spreading factor
+    # @param slot_format [symbol] slot format from table 1 25.211 v10.0
     # @return [UplinkDPDCH] a new instance of this class
-    def initialize(sf)
-        @sf = sf
+    def initialize(slot_format:)
+        raise "slot_format=%s is out of range [0..6]" % slot_format if not UplinkDpdchSlotFormatEnum.has_value?(slot_format)
+        @slot_format = slot_format
+        @sf = 256 / (2**UplinkDpdchSlotFormatEnum[@slot_format])
         @k  = self.class.k(sf: @sf, max_sf: @@DPDCH_MAX_SF_FACTOR, min_sf: @@DPDCH_MIN_SF_FACTOR)
         @N__data = self.class.N__data(k: @k)
+        @bit_per_slot = @N__data
+        @bit_per_frame = @bit_per_slot * RADIO_FRAME_LENGTH_IN_CHIPS / SLOT_LENGTH_IN_CHIPS
+        @kbps = @bit_per_frame / 10
+        @ksps = @kbps
     end
 end
 
+# Uplink DPCCH slot formats
+:UL_DPCCH_slot_format_0
+:UL_DPCCH_slot_format_0A
+:UL_DPCCH_slot_format_0B
+:UL_DPCCH_slot_format_1
+:UL_DPCCH_slot_format_2
+:UL_DPCCH_slot_format_2A
+:UL_DPCCH_slot_format_2B
+:UL_DPCCH_slot_format_3
+:UL_DPCCH_slot_format_4
+
+# Uplink DPCCH slot formats
+UplinkDpcchSlotFormatEnum = Enum.new(:UL_DPCCH_slot_format_0,
+                                    :UL_DPCCH_slot_format_0A,
+                                    :UL_DPCCH_slot_format_0B,
+                                    :UL_DPCCH_slot_format_1,
+                                    :UL_DPCCH_slot_format_2,
+                                    :UL_DPCCH_slot_format_2A,
+                                    :UL_DPCCH_slot_format_2B,
+                                    :UL_DPCCH_slot_format_3,
+                                    :UL_DPCCH_slot_format_4)
+
+Acronym.add('FSW',  "Frame Synchronization Word")
+
 class UplinkDPCCH < PhysicalChannel
     @@SF = 256
 
-    attr_reader :sf, :k, :N__data
+    attr_reader :slot_format, :sf, :k, :kbps, :ksps, :bit_per_frame,
+                :bit_per_slot, :N__pilot, :N__TPC, :N__TFCI, :N__FBI
 
-    def initialize()
+    # Create a new instance
+    # @param slot_format [symbol] slot format from table 2 25.211 v10.0
+    # @return [UplinkDPDCH] a new instance of this class
+    def initialize(slot_format:)
+        @slot_format = slot_format
         @sf = @@SF
         @k  = self.class.k(sf: @sf, max_sf: @@SF, min_sf: @@SF)
-        @N__data = self.class.N__data(k: @k)
+        @kbps = 15
+        @ksps = 15
+        @bit_per_frame = 150
+        @bit_per_slot = 10
+        @N__pilot = [6,5,4,8,5,4,3,7,6][UplinkDpcchSlotFormatEnum[@slot_format]]
+        @N__TPC   = [2,2,2,2,2,2,2,2,4][UplinkDpcchSlotFormatEnum[@slot_format]]
+        @N__TFCI  = [2,3,4,0,2,3,4,0,0][UplinkDpcchSlotFormatEnum[@slot_format]]
+        @N__FBI   = [0,0,0,0,1,1,1,1,0][UplinkDpcchSlotFormatEnum[@slot_format]]
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wcdma_bb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Duo Ling
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/wcdma_bb
+- lib/enum.rb
 - lib/wcdma_bb.rb
 - lib/wcdma_bb/acronym.rb
 - lib/wcdma_bb/rel10/ts25_211.rb