Skip to content

Commit

Permalink
Support for ChirpChat mod and demod and IEEE802.15.4 mod
Browse files Browse the repository at this point in the history
  • Loading branch information
f4exb committed Nov 27, 2021
1 parent 47a2a88 commit 7e08447
Show file tree
Hide file tree
Showing 21 changed files with 3,321 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sdrangelcli",
"version": "2.3.0",
"version": "2.4.0",
"repository": {
"type": "git",
"url": "git://github.com/f4exb/sdrangelcli.git"
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { RemoveFeaturesetDialogComponent } from './main/remove-featureset-dialog
export class AppComponent {

title = 'SDRangelCli';
version = '2.3.0';
version = '2.4.0';
sdrangelURL = 'http://127.0.0.1:8091/sdrangel'; // the default URL

constructor(private sdrangelUrlService: SdrangelUrlService,
Expand Down
15 changes: 15 additions & 0 deletions src/app/channel-details/channel-details-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ import { PacketDemodComponent } from './packet-demod/packet-demod.component';
import { PagerDemodComponent } from './pager-demod/pager-demod.component';
import { AisModComponent } from './ais-mod/ais-mod.component';
import { PacketModComponent } from './packet-mod/packet-mod.component';
import { Ieee802154ModComponent } from './ieee802154-mod/ieee802154-mod.component';
import { ChirpchatModComponent } from './chirpchat-mod/chirpchat-mod.component';
import { ChirpchatDemodComponent } from './chirpchat-demod/chirpchat-demod.component';

export const routes: Routes = [
{
Expand All @@ -58,6 +61,14 @@ export const routes: Routes = [
path: 'bfmdemod',
component: BfmDemodComponent
},
{
path: 'chirpchatdemod',
component: ChirpchatDemodComponent
},
{
path: 'chirpchatmod',
component: ChirpchatModComponent
},
{
path: 'filesink',
component: FileSinkComponent
Expand All @@ -78,6 +89,10 @@ export const routes: Routes = [
path: 'freqtracker',
component: FreqtrackerSinkComponent
},
{
path: 'ieee802154mod',
component: Ieee802154ModComponent
},
{
path: 'localsink',
component: LocalSinkComponent
Expand Down
6 changes: 6 additions & 0 deletions src/app/channel-details/channel-details.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ export class ChannelDetailsComponent implements OnInit {
this.router.navigate(['amdemod'], { relativeTo: this.route});
} else if (channelSettings.channelType === 'BFMDemod') {
this.router.navigate(['bfmdemod'], { relativeTo: this.route});
} else if (channelSettings.channelType === 'ChirpChatDemod') {
this.router.navigate(['chirpchatdemod'], { relativeTo: this.route});
} else if (channelSettings.channelType === 'ChirpChatMod') {
this.router.navigate(['chirpchatmod'], { relativeTo: this.route});
} else if (channelSettings.channelType === 'FileSink') {
this.router.navigate(['filesink'], { relativeTo: this.route});
} else if (channelSettings.channelType === 'FileSource') {
Expand All @@ -58,6 +62,8 @@ export class ChannelDetailsComponent implements OnInit {
this.router.navigate(['freedvdemod'], { relativeTo: this.route});
} else if (channelSettings.channelType === 'FreqTracker') {
this.router.navigate(['freqtracker'], { relativeTo: this.route});
} else if (channelSettings.channelType === 'IEEE_802_15_4_Mod') {
this.router.navigate(['ieee802154mod'], { relativeTo: this.route});
} else if (channelSettings.channelType === 'LocalSink') {
this.router.navigate(['localsink'], { relativeTo: this.route});
} else if (channelSettings.channelType === 'LocalSource') {
Expand Down
8 changes: 7 additions & 1 deletion src/app/channel-details/channel-details.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ import { PacketDemodComponent } from './packet-demod/packet-demod.component';
import { PagerDemodComponent } from './pager-demod/pager-demod.component';
import { AisModComponent } from './ais-mod/ais-mod.component';
import { PacketModComponent } from './packet-mod/packet-mod.component';
import { Ieee802154ModComponent } from './ieee802154-mod/ieee802154-mod.component';
import { ChirpchatModComponent } from './chirpchat-mod/chirpchat-mod.component';
import { ChirpchatDemodComponent } from './chirpchat-demod/chirpchat-demod.component';

@NgModule({
imports: [
Expand Down Expand Up @@ -95,7 +98,10 @@ import { PacketModComponent } from './packet-mod/packet-mod.component';
PacketDemodComponent,
PagerDemodComponent,
AisModComponent,
PacketModComponent
PacketModComponent,
Ieee802154ModComponent,
ChirpchatModComponent,
ChirpchatDemodComponent
]
})
export class ChannelDetailsModule { }
10 changes: 10 additions & 0 deletions src/app/channel-details/channel-details.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ import { PacketDemodReport, PacketDemodSettings } from './packet-demod/packet-de
import { PagerDemodReport, PagerDemodSettings } from './pager-demod/pager-demod';
import { AISModActions, AISModReport, AISModSettings } from './ais-mod/ais-mod';
import { PacketModActions, PacketModReport, PacketModSettings } from './packet-mod/packet-mod';
import { IEEE_802_15_4_ModActions, IEEE_802_15_4_ModReport, IEEE_802_15_4_ModSettings } from './ieee802154-mod/ieee802154-mod';
import { ChirpChatModReport, ChirpChatModSettings } from './chirpchat-mod/chirpchat-mod';
import { ChirpChatDemodReport, ChirpChatDemodSettings } from './chirpchat-demod/chirpchat-demod';

export interface ChannelSettings {
channelType: string;
Expand All @@ -38,11 +41,14 @@ export interface ChannelSettings {
AISModSettings?: AISModSettings;
AMDemodSettings?: AMDemodSettings;
BFMDemodSettings?: BFMDemodSettings;
ChirpChatDemodSettings?: ChirpChatDemodSettings;
ChirpChatModSettings?: ChirpChatModSettings;
FileSinkSettings?: FileSinkSettings;
FileSourceSettings?: FileSourceSettings;
FreeDVDemodSettings?: FreeDVDemodSettings;
FreeDVModSettings?: FreeDVModSettings;
FreqTrackerSettings?: FreqTrackerSettings;
IEEE_802_15_4_ModSettings?: IEEE_802_15_4_ModSettings;
LocalSinkSettings?: LocalSinkSettings;
LocalSourceSettings?: LocalSourceSettings;
NFMDemodSettings?: NFMDemodSettings;
Expand Down Expand Up @@ -71,11 +77,14 @@ export interface ChannelReport {
AISModReport?: AISModReport;
AMDemodReport?: AMDemodReport;
BFMDemodReport?: BFMDemodReport;
ChirpChatDemodReport?: ChirpChatDemodReport;
ChirpChatModReport?: ChirpChatModReport;
FileSinkReport?: FileSinkReport;
FileSourceReport?: FileSourceReport;
FreeDVDemodReport?: FreeDVDemodReport;
FreeDVModReport?: FreeDVModReport;
FreqTrackerReport?: FreqTrackerReport;
IEEE_802_15_4_ModReport?: IEEE_802_15_4_ModReport;
NFMDemodReport?: NFMDemodReport;
SSBDemodReport?: SSBDemodReport;
DSDDemodReport?: DSDDemodReport;
Expand All @@ -101,6 +110,7 @@ export interface ChannelActions {
AISModActions?: AISModActions;
FileSinkActions?: FileSinkActions;
FileSourceActions?: FileSourceActions;
IEEE_802_15_4_ModActions?: IEEE_802_15_4_ModActions;
PacketModActions?: PacketModActions;
SigMFFileSinkActions?: SigMFFileSinkActions;
channelType: string;
Expand Down
114 changes: 114 additions & 0 deletions src/app/channel-details/chirpchat-demod/chirpchat-demod.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
.channel-card-header {
font-family: Arial, Helvetica, sans-serif;
font-size: 14px;
border: solid;
border-color: gray;
border-width: 1px;
margin-bottom: 5px;
padding: 0.2em 0.2em 0.2em 0.2em;
}

.channel-header-rx {
background-color: rgb(170,255,200);
}

.channel-header-comp {
margin-top: 1px;
}

.button-card {
padding-top: 0px;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0px;
width: 22px;
height: 22px;
}

.button-on {
border: solid;
border-width: 1px;
border-color: gray;
background-color: rgb(0, 255, 0, 1.0);
}

.button-off {
border: solid;
border-width: 1px;
border-color: gray;
background-color: rgb(0, 0, 0, 0);
}

.address-input {
width: 15ch;
}

.volume-input {
width: 6ch;
}

.squelch-input {
width: 6ch;
}

.rfbw-input {
width: 6ch;
}

.index-input {
width: 6ch;
}

.file-input {
width: 70ch;
}

.status-parity-ok {
background-color: rgb(134, 255, 110);
}

.status-parity-error {
background-color: rgb(255, 134, 110);
}

.status-parity-corrected {
background-color: rgb(110, 134, 255);
}

.status-parity-undefined {
background-color: rgb(180, 180, 180);
}

td {
background-color: rgb(230, 230, 210);
}

.status-ok-card {
border: outset;
border-color: rgb(134, 255, 110);
border-width: 2px;
margin-bottom: 5px;
padding: 0.2em 0.2em 0.2em 0.2em;
}

.status-ko-card {
border: solid;
border-color: rgb(255, 134, 110);
border-width: 2px;
padding: 0.2em 0.2em 0.2em 0.2em;
}

::ng-deep .mat-card {
/* CSS styles go here */
padding: 0px; /* for example to remove the margin */
}

::ng-deep .mat-checkbox-inner-container {
height: 14px!important;
width: 14px!important;
background-color: white;
}

::ng-deep .mat-checkbox-label {
line-height: 16px!important;
}
Loading

0 comments on commit 7e08447

Please sign in to comment.