Hermes lite

Project Files/Source/ChannelMaster/cmasio.c

@@ -52,7 +52,7 @@ void create_cmasio()
 	char* asioDriverName = (char*)calloc(32, sizeof(char));
 	if (getASIODriverString(asioDriverName) != 0) { free(asioDriverName); return; }
 	char buf[128];
-	sprintf_s(buf, 128, "Initializing cmASIO with: \nblock size = %d\nsample rate = %d\ndriver name = \"%s\"\n\n", pcma->blocksize, samplerate, asioDriverName);
+	sprintf_s(buf, 128, "Initializing cmASIO with: \nblock size = %d\nsample rate = %d\ndriver name = %s\n\n", pcma->blocksize, samplerate, asioDriverName);
 	OutputDebugStringA(buf);
 
 	//[2.10.3.13]MW0LGE get explicit base channel indices for the stereo pair, default to 0 if none in registry
@@ -400,4 +400,4 @@ void resetCMAevents()
 	pcma->overFlowsIn = pcma->overFlowsOut = pcma->underFlowsIn = pcma->underFlowsOut = 0;
 	resetRMatchDiags(pcma->rmatchIN);
 	resetRMatchDiags(pcma->rmatchOUT);
-}
+}

Project Files/Source/ChannelMaster/cmasio.h

@@ -91,4 +91,4 @@ typedef struct _cmasio
 
 extern CMASIO pcma;
 
-#endif
+#endif

Project Files/Source/ChannelMaster/netInterface.c

@@ -625,6 +625,9 @@ void DisablePA(int bit)
 {
 	if (prn->tx[0].pa != bit) 
 	{
+		if (HPSDRModel == HPSDRModel_HERMESLITE)
+			EnableApolloTuner(!bit);	// MI0BOT: This call used on HL2 to enable/disable PA
+
 		prn->tx[0].pa = bit;		
 		if (listenSock != INVALID_SOCKET)
 			CmdGeneral();
@@ -810,6 +813,25 @@ void SetLineBoost(int bits)
 	}
 }
 
+PORT // MI0BOT: Causes a HL2 to perform a reset on disconnect
+void SetResetOnDisconnect(int bit)
+{
+	if (prn->reset_on_disconnect != bit)
+	{
+		prn->reset_on_disconnect = bit & 0x1;
+	}
+}
+
+PORT // MI0BOT: Control to swap the left and right audio channels send over P1
+
+void SwapAudioChannels(int swap)
+{
+	if (prn->swap_audio_channels != swap)
+	{
+		prn->swap_audio_channels = swap & 0x1;
+	}
+}
+
 PORT
 void SetPureSignal(int bit) 
 {
@@ -1173,11 +1195,32 @@ void SetCWX(int bit)
 {
 	if (prn->tx[0].cwx != bit) 
 	{
-		prn->tx[0].cwx = bit;
+		if (prn->cw.break_in == true || XmitBit == true || prn->tx[0].cwx_ptt == true)
+		{
+			prn->tx[0].cwx = bit;
+		}
+
 		keySidetone(0, 0, bit);
 		if (listenSock != INVALID_SOCKET) //[2.10.3.6]MW0LGE high priority always
 			CmdHighPriority();
 	}
+	else
+	{
+		// Make sure we get correct side tone when break-in is not active
+		if (prn->cw.break_in != true)
+			keySidetone(0, 0, bit);
+	}
+}
+
+PORT // MI0BOT: On the HL2 the CWX protocol has been updated to pass PTT in Bit 3 
+void SetCWXPTT(int bit) 
+{
+	if (prn->tx[0].cwx_ptt != bit) 
+	{
+		prn->tx[0].cwx_ptt = bit;
+		if (listenSock != INVALID_SOCKET)
+			CmdHighPriority();
+	}
 }
 
 PORT
@@ -1412,6 +1455,138 @@ void LRAudioSwap (int swap)
 		prn->lr_audio_swap = swap;
 }
 
