Skip to content

Commit

Permalink
Update device details properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@kbeaugrand
kbeaugrand committed Mar 12, 2022
1 parent f1a5329 commit 37196e8
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 105 deletions.
21 changes: 15 additions & 6 deletions src/AzureIoTHub.Portal/Client/Pages/Devices/LoRaWAN/CreateLoraDevice.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<MudGrid>
@if (loraModel.UseOTAA)
{
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.AppEUI"
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.AppEUI"
Label="OTAA AppEUI"
Variant="Variant.Outlined"
For="@(()=> LoRaDevice.AppEUI)"
Expand All @@ -32,9 +32,18 @@
Variant="Variant.Outlined" />
</MudItem>
}
<MudItem xs="12">
<MudTextField @bind-Value="@LoRaDevice.SensorDecoder" Label="Sensor Decoder URL" For="@(() => LoRaDevice.SensorDecoder)" Margin="Margin.Dense" Variant="Variant.Outlined"></MudTextField>
</MudItem>
else
{
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.AppSKey" Label="APB App SKey" For="@(() => LoRaDevice.AppSKey)" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.NwkSKey" Label="APB Nwk SKey" For="@(() => LoRaDevice.NwkSKey)" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.DevAddr" Label="DevAddr" For="@(() => LoRaDevice.DevAddr)" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
}
</MudGrid>
</MudCardContent>
<MudCardActions Class="pb-4 pl-4">
Expand All @@ -55,4 +64,4 @@

[Parameter]
public EventCallback OnSaveClick { get; set; }
}
}
185 changes: 86 additions & 99 deletions src/AzureIoTHub.Portal/Client/Pages/Devices/LoRaWAN/EditLoraDevice.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,86 +15,68 @@
</MudCardHeader>
<MudCardContent>
<MudGrid>
@if (LoRaDevice.UseOTAA)
{
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.AppEUI" Label="OTAA App EUI" For="@(() => LoRaDevice.AppEUI)" ReadOnly="true" Margin="Margin.Dense" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.AppKey" Label="OTAA App Key" Validation="@(LoraValidator.ValidateValue)" For="@(() => LoRaDevice.AppKey)" Margin="Margin.Dense" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
}
else
{
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.AppSKey" Label="APB App SKey" For="@(() => LoRaDevice.AppSKey)" Margin="Margin.Dense" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.NwkSKey" Label="APB Nwk SKey" For="@(() => LoRaDevice.NwkSKey)" Margin="Margin.Dense" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.DevAddr" Label="DevAddr" For="@(() => LoRaDevice.DevAddr)" Margin="Margin.Dense" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
}
<MudItem xs="12">
<MudTextField @bind-Value="@LoRaDevice.GatewayID" Label="Gateway Id" For="@(() => LoRaDevice.GatewayID)" Margin="Margin.Dense" Variant="Variant.Outlined"></MudTextField>
</MudItem>
<MudItem xs="12">
<MudTextField @bind-Value="@LoRaDevice.SensorDecoder" Label="Sensor Decoder URL" For="@(() => LoRaDevice.SensorDecoder)" Margin="Margin.Dense" Variant="Variant.Outlined"></MudTextField>
</MudItem>
</MudGrid>
<MudGrid>
<MudItem xs="12">
<MudSwitch T=bool? @bind-Checked="@LoRaDevice.Downlink" For="@(() => LoRaDevice.Downlink)" Label="Enable/disable downstream messages" Color="Color.Primary"></MudSwitch>
</MudItem>

<MudItem xs="12" md="6">
<MudNumericField T="int?" @bind-Value="@LoRaDevice.PreferredWindow" For="@(() => LoRaDevice.PreferredWindow)" Min="1" Max="2" Label="Preferred receive window"></MudNumericField>
</MudItem>

