diff --git a/showcases/general/pcaprecording/PcapRecordingShowcase.ned b/showcases/general/pcaprecording/PcapRecordingShowcase.ned index c4d33a3448f..8e2919df7c9 100644 --- a/showcases/general/pcaprecording/PcapRecordingShowcase.ned +++ b/showcases/general/pcaprecording/PcapRecordingShowcase.ned @@ -5,9 +5,10 @@ import inet.node.ethernet.Eth100M; import inet.node.inet.AdhocHost; import inet.node.inet.Router; import inet.node.inet.StandardHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; + network PcapRecordingShowcase { @display("bgb=1214,400"); @@ -18,7 +19,7 @@ network PcapRecordingShowcase visualizer: IntegratedMultiCanvasVisualizer { @display("p=87,130"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=86,192"); } host1: AdhocHost { diff --git a/showcases/routing/manet/ManetProtocolsShowcase.ned b/showcases/routing/manet/ManetProtocolsShowcase.ned index ca8161b70ec..c3aef1b8176 100644 --- a/showcases/routing/manet/ManetProtocolsShowcase.ned +++ b/showcases/routing/manet/ManetProtocolsShowcase.ned @@ -2,9 +2,11 @@ package inet.showcases.routing.manet; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.ManetRouter; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; + network ManetprotocolsShowcaseA { parameters: @@ -22,7 +24,7 @@ network ManetprotocolsShowcaseA @figure[tree6](type=image; image="showcases/tree"; pos=0,0; transform=scale(0.1),translate(1050,600)); @figure[tree7](type=image; image="showcases/tree"; pos=0,0; transform=scale(0.1),translate(1170,620)); submodules: - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=100,100"); } visualizer: IntegratedMultiCanvasVisualizer { diff --git a/showcases/routing/manet/doc/index.rst b/showcases/routing/manet/doc/index.rst index 483da399d48..d8a5e1cc97f 100644 --- a/showcases/routing/manet/doc/index.rst +++ b/showcases/routing/manet/doc/index.rst @@ -209,14 +209,15 @@ featuring stationary hosts. The networks are defined in :download:`ManetProtocolsShowcase.ned <../ManetProtocolsShowcase.ned>`. Both networks contain hosts of the type :ned:`ManetRouter` (an extension of :ned:`WirelessHost`), whose routing module type is configurable. Just as -:ned:`WirelessHost`, it uses :ned:`Ieee80211ScalarRadio` by default. It also +:ned:`WirelessHost`, it uses :ned:`Ieee80211Radio` with the scalar +analog model by default. It also has IP forwarding enabled, and its management module is set to :ned:`Ieee80211MgmtAdhoc`. In the network, there is a source host named ``source``, a destination host named ``destination``, and a number of other hosts, which are named ``node1`` up to ``node10`` (their numbers vary in the different networks). In addition to mobile nodes, both -networks contain an :ned:`Ieee80211ScalarRadioMedium`, an :ned:`Ipv4NetworkConfigurator`, and an :ned:`IntegratedMultiVisualizer` +networks contain an :ned:`Ieee80211RadioMedium`, an module. The nodes' default PHY model (IEEE 802.11) will suffice because we're focusing on the routing protocols. diff --git a/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned b/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned index 0db4e0e2cd2..22b0daa6d7d 100644 --- a/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned +++ b/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned @@ -10,7 +10,7 @@ import inet.node.ethernet.Eth100M; import inet.node.ethernet.EthernetSwitch; import inet.node.inet.AdhocHost; import inet.node.inet.StandardHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; import inet.visualizer.common.DataLinkVisualizer; @@ -50,7 +50,7 @@ network DataLinkVisualizerEnablingWirelessShowcase parameters: @display("p=100,120"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=100,190"); } @@ -74,7 +74,7 @@ network DataLinkVisualizerActivityLevelShowcase parameters: @display("p=100,120"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=100,190"); } @@ -152,7 +152,7 @@ network DataLinkVisualizerMobileShowcase configurator: Ipv4NetworkConfigurator { @display("p=70,150"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=70,250"); } destination: AodvRouter { diff --git a/showcases/visualizer/canvas/ieee80211/Ieee80211VisualizationShowcase.ned b/showcases/visualizer/canvas/ieee80211/Ieee80211VisualizationShowcase.ned index 12cf8dfbceb..bc0264d48ae 100644 --- a/showcases/visualizer/canvas/ieee80211/Ieee80211VisualizationShowcase.ned +++ b/showcases/visualizer/canvas/ieee80211/Ieee80211VisualizationShowcase.ned @@ -4,7 +4,7 @@ import inet.environment.common.PhysicalEnvironment; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.WirelessHost; import inet.node.wireless.AccessPoint; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -24,7 +24,7 @@ network Ieee80211VisualizationDisplayingAssociationsShowcase visualizer: IntegratedCanvasVisualizer { @display("p=409,78"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=408,123"); } } @@ -37,7 +37,7 @@ network Ieee80211VisualizationAdvancedFeaturesShowcase parameters: @display("p=100,50"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=99,111"); } @@ -93,7 +93,7 @@ network Ieee80211VisualizationVisualizingHandoverShowcase visualizer: IntegratedCanvasVisualizer { @display("p=203,344"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=317,346"); } wirelessHost: WirelessHost { @@ -109,7 +109,7 @@ network Ieee80211VisualizationSignalLevelsShowcase parameters: @display("p=100,50"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=99,111"); } diff --git a/showcases/visualizer/canvas/instrumentfigures/InstrumentShowcase.ned b/showcases/visualizer/canvas/instrumentfigures/InstrumentShowcase.ned index 7859c47463e..1066b1e008c 100644 --- a/showcases/visualizer/canvas/instrumentfigures/InstrumentShowcase.ned +++ b/showcases/visualizer/canvas/instrumentfigures/InstrumentShowcase.ned @@ -6,9 +6,10 @@ package inet.showcases.visualizer.canvas.instrumentfigures; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; + network InstrumentShowcase { @display("bgb=900,500"); @@ -41,7 +42,7 @@ network InstrumentShowcase configurator: Ipv4NetworkConfigurator { @display("p=62,41"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=61,110"); } visualizer: IntegratedCanvasVisualizer { diff --git a/showcases/visualizer/canvas/packetdrop/PacketDropVisualizationShowcase.ned b/showcases/visualizer/canvas/packetdrop/PacketDropVisualizationShowcase.ned index 9fddf170729..a6625d6d3df 100644 --- a/showcases/visualizer/canvas/packetdrop/PacketDropVisualizationShowcase.ned +++ b/showcases/visualizer/canvas/packetdrop/PacketDropVisualizationShowcase.ned @@ -10,7 +10,7 @@ import inet.node.inet.Router; import inet.node.inet.StandardHost; import inet.node.inet.WirelessHost; import inet.node.wireless.AccessPoint; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -39,7 +39,7 @@ network PacketDropQueueOverflowShowcase visualizer: IntegratedCanvasVisualizer { @display("p=267,37"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=465,37"); } connections: @@ -55,7 +55,7 @@ network PacketDropArpResolutionFailedShowcase parameters: @display("p=100,50"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=100,150"); } @@ -76,7 +76,7 @@ network PacketDropMacRetryLimitReachedShowcase parameters: @display("p=100,50"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=100,150"); } diff --git a/showcases/visualizer/canvas/physicallinkactivity/PhysicallinkVisualizerShowcase.ned b/showcases/visualizer/canvas/physicallinkactivity/PhysicallinkVisualizerShowcase.ned index db8012f94b1..42c0c46d8cc 100644 --- a/showcases/visualizer/canvas/physicallinkactivity/PhysicallinkVisualizerShowcase.ned +++ b/showcases/visualizer/canvas/physicallinkactivity/PhysicallinkVisualizerShowcase.ned @@ -8,7 +8,7 @@ import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; import inet.node.inet.WirelessHost; import inet.node.wireless.AccessPoint; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; import inet.visualizer.common.PhysicalLinkVisualizer; @@ -24,7 +24,7 @@ network PhysicalLinkVisualizerEnablingShowcase parameters: @display("p=100,150"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=100,250"); } @@ -49,7 +49,7 @@ network PhysicalLinkVisualizerFilteringShowcase parameters: @display("p=100,150"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=100,250"); } @@ -77,7 +77,7 @@ network PhysicalLinkVisualizerMobileShowcase configurator: Ipv4NetworkConfigurator { @display("p=100,150"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=100,250"); } host1: AdhocHost { diff --git a/showcases/visualizer/canvas/spectrum/SpectrumShowcase.ned b/showcases/visualizer/canvas/spectrum/SpectrumShowcase.ned index f89c664a63a..0c349a45173 100644 --- a/showcases/visualizer/canvas/spectrum/SpectrumShowcase.ned +++ b/showcases/visualizer/canvas/spectrum/SpectrumShowcase.ned @@ -4,7 +4,7 @@ import inet.environment.common.PhysicalEnvironment; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; import inet.node.wireless.Probe; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211DimensionalRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -30,7 +30,7 @@ network SpectrumShowcaseSpectrumFigureSpectrogramNetwork visualizer: IntegratedCanvasVisualizer { @display("p=75,125"); } - radioMedium: Ieee80211DimensionalRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=75,184"); } physicalEnvironment: PhysicalEnvironment { @@ -63,7 +63,7 @@ network SpectrumShowcasePowerDensityMapNetwork visualizer: IntegratedCanvasVisualizer { @display("p=75,125"); } - radioMedium: Ieee80211DimensionalRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=74,184"); } physicalEnvironment: PhysicalEnvironment { diff --git a/showcases/visualizer/canvas/statistic/StatisticVisualizationShowcase.ned b/showcases/visualizer/canvas/statistic/StatisticVisualizationShowcase.ned index 19e251d081b..90cc195cd0f 100644 --- a/showcases/visualizer/canvas/statistic/StatisticVisualizationShowcase.ned +++ b/showcases/visualizer/canvas/statistic/StatisticVisualizationShowcase.ned @@ -2,11 +2,10 @@ package inet.showcases.visualizer.canvas.statistic; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; - network StatisticVisualizationPingRttShowcase { @display("bgb=400,244"); @@ -14,7 +13,7 @@ network StatisticVisualizationPingRttShowcase configurator: Ipv4NetworkConfigurator { @display("p=69,40"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=68,99"); } visualizer: IntegratedCanvasVisualizer { @@ -41,7 +40,7 @@ network StatisticVisualizationPacketErrorRateShowcase parameters: @display("p=64.256,180.72"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=62.247997,287.14398"); } diff --git a/showcases/visualizer/canvas/styling/StylingShowcase.ned b/showcases/visualizer/canvas/styling/StylingShowcase.ned index 20dc12d040f..9053a5f1b1f 100644 --- a/showcases/visualizer/canvas/styling/StylingShowcase.ned +++ b/showcases/visualizer/canvas/styling/StylingShowcase.ned @@ -7,7 +7,7 @@ import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; import inet.node.inet.WirelessHost; import inet.node.wireless.AccessPoint; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -27,7 +27,7 @@ network StylingShowcase configurator: Ipv4NetworkConfigurator { @display("p=50,100"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=50,150"); } } @@ -48,7 +48,7 @@ network AnnotationShowcase configurator: Ipv4NetworkConfigurator { @display("p=50,100"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=50,150"); } accessPoint: AccessPoint { diff --git a/showcases/visualizer/canvas/submoduleinfo/SubmoduleInformationVisualizationShowcase.ned b/showcases/visualizer/canvas/submoduleinfo/SubmoduleInformationVisualizationShowcase.ned index b0456825caa..7d8148cfc58 100644 --- a/showcases/visualizer/canvas/submoduleinfo/SubmoduleInformationVisualizationShowcase.ned +++ b/showcases/visualizer/canvas/submoduleinfo/SubmoduleInformationVisualizationShowcase.ned @@ -2,9 +2,10 @@ package inet.showcases.visualizer.canvas.submoduleinfo; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; + network SubmoduleInformationVisualizationShowcase { submodules: @@ -14,7 +15,7 @@ network SubmoduleInformationVisualizationShowcase configurator: Ipv4NetworkConfigurator { @display("p=100,200"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=100,300"); } source: AdhocHost { diff --git a/showcases/visualizer/canvas/transportpathactivity/TransportPathVisualizerShowcase.ned b/showcases/visualizer/canvas/transportpathactivity/TransportPathVisualizerShowcase.ned index d320e77f5f1..2dcb41fbc59 100644 --- a/showcases/visualizer/canvas/transportpathactivity/TransportPathVisualizerShowcase.ned +++ b/showcases/visualizer/canvas/transportpathactivity/TransportPathVisualizerShowcase.ned @@ -10,7 +10,7 @@ import inet.node.ethernet.EthernetSwitch; import inet.node.inet.AdhocHost; import inet.node.inet.Router; import inet.node.inet.StandardHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; import inet.visualizer.common.TransportRouteVisualizer; @@ -45,7 +45,7 @@ network TransportPathVisualizerSimpleWirelessShowcase configurator: Ipv4NetworkConfigurator { @display("p=80,120"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=80,190"); } source: AdhocHost { diff --git a/showcases/visualizer/osg/earth/EarthVisualizationShowcase.ned b/showcases/visualizer/osg/earth/EarthVisualizationShowcase.ned index 72c362b1ab4..eaa75cae05d 100644 --- a/showcases/visualizer/osg/earth/EarthVisualizationShowcase.ned +++ b/showcases/visualizer/osg/earth/EarthVisualizationShowcase.ned @@ -4,9 +4,10 @@ import inet.common.geometry.common.IGeographicCoordinateSystem; import inet.environment.common.PhysicalEnvironment; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.common.IntegratedVisualizer; + network EarthVisualizationShowcase { submodules: @@ -49,7 +50,7 @@ network EarthVisualization3 extends EarthVisualizationShowcase configurator: Ipv4NetworkConfigurator { @display("p=259,150"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=258,50"); } } diff --git a/showcases/wireless/aggregation/AggregationShowcase.ned b/showcases/wireless/aggregation/AggregationShowcase.ned index d7817f968d7..ad97f2a96e7 100644 --- a/showcases/wireless/aggregation/AggregationShowcase.ned +++ b/showcases/wireless/aggregation/AggregationShowcase.ned @@ -2,7 +2,7 @@ package inet.showcases.wireless.aggregation; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -13,7 +13,7 @@ network AggregationShowcase configurator: Ipv4NetworkConfigurator { @display("p=50,50"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=50,100"); } visualizer: IntegratedCanvasVisualizer { diff --git a/showcases/wireless/aggregation/doc/index.rst b/showcases/wireless/aggregation/doc/index.rst index 12637a29af5..7baab0cd70e 100644 --- a/showcases/wireless/aggregation/doc/index.rst +++ b/showcases/wireless/aggregation/doc/index.rst @@ -105,7 +105,7 @@ The simulation uses the following network, defined in It contains two :ned:`AdhocHost`'s, ``host1`` and ``host2``. It also contains an :ned:`Ipv4NetworkConfigurator` and an -:ned:`Ieee80211ScalarRadioMedium` module. +:ned:`Ieee80211RadioMedium` module. Configurations ~~~~~~~~~~~~~~ diff --git a/showcases/wireless/analogmodel/AnalogModelShowcase.ned b/showcases/wireless/analogmodel/AnalogModelShowcase.ned index 4705e681270..e9ab5910557 100644 --- a/showcases/wireless/analogmodel/AnalogModelShowcase.ned +++ b/showcases/wireless/analogmodel/AnalogModelShowcase.ned @@ -4,13 +4,12 @@ import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; import inet.node.inet.ManetRouter; import inet.physicallayer.wireless.common.medium.RadioMedium; -import inet.physicallayer.wireless.common.medium.UnitDiskRadioMedium; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211DimensionalRadioMedium; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.physicallayer.wireless.noise.NoiseSource; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; + network AnalogModelShowcaseRoutingNetwork { parameters: @@ -27,7 +26,7 @@ network AnalogModelShowcaseRoutingNetwork destination: ManetRouter { @display("p=292,80"); } - radioMedium: UnitDiskRadioMedium { + radioMedium: RadioMedium { @display("p=38,28"); } configurator: Ipv4NetworkConfigurator { @@ -51,33 +50,7 @@ network AnalogModelShowcaseDistanceNetwork parameters: @display("p=64.256,180.72"); } - radioMedium: Ieee80211ScalarRadioMedium { - parameters: - @display("p=62.247997,287.14398"); - } - destination: AdhocHost { - parameters: - @display("p=500,179.60625"); - } - source: AdhocHost { - @display("p=363.448,180.72"); - } -} - -network AnalogModelShowcaseDistanceNetwork_ -{ - parameters: - @display("bgb=901.5187,376.65"); - submodules: - visualizer: IntegratedMultiCanvasVisualizer { - parameters: - @display("p=64.256,62.247997"); - } - configurator: Ipv4NetworkConfigurator { - parameters: - @display("p=64.256,180.72"); - } - radioMedium: RadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=62.247997,287.14398"); } @@ -98,7 +71,7 @@ network AnalogModelShowcaseNoiseNetwork configurator: Ipv4NetworkConfigurator { @display("p=35,40"); } - radioMedium: Ieee80211DimensionalRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=32,113"); } visualizer: IntegratedCanvasVisualizer { diff --git a/showcases/wireless/blockack/BlockAckShowcase.ned b/showcases/wireless/blockack/BlockAckShowcase.ned index e498272c34d..8c39448288f 100644 --- a/showcases/wireless/blockack/BlockAckShowcase.ned +++ b/showcases/wireless/blockack/BlockAckShowcase.ned @@ -2,7 +2,7 @@ package inet.showcases.wireless.blockack; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -13,7 +13,7 @@ network BlockAckShowcase configurator: Ipv4NetworkConfigurator { @display("p=50,50"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=50,100"); } visualizer: IntegratedCanvasVisualizer { diff --git a/showcases/wireless/directionalantennas/DirectionalAntennasShowcase.ned b/showcases/wireless/directionalantennas/DirectionalAntennasShowcase.ned index 96a492996c9..ccb60126e7e 100644 --- a/showcases/wireless/directionalantennas/DirectionalAntennasShowcase.ned +++ b/showcases/wireless/directionalantennas/DirectionalAntennasShowcase.ned @@ -2,7 +2,7 @@ package inet.showcases.wireless.directionalantennas; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -17,7 +17,7 @@ network DirectionalAntennasShowcase visualizer: IntegratedCanvasVisualizer { @display("p=62,121;is=s"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=62,199;is=s"); } source: AdhocHost { diff --git a/showcases/wireless/errorrate/ErrorRateShowcase.ned b/showcases/wireless/errorrate/ErrorRateShowcase.ned index d4e78bd2387..190b71e0011 100644 --- a/showcases/wireless/errorrate/ErrorRateShowcase.ned +++ b/showcases/wireless/errorrate/ErrorRateShowcase.ned @@ -10,9 +10,10 @@ package inet.showcases.wireless.errorrate; import inet.environment.common.PhysicalEnvironment; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; + network ErrorRateShowcase { submodules: @@ -24,7 +25,7 @@ network ErrorRateShowcase parameters: @display("p=100,150"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=100,250"); } diff --git a/showcases/wireless/fragmentation/FragmentationShowcase.ned b/showcases/wireless/fragmentation/FragmentationShowcase.ned index 0e5742afbe8..48a40e5a5f8 100644 --- a/showcases/wireless/fragmentation/FragmentationShowcase.ned +++ b/showcases/wireless/fragmentation/FragmentationShowcase.ned @@ -3,7 +3,7 @@ package inet.showcases.wireless.fragmentation; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -23,7 +23,7 @@ network FragmentationShowcase visualizer: IntegratedCanvasVisualizer { @display("p=78,130"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=78,205"); } } diff --git a/showcases/wireless/ieee802154/doc/index.rst b/showcases/wireless/ieee802154/doc/index.rst index 2f0f2608798..777a08cd4d1 100644 --- a/showcases/wireless/ieee802154/doc/index.rst +++ b/showcases/wireless/ieee802154/doc/index.rst @@ -32,20 +32,20 @@ The INET implementation INET features a narrowband and an ultra-wideband IEEE 802.15.4 PHY model: -- :ned:`Ieee802154NarrowbandScalarRadio` +- :ned:`Ieee802154NarrowbandRadio` - :ned:`Ieee802154UwbIrRadio` This showcase demonstrates the narrowband model, -:ned:`Ieee802154NarrowbandScalarRadio`. It simulates a PHY that uses +:ned:`Ieee802154NarrowbandRadio`. It simulates a PHY that uses DSSS-OQPSK modulation and operates at 2.45 GHz. By default, signals are transmitted with a bandwidth of 2.8 MHz using 2.24 mW transmission -power. The model uses the scalar analog model. +power. The model is configured to use the scalar analog model. The :ned:`Ieee802154NarrowbandInterface` module contains an -:ned:`Ieee802154NarrowbandScalarRadio` and the corresponding +:ned:`Ieee802154NarrowbandRadio` and the corresponding :ned:`Ieee802154NarrowbandMac`. The radio medium module required by -the radio is :ned:`Ieee802154NarrowbandScalarRadioMedium`. As per the name, the -radio uses the scalar analog model for signal representation. The radio +the radio is :ned:`Ieee802154NarrowbandScalarRadioMedium`. The analog model type is set +to ``scalar`` in both the radios and the radio medium by default. The radio has default values for its parameters, based on the 802.15.4 standard. For example, by default, it uses the carrier frequency of 2450 MHz, 2.8 MHz bandwidth, 250 kbps bitrate, and 2.24 mW transmission power. As diff --git a/showcases/wireless/multiradio/MultiRadioShowcase.ned b/showcases/wireless/multiradio/MultiRadioShowcase.ned index 9ed5b153093..942e413cbbe 100644 --- a/showcases/wireless/multiradio/MultiRadioShowcase.ned +++ b/showcases/wireless/multiradio/MultiRadioShowcase.ned @@ -8,7 +8,7 @@ package inet.showcases.wireless.multiradio; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.WirelessHost; import inet.node.wireless.AccessPoint; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer; @@ -21,7 +21,7 @@ network MultiRadioShowcase parameters: @display("p=50,50"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=50,100"); } diff --git a/showcases/wireless/pathloss/PathLossShowcase.ned b/showcases/wireless/pathloss/PathLossShowcase.ned index f7cd764dfcd..ff6e3662d92 100644 --- a/showcases/wireless/pathloss/PathLossShowcase.ned +++ b/showcases/wireless/pathloss/PathLossShowcase.ned @@ -7,7 +7,7 @@ package inet.showcases.wireless.pathloss; import inet.environment.common.PhysicalEnvironment; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; network PathLossShowcase @@ -24,7 +24,7 @@ network PathLossShowcase configurator: Ipv4NetworkConfigurator { @display("p=49.704147,35.502964"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=49.704147,85.20711"); } physicalEnvironment: PhysicalEnvironment { diff --git a/showcases/wireless/pathloss/doc/index.rst b/showcases/wireless/pathloss/doc/index.rst index 618a6a39996..1b5de0ea9a3 100644 --- a/showcases/wireless/pathloss/doc/index.rst +++ b/showcases/wireless/pathloss/doc/index.rst @@ -69,7 +69,7 @@ recorded. In addition to the two hosts named ``source`` and ``destination``, the network also contains a :ned:`PhysicalEnvironment` module, an -:ned:`Ipv4NetworkConfigurator`, and a :ned:`Ieee80211ScalarRadioMedium`: +:ned:`Ipv4NetworkConfigurator`, and a :ned:`Ieee80211RadioMedium`: .. figure:: media/network.png :width: 50% diff --git a/showcases/wireless/power/PowerConsumptionShowcase.ned b/showcases/wireless/power/PowerConsumptionShowcase.ned index b8c784b1335..6ec9de8fc86 100644 --- a/showcases/wireless/power/PowerConsumptionShowcase.ned +++ b/showcases/wireless/power/PowerConsumptionShowcase.ned @@ -2,9 +2,10 @@ package inet.showcases.wireless.power; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; + network PowerConsumptionShowcase { parameters: @@ -18,7 +19,7 @@ network PowerConsumptionShowcase parameters: @display("p=100,200"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=100,300"); } diff --git a/showcases/wireless/power/doc/index.rst b/showcases/wireless/power/doc/index.rst index 0c458765a7e..0ec0a4b2b7d 100644 --- a/showcases/wireless/power/doc/index.rst +++ b/showcases/wireless/power/doc/index.rst @@ -90,7 +90,7 @@ module's :par:`nodeShutdownCapacity` and :par:`nodeStartCapacity` parameters. Radio modes and states ~~~~~~~~~~~~~~~~~~~~~~ -In the :ned:`Ieee80211ScalarRadio` model used in this simulation (and in +In the :ned:`Ieee80211Radio` model used in this simulation (and in other radio models), there are different modes in which radios operate, such as off, sleep, receiver, and transmitter. The mode is set by the model and does not depend on external effects. In addition to mode, radios diff --git a/showcases/wireless/qos/QosShowcase.ned b/showcases/wireless/qos/QosShowcase.ned index 17b2a2179fb..ccf804a62f2 100644 --- a/showcases/wireless/qos/QosShowcase.ned +++ b/showcases/wireless/qos/QosShowcase.ned @@ -10,7 +10,7 @@ package inet.showcases.wireless.qos; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.WirelessHost; import inet.node.wireless.AccessPoint; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -34,7 +34,7 @@ network QosShowcase parameters: @display("p=200,100;r=,,#707070"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=61,46"); } diff --git a/showcases/wireless/ratecontrol/RateControlShowcase.ned b/showcases/wireless/ratecontrol/RateControlShowcase.ned index 19d029faec6..9eceff4bb6e 100644 --- a/showcases/wireless/ratecontrol/RateControlShowcase.ned +++ b/showcases/wireless/ratecontrol/RateControlShowcase.ned @@ -10,7 +10,7 @@ package inet.showcases.wireless.ratecontrol; import inet.environment.common.PhysicalEnvironment; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.WirelessHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -31,7 +31,7 @@ network RateControlShowcase parameters: @display("p=131.53847,86.15385"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { parameters: @display("p=130.76924,168.46155"); } diff --git a/showcases/wireless/txop/TxopShowcase.ned b/showcases/wireless/txop/TxopShowcase.ned index 19b4f5c9684..ac38e14935a 100644 --- a/showcases/wireless/txop/TxopShowcase.ned +++ b/showcases/wireless/txop/TxopShowcase.ned @@ -2,7 +2,7 @@ package inet.showcases.wireless.txop; import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator; import inet.node.inet.AdhocHost; -import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium; +import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium; import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer; @@ -13,7 +13,7 @@ network TxopShowcase configurator: Ipv4NetworkConfigurator { @display("p=50,50"); } - radioMedium: Ieee80211ScalarRadioMedium { + radioMedium: Ieee80211RadioMedium { @display("p=50,100"); } visualizer: IntegratedCanvasVisualizer {