diff --git a/rigs/motorola/micom.c b/rigs/motorola/micom.c index 43ad9b11f..adb88f06a 100644 --- a/rigs/motorola/micom.c +++ b/rigs/motorola/micom.c @@ -23,7 +23,17 @@ #include #include -static freq_t freqA = 14074000; +// char* to start of checksum for len bytes +unsigned int checksum(unsigned char *buf, int len) +{ + int checksum = 0; + int i; + + // simple 1-byte checksum + for (i = 0; i < len; ++i) { checksum += buf[i]; } + + return checksum & 0xff; +} static int micom_open(RIG *rig) { @@ -31,15 +41,86 @@ static int micom_open(RIG *rig) RETURNFUNC(RIG_OK); } +static int micom_read_frame(RIG *rig, unsigned char *buf, int maxlen) +{ + hamlib_port_t *rp = RIGPORT(rig); + int retval; + const char stopset[1] = {0x03}; + retval = read_string_direct(rp, buf, maxlen, stopset, 1, 0, 12); + return retval; +} + static int micom_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { - freqA = freq; - RETURNFUNC(RIG_OK); + hamlib_port_t *rp = RIGPORT(rig); + unsigned char rxcmd[11] = { 0x24, 0x06, 0x18, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03 }; + unsigned char txcmd[10] = { 0x24, 0x05, 0x18, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03 }; + unsigned int ifreq = freq / 1000; + unsigned char reply[11]; + + rxcmd[5] = (ifreq >> 24) & 0xff; + rxcmd[6] = (ifreq >> 16) & 0xff; + rxcmd[7] = (ifreq >> 8) & 0xff; + rxcmd[8] = ifreq & 0xff; + rxcmd[9] = checksum(rxcmd, 9); + + set_transaction_active(rig); + rig_flush(rp); + int retval = write_block(rp, rxcmd, sizeof(rxcmd)); + + if (retval != RIG_OK) + { + rig_debug(RIG_DEBUG_ERR, "%s: write_block err: %s\n", __func__, + rigerror(retval)); + set_transaction_inactive(rig); + return retval; + } + + micom_read_frame(rig, reply, sizeof(reply)); + + txcmd[5] = (ifreq >> 16) & 0xff; + txcmd[6] = (ifreq >> 8) & 0xff; + txcmd[7] = ifreq & 0xff; + rxcmd[8] = checksum(txcmd, 8); + retval = write_block(rp, txcmd, sizeof(txcmd)); + micom_read_frame(rig, reply, sizeof(reply)); + + if (retval != RIG_OK) + { + rig_debug(RIG_DEBUG_ERR, "%s: write_block err: %s\n", __func__, + rigerror(retval)); + set_transaction_inactive(rig); + return retval; + } + + micom_read_frame(rig, reply, sizeof(reply)); + set_transaction_inactive(rig); + return retval; } static int micom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { - *freq = freqA; + hamlib_port_t *rp = RIGPORT(rig); + unsigned char cmd[6] = { 0x24, 0x01, 0x18, 0x06, 0x06, 0x03 }; + unsigned char reply[11]; + int retval; + int ifreq; + + set_transaction_active(rig); + retval = write_block(rp, cmd, sizeof(cmd)); + + if (retval != RIG_OK) + { + rig_debug(RIG_DEBUG_ERR, "%s: write_block err: %s\n", __func__, + rigerror(retval)); + set_transaction_inactive(rig); + return retval; + } + + micom_read_frame(rig, reply, sizeof(reply)); + set_transaction_inactive(rig); + ifreq = (reply[5] << 24) | (reply[6] << 16) | (reply[7] << 8) | reply[8]; + *freq = ifreq * 1000; RETURNFUNC(RIG_OK); } @@ -48,17 +129,16 @@ static int micom_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) hamlib_port_t *rp = RIGPORT(rig); unsigned char on[] = { 0x24, 0x02, 0x81, 0x13, 0x01, 0xBB, 0x03 }; unsigned char off[] = { 0x24, 0x02, 0x81, 0x14, 0x01, 0xBC, 0x03 }; + int retval; + set_transaction_active(rig); rig_flush(rp); - int retval = write_block(rp, ptt ? on : off, sizeof(on)); - if (retval != RIG_OK) - { - set_transaction_inactive(rig); - RETURNFUNC(retval); - } + retval = write_block(rp, ptt ? on : off, sizeof(on)); - return RIG_OK; + set_transaction_inactive(rig); + + return retval; } struct rig_caps micom_caps = @@ -66,7 +146,7 @@ struct rig_caps micom_caps = RIG_MODEL(RIG_MODEL_MICOM2), .model_name = "Micom 2/3", .mfg_name = "Micom", - .version = "20240428.0", + .version = "20240429.0", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_OTHER,