<MudItem xs="12" md="6">
<MudSelect @bind-Value="@LoRaDevice.Deduplication" For="@(() => LoRaDevice.Deduplication)" AnchorOrigin="Origin.BottomCenter" Label="Message Deduplication" Variant="Variant.Outlined">
@foreach (DeduplicationMode item in Enum.GetValues(typeof(DeduplicationMode)))
<MudGrid>
@if (LoRaDevice.UseOTAA)
{
<MudSelectItem Value="@item">@item</MudSelectItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.AppEUI" Label="OTAA App EUI" For="@(() => LoRaDevice.AppEUI)" ReadOnly="true" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.AppKey" Label="OTAA App Key" Validation="@(LoraValidator.ValidateValue)" For="@(() => LoRaDevice.AppKey)" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
}
</MudSelect>
</MudItem>

<MudItem xs="12">
<MudTextField T="int?" @bind-Value="@LoRaDevice.RX1DROffset" For="@(() => LoRaDevice.RX1DROffset)" Label="RX1 Datarate Offset" Margin="Margin.Dense" Variant="Variant.Outlined"></MudTextField>
</MudItem>

<MudItem xs="12">
<MudTextField T=int? @bind-Value="@LoRaDevice.RX2DataRate" For="@(() => LoRaDevice.RX2DataRate)" Label="RX2 Datarate" Margin="Margin.Dense" Variant="Variant.Outlined"></MudTextField>
</MudItem>

<MudItem xs="12" md="6">
<MudNumericField T="int?" @bind-Value="@LoRaDevice.RXDelay" For="@(() => LoRaDevice.RXDelay)" Min=1 Label="RX Delay"></MudNumericField>
</MudItem>

<MudItem xs="12">
<MudSwitch T="bool?" @bind-Checked="@LoRaDevice.ABPRelaxMode" For="@(() => LoRaDevice.ABPRelaxMode)" Label="Disable ABP relax mode" Color="Color.Primary"></MudSwitch>
</MudItem>

<MudItem xs="12">
<MudSwitch T="bool?" @bind-Checked="@LoRaDevice.Supports32BitFCnt" For="@(() => LoRaDevice.Supports32BitFCnt)" Label="32bit counter support" Color="Color.Primary"></MudSwitch>
</MudItem>

<MudItem xs="12" md="4">
<MudNumericField T="int?" @bind-Value="@LoRaDevice.FCntUpStart" For="@(() => LoRaDevice.FCntUpStart)" Min=1 Label="Specify frame counter up start value"></MudNumericField>
</MudItem>

<MudItem xs="12" md="4">
<MudNumericField @bind-Value="@LoRaDevice.FCntDownStart" For="@(() => LoRaDevice.FCntDownStart)" Min=1 Label="Specify frame counter down start value"></MudNumericField>
</MudItem>

<MudItem xs="12" md="4">
<MudNumericField T="int?" @bind-Value="@LoRaDevice.FCntResetCounter" For="@(() => LoRaDevice.FCntResetCounter)" Min=1 Label="Reset counter"></MudNumericField>
</MudItem>

