mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'master' of https://github.com/Hamlib/Hamlib

pull/1614/head
Mike Black W9MDB 2024-09-15 23:59:16 -05:00
rodzic 76a1a589c9 76c3cd15bb
commit 2a47377243
3 zmienionych plików z 128 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
doc/man1/rigctl.1
Wyświetl plik

@ -1320,10 +1320,15 @@ YYYY-MM-DD (sets date only)
local (sets both clocks to local time)
utc (sets both clocks to utc time)
Note: Icom rigs expect you to set local time and the hours off to UTC.
So...4PM EST example would be 2021-12-01T16:00:00+0500
So...4PM EST example would be 2021-12-01T16:00:00-0500
But...if you want to display GMT you must set the clock for GMT with zero UTC offset.
Hopefully Icom will allow displaying either clock in the future
Note: Kenwood rigs only allow setting local clock, and then only if not autoset by NTP.
Trying to set clock when NTP is in use will set the offset, but not the time -
and no error status will be returned.
Time displayed on the auxiliary clock is solely determined by UTC and the aux offset.
.EE
.
.TP

49
rigs/kenwood/kenwood.c
Wyświetl plik

@ -6011,7 +6011,46 @@ int kenwood_set_ext_parm(RIG *rig, hamlib_token_t token, value_t val)
*/
int kenwood_set_clock(RIG *rig, int year, int month, int day, int hour, int min, int sec, double msec, int utc_offset)
{
return -RIG_ENIMPL;
char cmd[20];
int retval, kenwood_val;
/* Do the offset first. Then if the clock is synced to NTP,
* the set failure still should allow correct display
*
* utc_offset = hours * 100 + minutes
* Kenwood value = 15 minute intervals normalized to 56 ( = UTC+00)
*/
// Convert utc_offset to minutes
kenwood_val = ((utc_offset / 100) * 60) + (utc_offset % 100);
// Now convert to 15 minute intervals, centered on 56
kenwood_val = kenwood_val / 15 + 56;
SNPRINTF(cmd, sizeof(cmd), "CK2%03d", kenwood_val);
retval = kenwood_transaction(rig, cmd, NULL, 0);
if (retval != RIG_OK) {return retval;}
// Offset is set, now check if clock is settable
retval = kenwood_transaction(rig, "CK6", cmd, sizeof(cmd));
if (retval != RIG_OK) {return retval;}
if (cmd[3] == '1')
{
// OK, autoset by NTP is on so we can't set it
// What should we tell the user?
// Until I hear otherwise, pretend everything worked, and
// the local clock should display the correct time in whatever
// zone the app thought it was trying to set.
return RIG_OK;
}
// Local clock should be settable; build the command
SNPRINTF(cmd, sizeof(cmd), "CK0%02d%02d%02d%02d%02d%02d", year % 100, month, day,
hour, min, sec);
if (RIG_IS_TS990S)
{ // TS-990S does not have seconds
cmd[13] = '\0';
}
retval = kenwood_transaction(rig, cmd, NULL, 0);
return retval;
}
/*
@ -6020,7 +6059,7 @@ int kenwood_set_clock(RIG *rig, int year, int month, int day, int hour, int min,
int kenwood_get_clock(RIG *rig, int *year, int *month, int *day, int *hour, int *min, int *sec, double *msec, int *utc_offset)
{
int retval;
int fields, zone;
int fields, diff;
char ans[20];
// Make sure the clock has been set at least once
@ -6055,9 +6094,9 @@ int kenwood_get_clock(RIG *rig, int *year, int *month, int *day, int *hour, int
retval = kenwood_transaction(rig, "CK2", ans, sizeof(ans));
if (retval != RIG_OK) {return retval;}
zone = atoi(&ans[3]); // UTC offset in 15 minute intervals, centered on 56
zone = (zone / 4) * 100 + (zone % 4) * 15; // Pack as hours * 100 + minutes
*utc_offset = zone - 1400;
diff = (atoi(&ans[3]) - 56) * 15; // UTC offset in minutes
// Pack as hours * 100 + minutes
*utc_offset = (diff / 60) * 100 + diff % 60;
// No msec available
*msec = 0;

93
simulators/simts890.c
Wyświetl plik

@ -15,6 +15,7 @@ struct ip_mreq
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
#include <hamlib/rig.h>
#define BUFSIZE 256
@ -46,7 +47,9 @@ int ra=0;
int rl=0;
int is=0;
int sp=0;
int tzs[2] = {40, 56}; // 0=primary(EDT), 1=auxiiary(UTC)
// Clock data
int autoset = 1;
int tzs[2] = {36, 56}; // 0=primary(EST), 1=auxiliary(UTC)
char auxtzc = 'U'; // Auxiliary clock identifier (UTC)
#if defined(WIN32) || defined(_WIN32)
@ -630,6 +633,38 @@ int main(int argc, char *argv[])
{
sscanf(buf,"SP%d", &sp);
}
else if (strncmp(buf, "BS", 2) == 0)
{ // All the Bandscope commands
switch (toupper(buf[2])) {
case '0': // Scope Display ON/OFF
case '1': // Scope Display Type
case '2': // Bandscpoe Operation Mode
case '3': // Bandscope Span
case '4': // Bandscope Span
case '5': // Bandscope Scope Range (Fixed Mode)
case '6': // Bandscope Dispaly Pause
case '7': // Bandscope Marker
case '8': // Bandscope Attenuator
case '9': // Bandscope Max Hold
case 'A': // Bandscope Averaging
case 'B': // Bandscope Waterfall Display Speed
case 'C': // Bandscope Reference Level
case 'D': // Bandscope Waterfall Display Clear
case 'E': // Bandscope Marker Shift / Marker Center
case 'G': // Audio Scope Attenuator
case 'H': // Audio Scope Span
case 'I': // Oscilloscope Level
case 'J': // Oscilloscpoe Sweep Time
case 'K': // Bandscope Shift Position
case 'L': // Bandscope Receive Circuit State
case 'M': // Bandscope Scope Range Lower/Upper Frequency Limit
case 'N': // Audio Scope Display Pause
case 'O': // Expands Spectrum Analysis Range
break;
default: // Unknown
cmd_err = 1;
}
}
else if (strncmp(buf, "CK", 2) == 0)
{ // All the clock functions
switch (buf[2]) {
@ -647,23 +682,22 @@ int main(int argc, char *argv[])
}
else
{
printf("Sorry, can't set time (yet)\n");
printf("Clock not set. cmd = %s\n", buf);
}
break;
}
case '1': // Setting status
buf[3] = '1';
buf[4] = ';';
buf[5] = 0;
write(fd, buf, 6);
write(fd, buf, 5);
break;
case '2': // Local clock time zone
case '3': // Secondary clock time zone
case '3': // Auxiliary clock time zone
{
int idx = buf[2] - '2';
if (buf[3] == ';')
{
sprintf(&buf[3], "%3d;", tzs[idx]);
sprintf(&buf[3], "%03d;", tzs[idx]);
write(fd, buf, strlen(buf));
}
else
@ -672,34 +706,31 @@ int main(int argc, char *argv[])
}
break;
}
case '4': // ID character for secondary clock
case '4': // ID character for auxiliary clock
if (buf[3] == ';')
{
buf[3] = auxtzc;
buf[4] = ';';
buf[5] = '\0';
write(fd, buf, 6);
write(fd, buf, 5);
}
else
{
auxtzc = buf[3];
}
break;
case '5': // Date format
case '5': // Date display format
break;
case '6': // Automatic date/time retrieval (NTP)
//For the time being, assume this is always on.
//TODO: Fix this when we can set the clock
if (buf[3] == ';')
{
buf[3] = 1;
buf[3] = autoset + '0';
buf[4] = ';';
buf[5] = 0;
write(fd, buf, strlen(buf));
write(fd, buf, 5);
}
else
{
printf("Can't run without NTP, sorry\n");
autoset = buf[3] - '0';
}
break;
case '7': // NTP server address
@ -709,6 +740,38 @@ int main(int argc, char *argv[])
printf("Bad clock command - %s\n", buf);
}
}
else if (strncmp(buf, "CM", 2) == 0)
{ // CW Message Memory
switch (buf[2]) {
case '0': // Registration of CW Message (Paddle Input)
case '1': // Play/Stop the CW Message
case '2': // Register State of CW Message (Paddle Input)
case '3': // Clear the CW Message (Paddle Inut)
case '4': // CW Message Memory Name (Paddle Input)
case '5': // Registering the CW Message Memory (Text Input)
case '6': // CW Message Channel Repeat
case '7': // Contest Number
break;
default:
cmd_err = 1; //Unknown command
}
}
else if (strncmp(buf, "MA", 2) == 0)
{ // Memory Channel Functions
switch (buf[2]) {
case '0': // Memory Channel Configuration
case '1': // Memort Channel (Direct Write)
case '2': // Memory Channel (Channel Name)
case '3': // Memory Channel (Scan Lockout)
case '4': // Memory Channel (Channel Copy)
case '5': // Memory Channle (Channel Deletion)
case '6': // Programmable VFO End Frequency
case '7': // Memory Channel (Temporary Change Frequency)
break;
default:
cmd_err = 1;
}
}
else if (strlen(buf) > 0)
{
fprintf(stderr, "Unknown command: %s\n", buf);