comicsansg/SSB_HighSpeed_Modem
1
0
Fork 0
mirror of https://github.com/dj0abr/SSB_HighSpeed_Modem.git synced 2026-06-02 14:04:49 -04:00
Code Issues Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Kurt Moraw
2020-12-15 14:38:56 +01:00
parent d38ab5f736
commit 7e306d77dc
18 changed files with 178 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oscardata/oscardata/Form1.Designer.cs
Generated
+50 -40
View File
@@ -33,6 +33,7 @@
this.timer_udpTX = new System.Windows.Forms.Timer(this.components);
this.timer_udprx = new System.Windows.Forms.Timer(this.components);
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStrip_Type = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.ts_ip = new System.Windows.Forms.ToolStripStatusLabel();
this.RXstatus = new System.Windows.Forms.ToolStripStatusLabel();
@@ -107,8 +108,6 @@
this.bt_resetmodem = new System.Windows.Forms.Button();
this.textBox3 = new System.Windows.Forms.TextBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.vu_cap = new oscardata.KmProgressBar();
this.vu_pb = new oscardata.KmProgressBar();
this.pb_audioCAPstatus = new System.Windows.Forms.PictureBox();
this.pb_audioPBstatus = new System.Windows.Forms.PictureBox();
this.label6 = new System.Windows.Forms.Label();
@@ -135,15 +134,17 @@
this.cb_speed = new System.Windows.Forms.ComboBox();
this.label_speed = new System.Windows.Forms.Label();
this.timer_searchmodem = new System.Windows.Forms.Timer(this.components);
this.progressBar_fifo = new oscardata.KmProgressBar();
this.label_fifo = new System.Windows.Forms.Label();
this.bt_blockinfo = new System.Windows.Forms.Button();
this.progressBar_capfifo = new oscardata.KmProgressBar();
this.label_capfifo = new System.Windows.Forms.Label();
this.lb_rxsignal = new System.Windows.Forms.Label();
this.lb_rxsync = new System.Windows.Forms.Label();
this.pb_rxsync = new System.Windows.Forms.PictureBox();
this.pb_rxsignal = new System.Windows.Forms.PictureBox();
this.progressBar_capfifo = new oscardata.KmProgressBar();
this.progressBar_fifo = new oscardata.KmProgressBar();
this.vu_cap = new oscardata.KmProgressBar();
this.vu_pb = new oscardata.KmProgressBar();
this.statusStrip1.SuspendLayout();
this.tabPage_ber.SuspendLayout();
this.tabPage_image.SuspendLayout();
@@ -188,6 +189,7 @@
//
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStrip_Type,
this.toolStripStatusLabel,
this.ts_ip,
this.RXstatus});
@@ -197,6 +199,13 @@
this.statusStrip1.TabIndex = 4;
this.statusStrip1.Text = "statusStrip1";
//
// toolStrip_Type
//
this.toolStrip_Type.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold);
this.toolStrip_Type.ForeColor = System.Drawing.Color.Red;
this.toolStrip_Type.Name = "toolStrip_Type";
this.toolStrip_Type.Size = new System.Drawing.Size(0, 17);
//
// toolStripStatusLabel
//
this.toolStripStatusLabel.Name = "toolStripStatusLabel";
@@ -1070,20 +1079,6 @@
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Transceiver Audio";
//
// vu_cap
//
this.vu_cap.Location = new System.Drawing.Point(479, 87);
this.vu_cap.Name = "vu_cap";
this.vu_cap.Size = new System.Drawing.Size(100, 10);
this.vu_cap.TabIndex = 20;
//
// vu_pb
//
this.vu_pb.Location = new System.Drawing.Point(479, 45);
this.vu_pb.Name = "vu_pb";
this.vu_pb.Size = new System.Drawing.Size(100, 10);
this.vu_pb.TabIndex = 19;
//
// pb_audioCAPstatus
//
this.pb_audioCAPstatus.BackgroundImage = global::oscardata.Properties.Resources.ok;
@@ -1375,17 +1370,6 @@
this.timer_searchmodem.Interval = 1000;
this.timer_searchmodem.Tick += new System.EventHandler(this.timer_searchmodem_Tick);
//
// progressBar_fifo
//
this.progressBar_fifo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.progressBar_fifo.Location = new System.Drawing.Point(658, 618);
this.progressBar_fifo.Maximum = 20;
this.progressBar_fifo.Name = "progressBar_fifo";
this.progressBar_fifo.Size = new System.Drawing.Size(304, 18);
this.progressBar_fifo.Step = 11;
this.progressBar_fifo.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.progressBar_fifo.TabIndex = 13;
//
// label_fifo
//
this.label_fifo.AutoSize = true;
@@ -1405,16 +1389,6 @@
this.bt_blockinfo.UseVisualStyleBackColor = true;
this.bt_blockinfo.Click += new System.EventHandler(this.bt_blockinfo_Click);
//
// progressBar_capfifo
//
this.progressBar_capfifo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
this.progressBar_capfifo.Location = new System.Drawing.Point(658, 642);
this.progressBar_capfifo.Name = "progressBar_capfifo";
this.progressBar_capfifo.Size = new System.Drawing.Size(304, 18);
this.progressBar_capfifo.Step = 1;
this.progressBar_capfifo.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.progressBar_capfifo.TabIndex = 15;
//
// label_capfifo
//
this.label_capfifo.AutoSize = true;
@@ -1462,6 +1436,41 @@
this.pb_rxsignal.TabIndex = 17;
this.pb_rxsignal.TabStop = false;
//
// progressBar_capfifo
//
this.progressBar_capfifo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
this.progressBar_capfifo.Location = new System.Drawing.Point(658, 642);
this.progressBar_capfifo.Name = "progressBar_capfifo";
this.progressBar_capfifo.Size = new System.Drawing.Size(304, 18);
this.progressBar_capfifo.Step = 1;
this.progressBar_capfifo.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.progressBar_capfifo.TabIndex = 15;
//
// progressBar_fifo
//
this.progressBar_fifo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.progressBar_fifo.Location = new System.Drawing.Point(658, 618);
this.progressBar_fifo.Maximum = 20;
this.progressBar_fifo.Name = "progressBar_fifo";
this.progressBar_fifo.Size = new System.Drawing.Size(304, 18);
this.progressBar_fifo.Step = 11;
this.progressBar_fifo.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.progressBar_fifo.TabIndex = 13;
//
// vu_cap
//
this.vu_cap.Location = new System.Drawing.Point(479, 87);
this.vu_cap.Name = "vu_cap";
this.vu_cap.Size = new System.Drawing.Size(100, 10);
this.vu_cap.TabIndex = 20;
//
// vu_pb
//
this.vu_pb.Location = new System.Drawing.Point(479, 45);
this.vu_pb.Name = "vu_pb";
this.vu_pb.Size = new System.Drawing.Size(100, 10);
this.vu_pb.TabIndex = 19;
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1485,7 +1494,7 @@
this.ForeColor = System.Drawing.SystemColors.ControlText;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "Form1";
this.Text = "QO-100 NB Transponder HS Multimedia Modem AMSAT-DL V0.50 by DJ0ABR";
this.Text = "AMSAT-DL Multimedia HS Modem V0.51 by DJ0ABR";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
@@ -1648,6 +1657,7 @@
private System.Windows.Forms.ComboBox cb_safemode;
private KmProgressBar vu_cap;
private KmProgressBar vu_pb;
private System.Windows.Forms.ToolStripStatusLabel toolStrip_Type;
}
}
oscardata/oscardata/Form1.cs
+27 -1
View File
@@ -397,6 +397,22 @@ namespace oscardata
}
}
int lasttype = -1;
void showType(int rxtype)
{
if(rxtype != lasttype)
{
if (rxtype == statics.Image) toolStrip_Type.Text = "RX: IMAGE";
if (rxtype == statics.AsciiFile) toolStrip_Type.Text = "RX: TEXT";
if (rxtype == statics.HTMLFile) toolStrip_Type.Text = "RX: HTML/Web";
if (rxtype == statics.BinaryFile) toolStrip_Type.Text = "RX: BINARY";
if (rxtype == statics.BERtest) toolStrip_Type.Text = "RX: BER TEST";
if (rxtype == statics.Audio) toolStrip_Type.Text = "RX: DV-Audio";
if (rxtype == -1) toolStrip_Type.Text = "no RX";
lasttype = rxtype;
}
}
// RX timer
int rxstat = 0;
int speed;
@@ -426,6 +442,8 @@ namespace oscardata
Byte[] rxdata = new byte[rxd.Length - 10];
Array.Copy(rxd, 10, rxdata, 0, rxd.Length - 10);
showType(rxtype);
//Console.WriteLine("minfo:" + minfo + " data:" + rxdata[0].ToString("X2") + " " + rxdata[1].ToString("X2"));
// ========= receive file ==========
@@ -578,7 +596,15 @@ namespace oscardata
if (statics.CAPfifousage > 50) progressBar_capfifo.ForeColor = Color.Red; else progressBar_capfifo.ForeColor = Color.Green;
// Show RX Status LEDs
if (statics.RXlevelDetected == 1) pb_rxsignal.BackgroundImage = Resources.greenmarker; else pb_rxsignal.BackgroundImage = Resources.redmarker;
if (statics.RXlevelDetected == 1)
{
pb_rxsignal.BackgroundImage = Resources.greenmarker;
}
else
{
pb_rxsignal.BackgroundImage = Resources.redmarker;
showType(-1);
}
if (statics.RXinSync == 1 && statics.RXlevelDetected == 1) pb_rxsync.BackgroundImage = Resources.greenmarker; else pb_rxsync.BackgroundImage = Resources.redmarker;
// update rx,tx level progress bar
oscardata/oscardata/Form1.resx
+6 -4
View File
@@ -137,7 +137,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABw
FwAAAk1TRnQBSQFMAgEBDQEAAUgBAgFIAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
FwAAAk1TRnQBSQFMAgEBDQEAAaABAgGgAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAAUADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -241,11 +241,13 @@
</value>
</data>
<data name="richTextBox1.Text" xml:space="preserve">
<value>QO-100 Multimedia High Speed Modem (Linux &amp; Windows)
<value>Amsat-DL Multimedia High Speed Modem (Linux &amp; Windows)
(c) DJ0ABR, Kurt Moraw, Germany https://dj0abr.de/
Author: (c) DJ0ABR, Kurt Moraw, Germany https://dj0abr.de/
Wiki: https://hsmodem.dj0abr.de/doku.php
License: GPL V2 or later
Amsat-DL: https://amsat-dl.org/
Open Source: https://github.com/dj0abr/SSB_HighSpeed_Modem
Open Source: https://github.com/amsat-dl
3rd Party, Credits and Licensing:
oscardata/oscardata/bin/Release/oscardata.exe
BIN
View File
Binary file not shown.
oscardata/oscardata/receivefile.cs
+1 -1
View File
@@ -189,7 +189,7 @@ namespace oscardata
if (!autoRXnum)
blockidx = rxfrmnum;
Console.WriteLine("minfo:" + minfo + " framenum:" + rxfrmnum + " blockidx:" + blockidx);
//Console.WriteLine("minfo:" + minfo + " framenum:" + rxfrmnum + " blockidx:" + blockidx);
Array.Copy(rxd, 10, rxdata, 0, rxd.Length - 10);
return true;
oscardata/oscardata/udp.cs
+1 -1
View File
@@ -175,7 +175,7 @@ namespace oscardata
}
static int panelw = 75, panelh = 75;
static int maxdrawanz = 160;
static int maxdrawanz = 350;//160;
static int drawanz = 0;
static Bitmap bm;
static void drawBitmap(Int32 re, Int32 im)