+PORT // MI0BOT: Controls the delay for PTT to Tx power out for HL2
+void SetTxLatency (int txLatency)
+{
+	prn->tx[0].tx_latency = txLatency;
+}
+
+PORT // MI0BOT: Determines the delay until Tx/Rx change over after Tx buffer empties for the HL2
+void SetPttHang (int pttHang)
+{
+	prn->tx[0].ptt_hang = pttHang;
+}
+
+PORT // MI0BOT: Initialises for a read of the I2C on the HL2
+int I2CReadInitiate(int bus, int address, int control)
+{
+	int return_code = -1;
+
+	// Only read when a sequence of writes are not in progress
+	// This is true only when the IN and OUT indexes are the same
+
+	if (prn->i2c.in_index == prn->i2c.out_index)
+	{
+		// Get the next free spot in the queue
+
+		unsigned char next = prn->i2c.in_index + 1 >= MAX_I2C_QUEUE ? 0 : prn->i2c.in_index + 1;
+
+		prn->i2c.i2c_queue[next].bus = bus;
+		prn->i2c.i2c_queue[next].address = address;
+		prn->i2c.i2c_queue[next].control = control;
+
+		prn->i2c.i2c_control = 0;	// Clear all the control bits
+		prn->i2c.ctrl_read = 1;
+		prn->i2c.ctrl_stop = 1;
+		prn->i2c.ctrl_request = 1;
+
+		prn->i2c.in_index = next;	// Move IN index on to start the transmission
+
+		return_code = 0;
+	}
+
+	return return_code;
+}
+
+PORT // MI0BOT: Initialises for a write of the I2C on the HL2 where a return is expected
+int I2CWriteInitiate(int bus, int address, int control, int data)
+{
+	int return_code = -1;
+
+	if (0 == prn->i2c.ctrl_read)
+	{
+		// Only proceed if read is not in progress
+
+		// Get the next index in the IN queue
+		unsigned char next = prn->i2c.in_index + 1 >= MAX_I2C_QUEUE ? 0 : prn->i2c.in_index + 1;
+
+		if (next != prn->i2c.out_index)
+		{
+			// Only proceed if the indexes are not the same, as that is the overflow condition
+
+			prn->i2c.i2c_queue[next].bus = bus;
+			prn->i2c.i2c_queue[next].address = address;
+			prn->i2c.i2c_queue[next].control = control;
+			prn->i2c.i2c_queue[next].write_data = data;
+
+			// We are expecting a response
+			prn->i2c.ctrl_request = 1;
+
+			// Move the index on to start the transmission
+			prn->i2c.in_index = next;
+
+			return_code = 0;
+		}
+	}
+
+	return return_code;
+}
+
+PORT // MI0BOT: Write to the I2C on the HL2 when a return is not expected
+int I2CWrite(int bus, int address, int control, int data)
+{
+	int return_code = -1;
+
+	if (0 == prn->i2c.ctrl_read)
+	{
+		// Only proceed if read is not in progress
+
+		// Get the next index in the IN queue
+		unsigned char next = prn->i2c.in_index + 1 >= MAX_I2C_QUEUE ? 0 : prn->i2c.in_index + 1;
+
+		if (next != prn->i2c.out_index)
+		{
+			// Only proceed if the indexs are not the same, as that is the overflow condition
+
+			prn->i2c.i2c_queue[next].bus = bus;
+			prn->i2c.i2c_queue[next].address = address;
+			prn->i2c.i2c_queue[next].control = control;
+			prn->i2c.i2c_queue[next].write_data = data;
+
+			// Move the index on to start the transmission
+			prn->i2c.in_index = next;
+
+			return_code = 0;
+		}
+	}
+
+	return return_code;
+}
+
+PORT // MI0BOT: Handles the I2C responses for the HL2
+int I2CResponse(unsigned char* read_data)
+{
+	int return_code = 1;
+
+	if (prn->i2c.ctrl_error)
+	{
+		return_code = -1;
+	}
+	else if (prn->i2c.ctrl_read_available)
+	{
+		prn->i2c.i2c_control = 0;
+
+		read_data[0] = prn->i2c.read_data[0];
+		read_data[1] = prn->i2c.read_data[1];
+		read_data[2] = prn->i2c.read_data[2];
+		read_data[3] = prn->i2c.read_data[3];
+
+		return_code = 0;
+	}
+
+	return return_code;
+}
+
 PORT
 void create_rnet() 
 {
@@ -1444,6 +1619,16 @@ void create_rnet()
 		prn->cc_seq_no = 0;
 		prn->cc_seq_err = 0;
 
+		prn->i2c.i2c_control = 0;	// MI0BOT: HL2 I2C variables 
+		prn->i2c.returned_address = 0;
+		prn->i2c.read_data[0] = 0;
+		prn->i2c.read_data[1] = 0;
+		prn->i2c.read_data[2] = 0;
+		prn->i2c.read_data[3] = 0;
+		prn->i2c.in_index = 0;
+		prn->i2c.out_index = 0;
+		prn->i2c.delay = 0;
+
 		prn->cw.mode_control = 0;
 		prn->cw.sidetone_level = 0;
 		prn->cw.sidetone_freq = 0;
@@ -1512,6 +1697,7 @@ void create_rnet()
 			prn->tx[i].frequency = 0;
 			prn->tx[i].sampling_rate = 192;
 			prn->tx[i].cwx = 0;
+			prn->tx[i].cwx_ptt = 0;	// MI0BOT: HL2 control of PTT via CWX protocol
 			prn->tx[i].dash = 0;
 			prn->tx[i].dot = 0;
 			prn->tx[i].ptt_out = 0;
@@ -1520,6 +1706,8 @@ void create_rnet()
 			prn->tx[i].epwm_max = 0;
 			prn->tx[i].epwm_min = 0;
 			prn->tx[i].pa = 0;
+			prn->tx[i].tx_latency = 20;	// MI0BOT: HL2 
+			prn->tx[i].ptt_hang = 12;	// MI0BOT: HL2 
 			prn->tx[i].mic_in_seq_no = 0;
 			prn->tx[i].mic_in_seq_err = 0;
 			prn->tx[i].mic_out_seq_no = 0;
@@ -1533,19 +1721,9 @@ void create_rnet()
 
 		prn->puresignal_run = 0;
 
-		for (i = 0; i < 6; i++)
-			prn->discovery.MACAddr[i] = 0;
-		prn->discovery.BoardType = 0;
-		prn->discovery.protocolVersion = 0;
-		prn->discovery.fwCodeVersion = 0;
-		prn->discovery.MercuryVersion_0 = 0;
-		prn->discovery.MercuryVersion_1 = 0;
-		prn->discovery.MercuryVersion_2 = 0;
-		prn->discovery.MercuryVersion_3 = 0;
-		prn->discovery.PennyVersion = 0;
-		prn->discovery.MetisVersion = 0;
-		prn->discovery.numRxs = 0;
-
+		prn->reset_on_disconnect = 0;	// MI0BOT: Intialised to not reset on software disconnect
+		prn->swap_audio_channels = 0;	// MI0BOT: Control to swap the left and right audio channels send over P1
+
 		prbpfilter = (RBPFILTER)malloc0(sizeof(rbpfilter));
 		prbpfilter->bpfilter = 0;
 		prbpfilter->enable = 1;

Project Files/Source/ChannelMaster/network.c

@@ -79,7 +79,7 @@ void DeInitMetisSockets() {
 	}
 }
 