<MudItem xs="12" md="4">
<MudNumericField T="int?" @bind-Value="@LoRaDevice.KeepAliveTimeout" For="@(() => LoRaDevice.KeepAliveTimeout)" Min=1 Label="Device Connection Timeout"></MudNumericField>
else
{
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.AppSKey" Label="APB App SKey" For="@(() => LoRaDevice.AppSKey)" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.NwkSKey" Label="APB Nwk SKey" For="@(() => LoRaDevice.NwkSKey)" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@LoRaDevice.DevAddr" Label="DevAddr" For="@(() => LoRaDevice.DevAddr)" Variant="Variant.Outlined" Required="true"></MudTextField>
</MudItem>
}
</MudGrid>
</MudItem>
<MudItem md="6" xs="12">
<MudGrid>
<MudItem xs="12">
<MudGrid>
<MudItem md="3" xs="6">
<MudSelect id="@nameof(LoRaDevice.ClassType)"
Disabled="true"
@bind-Value="@LoRaDevice.ClassType"
Label="Type"
Variant="Variant.Text"
For="@(()=> LoRaDevice.ClassType)"
Required="true">
@foreach (ClassType item in Enum.GetValues(typeof(ClassType)))
{
<MudSelectItem Value="@item">@item</MudSelectItem>
}
</MudSelect>
</MudItem>
<MudItem md="3" xs="6">
<MudSelect Disabled="true"
@bind-Value="@LoRaDevice.Deduplication"
For="@(() => LoRaDevice.Deduplication)"
AnchorOrigin="Origin.BottomCenter"
Label="Message Deduplication"
Variant="Variant.Text">
@foreach (DeduplicationMode item in Enum.GetValues(typeof(DeduplicationMode)))
{
<MudSelectItem Value="@item">@item</MudSelectItem>
}
</MudSelect>
</MudItem>
</MudGrid>
</MudItem>
<MudItem md="6" xs="12">
<MudTextField @bind-Value="@LoRaDevice.GatewayID" Label="Gateway Id" For="@(() => LoRaDevice.GatewayID)" Variant="Variant.Outlined"></MudTextField>
</MudItem>
</MudGrid>
</MudItem>
</MudGrid>
</MudCardContent>
Expand All @@ -113,28 +95,33 @@
</MudCardHeader>
<MudCardContent>
<MudGrid>
<MudItem xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.DataRate" Label="Data rate" Margin="Margin.Dense" Variant="Variant.Outlined" ReadOnly="true"></MudTextField>
</MudItem>

<MudItem xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.TxPower" Label="TxPower" Margin="Margin.Dense" Variant="Variant.Outlined" ReadOnly="true"></MudTextField>
</MudItem>

<MudItem xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.NbRep" Label="NbRep" Margin="Margin.Dense" Variant="Variant.Outlined" ReadOnly="true"></MudTextField>
</MudItem>

<MudItem xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.ReportedRX1DROffset" Label="Reported RX1DR Offset" Margin="Margin.Dense" Variant="Variant.Outlined" ReadOnly="true"></MudTextField>
</MudItem>

<MudItem xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.ReportedRX2DataRate" Label="Reported RX2 Data Rate" Margin="Margin.Dense" Variant="Variant.Outlined" ReadOnly="true"></MudTextField>
</MudItem>

<MudItem xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.ReportedRXDelay" Label="Reported RX Delay" Margin="Margin.Dense" Variant="Variant.Outlined" ReadOnly="true"></MudTextField>
<MudItem xs="12" md="6">
<MudText Typo=Typo.h5 Class="mb-4">Adaptive DataRate</MudText>
<MudGrid>
<MudItem md="6" xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.DataRate" Label="Device Current Datarate" Variant="Variant.Text" ReadOnly="true" />
</MudItem>
<MudItem md="6" xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.TxPower" Label="Device Current Transmit Power" Variant="Variant.Text" ReadOnly="true" />
</MudItem>
<MudItem md="6" xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.NbRep" Label="Device Current repetition when transmitting" Variant="Variant.Text" ReadOnly="true" />
</MudItem>
</MudGrid>
</MudItem>
<MudItem xs="12" md="6">
<MudText Typo=Typo.h5 Class="mb-4">Receive Windows</MudText>
<MudGrid>
<MudItem md="6" xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.ReportedRX1DROffset" Label="Device Current RX1DROffset" Variant="Variant.Text" ReadOnly="true" />
</MudItem>
<MudItem md="6" xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.ReportedRX2DataRate" Label="Device Current Rx2Datarate" Variant="Variant.Text" ReadOnly="true" />
</MudItem>
<MudItem md="6" xs="12">
<MudTextField T="string" @bind-Text="@LoRaDevice.ReportedRXDelay" Label="Device Current RXDelay" Variant="Variant.Text" ReadOnly="true" />
</MudItem>
</MudGrid>
</MudItem>
</MudGrid>
</MudCardContent>
Expand Down

0 comments on commit 37196e8

Please sign in to comment.