Skip to content

Commit

Permalink
v3.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
w5wc committed Jan 31, 2019
1 parent 2954efe commit a110e02
Show file tree
Hide file tree
Showing 45 changed files with 49 additions and 14 deletions.
Expand Up @@ -556,14 +556,14 @@ void loop() {
fault(); // Jump to FAULT handling
}

if ((volt_50 <= 430) and (Operate == 1) and (TestMode == 0) and (PTT == 0) and (supply_50_stby == 0)) // Undervoltage while in operate mode, in RX ! Fault in pallet ?
if ((volt_50 <= 400) and (Operate == 1) and (TestMode == 0) and (PTT == 0) and (supply_50_stby == 0)) // Undervoltage while in operate mode, in RX ! Fault in pallet ?
{
FAULT = 2;
fault(); // Jump to FAULT handling
}

// detect long lasting voltage dip
if ((volt_50 <= 450) and (Operate == 1) and (TestMode == 0) and (PTT == 1) ) // Undervoltage while in TX mode
if ((volt_50 <= 430) and (Operate == 1) and (TestMode == 0) and (PTT == 1) ) // Undervoltage while in TX mode
{
if (LoVolt50 == 0) LoVolt50Time = millis();
LoVolt50 = 1;
Expand Down
4 changes: 2 additions & 2 deletions Project Files/Source/Console/HPSDR/JanusAudioImports.cs
Expand Up @@ -132,13 +132,13 @@ unsafe partial class JanusAudio
public static extern bool getUserI01(); // TX Inhibit input sense

[DllImport("JanusAudio.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern bool getUserI02();
public static extern bool getUserI02(); // Tx Inhibit input on Orion MKII board

[DllImport("JanusAudio.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern bool getUserI03();

[DllImport("JanusAudio.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern bool getUserI04();
public static extern bool getUserI04(); // external straight key input

[DllImport("JanusAudio.dll", CallingConvention = CallingConvention.Cdecl)] // sets number of receivers
public static extern void SetNRx(int nrx);
Expand Down
6 changes: 4 additions & 2 deletions Project Files/Source/Console/console.cs
Expand Up @@ -33104,6 +33104,7 @@ private void PollCW()
while (chkPower.Checked)
{
dotdashptt = JanusAudio.nativeGetDotDashPTT();
bool straightkeyin = JanusAudio.getUserI04();
bool state = (dotdashptt & 0x01) != 0; // ptt
state = (dotdashptt & 0x02) != 0; // dash

Expand All @@ -33120,6 +33121,7 @@ private void PollCW()
//SetConsoleMox(state);
}


last_bmp = dotdashptt;
Thread.Sleep(10);
}
Expand Down Expand Up @@ -33249,10 +33251,10 @@ private void PollTXInhibit()
bool inhibit_input;
while (chkPower.Checked)
{
if (tx_inhibit_enabled && current_hpsdr_model != HPSDRModel.HPSDR)
if (/*tx_inhibit_enabled && */ current_hpsdr_model != HPSDRModel.HPSDR)
{
if (anan7000dpresent || anan8000dpresent)
inhibit_input = JanusAudio.getUserI02();
inhibit_input = JanusAudio.getUserI02();
else
inhibit_input = JanusAudio.getUserI01();

Expand Down
1 change: 1 addition & 0 deletions Project Files/Source/Console/setup.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Project Files/Source/Console/titlebar.cs
Expand Up @@ -35,7 +35,7 @@ namespace PowerSDR
class TitleBar
{
public const string BUILD_NAME = "mRX PS";
public const string BUILD_DATE = "(10/26/18)";
public const string BUILD_DATE = "(1/31/19)";

public static string GetString()
{
Expand Down
34 changes: 33 additions & 1 deletion Project Files/Source/Console/xvtr.cs
Expand Up @@ -1323,6 +1323,8 @@ private void InitializeComponent()
//
// chkXVTRRF15
//
this.chkXVTRRF15.Checked = true;
this.chkXVTRRF15.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF15.Enabled = false;
this.chkXVTRRF15.Image = null;
this.chkXVTRRF15.Location = new System.Drawing.Point(774, 408);
Expand All @@ -1333,6 +1335,8 @@ private void InitializeComponent()
//
// chkXVTRRF14
//
this.chkXVTRRF14.Checked = true;
this.chkXVTRRF14.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF14.Enabled = false;
this.chkXVTRRF14.Image = null;
this.chkXVTRRF14.Location = new System.Drawing.Point(774, 384);
Expand All @@ -1343,6 +1347,8 @@ private void InitializeComponent()
//
// chkXVTRRF13
//
this.chkXVTRRF13.Checked = true;
this.chkXVTRRF13.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF13.Enabled = false;
this.chkXVTRRF13.Image = null;
this.chkXVTRRF13.Location = new System.Drawing.Point(774, 360);
Expand All @@ -1353,6 +1359,8 @@ private void InitializeComponent()
//
// chkXVTRRF12
//
this.chkXVTRRF12.Checked = true;
this.chkXVTRRF12.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF12.Enabled = false;
this.chkXVTRRF12.Image = null;
this.chkXVTRRF12.Location = new System.Drawing.Point(774, 336);
Expand All @@ -1363,6 +1371,8 @@ private void InitializeComponent()
//
// chkXVTRRF11
//
this.chkXVTRRF11.Checked = true;
this.chkXVTRRF11.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF11.Enabled = false;
this.chkXVTRRF11.Image = null;
this.chkXVTRRF11.Location = new System.Drawing.Point(774, 312);
Expand All @@ -1373,6 +1383,8 @@ private void InitializeComponent()
//
// chkXVTRRF10
//
this.chkXVTRRF10.Checked = true;
this.chkXVTRRF10.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF10.Enabled = false;
this.chkXVTRRF10.Image = null;
this.chkXVTRRF10.Location = new System.Drawing.Point(774, 288);
Expand All @@ -1383,6 +1395,8 @@ private void InitializeComponent()
//
// chkXVTRRF9
//
this.chkXVTRRF9.Checked = true;
this.chkXVTRRF9.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF9.Enabled = false;
this.chkXVTRRF9.Image = null;
this.chkXVTRRF9.Location = new System.Drawing.Point(774, 264);
Expand All @@ -1393,6 +1407,8 @@ private void InitializeComponent()
//
// chkXVTRRF8
//
this.chkXVTRRF8.Checked = true;
this.chkXVTRRF8.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF8.Enabled = false;
this.chkXVTRRF8.Image = null;
this.chkXVTRRF8.Location = new System.Drawing.Point(774, 240);
Expand All @@ -1403,6 +1419,8 @@ private void InitializeComponent()
//
// chkXVTRRF7
//
this.chkXVTRRF7.Checked = true;
this.chkXVTRRF7.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF7.Enabled = false;
this.chkXVTRRF7.Image = null;
this.chkXVTRRF7.Location = new System.Drawing.Point(774, 216);
Expand All @@ -1413,6 +1431,8 @@ private void InitializeComponent()
//
// chkXVTRRF6
//
this.chkXVTRRF6.Checked = true;
this.chkXVTRRF6.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF6.Enabled = false;
this.chkXVTRRF6.Image = null;
this.chkXVTRRF6.Location = new System.Drawing.Point(774, 192);
Expand All @@ -1423,6 +1443,8 @@ private void InitializeComponent()
//
// chkXVTRRF5
//
this.chkXVTRRF5.Checked = true;
this.chkXVTRRF5.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF5.Enabled = false;
this.chkXVTRRF5.Image = null;
this.chkXVTRRF5.Location = new System.Drawing.Point(774, 168);
Expand All @@ -1433,6 +1455,8 @@ private void InitializeComponent()
//
// chkXVTRRF4
//
this.chkXVTRRF4.Checked = true;
this.chkXVTRRF4.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF4.Enabled = false;
this.chkXVTRRF4.Image = null;
this.chkXVTRRF4.Location = new System.Drawing.Point(774, 144);
Expand All @@ -1443,6 +1467,8 @@ private void InitializeComponent()
//
// chkXVTRRF3
//
this.chkXVTRRF3.Checked = true;
this.chkXVTRRF3.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF3.Enabled = false;
this.chkXVTRRF3.Image = null;
this.chkXVTRRF3.Location = new System.Drawing.Point(774, 120);
Expand All @@ -1453,6 +1479,8 @@ private void InitializeComponent()
//
// chkXVTRRF2
//
this.chkXVTRRF2.Checked = true;
this.chkXVTRRF2.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF2.Enabled = false;
this.chkXVTRRF2.Image = null;
this.chkXVTRRF2.Location = new System.Drawing.Point(774, 96);
Expand All @@ -1463,6 +1491,8 @@ private void InitializeComponent()
//
// chkXVTRRF1
//
this.chkXVTRRF1.Checked = true;
this.chkXVTRRF1.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF1.Enabled = false;
this.chkXVTRRF1.Image = null;
this.chkXVTRRF1.Location = new System.Drawing.Point(774, 72);
Expand All @@ -1473,6 +1503,8 @@ private void InitializeComponent()
//
// chkXVTRRF0
//
this.chkXVTRRF0.Checked = true;
this.chkXVTRRF0.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkXVTRRF0.Enabled = false;
this.chkXVTRRF0.Image = null;
this.chkXVTRRF0.Location = new System.Drawing.Point(774, 48);
Expand All @@ -1484,7 +1516,7 @@ private void InitializeComponent()
// lblXVTRRF
//
this.lblXVTRRF.Image = null;
this.lblXVTRRF.Location = new System.Drawing.Point(766, 16);
this.lblXVTRRF.Location = new System.Drawing.Point(761, 16);
this.lblXVTRRF.Name = "lblXVTRRF";
this.lblXVTRRF.Size = new System.Drawing.Size(40, 32);
this.lblXVTRRF.TabIndex = 170;
Expand Down
Binary file modified Project Files/Source/JanusAudio/JanusAudio.exp
Binary file not shown.
Binary file modified Project Files/Source/JanusAudio/JanusAudio.lib
Binary file not shown.
2 changes: 1 addition & 1 deletion Project Files/Source/JanusAudio/PowerSDR-Interface.c
Expand Up @@ -381,7 +381,7 @@ int getDDPTTcount = 0;
int last_DDP = 0;

KD5TFDVK6APHAUDIO_API int nativeGetDotDashPTT() {
DotDashBits |= (~User_I02) & 0x04; //**K5SO
//DotDashBits |= (~User_I02) & 0x04; //**K5SO

if ( last_DDP != (DotDashBits & 0x7) ) {
last_DDP = DotDashBits & 0x7;
Expand Down
10 changes: 5 additions & 5 deletions Project Files/Source/JanusAudio/io-thread.c
Expand Up @@ -1038,13 +1038,13 @@ void IOThreadMainLoop(void) {

switch (ControlBytesIn[0] & CandCAddrMask) {
case 0:
ADC_Overload = ControlBytesIn[1] & 1;
ADC_Overload = ControlBytesIn[1] & 0x1;
if (HermesPowerEnabled) {
//processOverloadBit((ControlBytesIn[1] & 1), (ControlBytesIn[1] & 1));
User_I01 = ControlBytesIn[1] & 0x02;
User_I02 = ControlBytesIn[1] & 0x04;
User_I03 = ControlBytesIn[1] & 0x08;
User_I04 = ControlBytesIn[1] & 0x10;
User_I01 = ((ControlBytesIn[1] >> 1) & 0x1);
User_I02 = ((ControlBytesIn[1] >> 2) & 0x1);
User_I03 = ((ControlBytesIn[1] >> 3) & 0x1);
User_I04 = ((ControlBytesIn[1] >> 4) & 0x1);
}
break;
case 0x8:
Expand Down
Binary file modified Project Files/bin/Debug/JanusAudio.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/JanusAudio.ilk
Binary file not shown.
Binary file modified Project Files/bin/Debug/Midi2Cat.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/Midi2Cat.pdb
Binary file not shown.
Binary file modified Project Files/bin/Debug/PA19.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/PA19.ilk
Binary file not shown.
Binary file modified Project Files/bin/Debug/PowerSDR.exe
Binary file not shown.
Binary file modified Project Files/bin/Debug/PowerSDR.pdb
Binary file not shown.
Binary file modified Project Files/bin/Debug/de/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/es/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/fr/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/it/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/ja/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/ko/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/pthreadVC.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/pthreadVC.pdb
Binary file not shown.
Binary file modified Project Files/bin/Debug/ru/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/wdsp.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/wdsp.ilk
Binary file not shown.
Binary file modified Project Files/bin/Debug/zh-Hans/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Debug/zh-Hant/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/JanusAudio.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/Midi2Cat.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/Midi2Cat.pdb
Binary file not shown.
Binary file modified Project Files/bin/Release/PowerSDR.exe
Binary file not shown.
Binary file modified Project Files/bin/Release/PowerSDR.pdb
Binary file not shown.
Binary file modified Project Files/bin/Release/de/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/es/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/fr/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/it/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/ja/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/ko/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/ru/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/zh-Hans/PowerSDR.resources.dll
Binary file not shown.
Binary file modified Project Files/bin/Release/zh-Hant/PowerSDR.resources.dll
Binary file not shown.

0 comments on commit a110e02

Please sign in to comment.