-/* returns 0 on success, != 0 otherwise */
+/* returns 0 on success, != 0 otherwise */	// MI0BOT: Added remotePort to allow remote access to several HL2s by different port number
 PORT
 int nativeInitMetis(char* netaddr, int port, char* localaddr, int localport, int protocol, int model_id, int p2hw_uses_differnt_ports)
 {
@@ -219,6 +219,8 @@ int nativeInitMetis(char* netaddr, int port, char* localaddr, int localport, int
 		printf("destination addr: 0x%08x\n", DestIp);
 		fflush(stdout);
 
+		//RemotePort = remotePort;	// MI0BOT: Remote access over WAN using different port
+
 		memset(&MacAddr, 0xff, sizeof(MacAddr));
 		SendARP(DestIp, SrcIp, &MacAddr, &PhysAddrLen);
 		return 0;
@@ -344,21 +346,6 @@ int GetMetisIPAddr(void) {
 	return MetisAddr;
 }
 
-PORT
-void GetMACAddr(unsigned char addr_bytes[]) {
-	memcpy(addr_bytes, prn->discovery.MACAddr, 6);
-}
-
-PORT
-void GetCodeVersion(unsigned char addr_bytes[]) {
-	memcpy(addr_bytes, &(prn->discovery.fwCodeVersion), 1);
-}
-
-PORT
-void GetBoardID(char addr_bytes[]) {
-	memcpy(addr_bytes, &(prn->discovery.BoardType), 1);
-}
-
 int SendStart(void) {
 	prn->run = 1;
 	CmdGeneral(); //1024
@@ -1450,7 +1437,19 @@ int IOThreadStop() {
 	}
 	io_keep_running = 0;  // flag to stop
 
-	WaitForSingleObject(prn->hReadThreadMain, INFINITE);
+	if (HPSDRModel == HPSDRModel_HERMESLITE)
+	{
+		// MI0BOT: Thread locking up, so timeout added.
+		if (WAIT_TIMEOUT == WaitForSingleObject(prn->hReadThreadMain, 1000))
+		{
+			// Thread has stopped, so let everybody know
+			IOThreadRunning = 0;
+		}
+	}
+	else
+	{
+		WaitForSingleObject(prn->hReadThreadMain, INFINITE);
+	}
 
 	CloseHandle(prn->hReadThreadMain);
 	CloseHandle(prn->hReadThreadInitSem);