martin
/
raspikeyer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more on wk emulation

This commit is contained in:
Martin Brodbeck 2024-02-29 16:50:53 +01:00
parent 08bf317f9c
commit f1d865ab68
5 changed files with 98 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/keyer.cpp
View File

@ -341,4 +341,8 @@ void Keyer::run()
}
}
void Keyer::stop() { m_paddleKeyingState = State::Abort; }
void Keyer::stop()
{
m_paddleKeyingState = State::Abort;
m_messageKeyingState = MessageState::Abort;
}

4
src/raspikeyer.cpp
View File

@ -72,7 +72,7 @@ void core1_main()
break;
case KeyerQueueCommand::Stop:
keyer.stop();
data.cmd = KeyerQueueCommand::Wait;
data.cmd = KeyerQueueCommand::Run;
break;
case KeyerQueueCommand::Config:
keyer.setSpeed(data.wpm);
@ -83,8 +83,6 @@ void core1_main()
keyer.sendCharacter(data.message);
data.cmd = KeyerQueueCommand::Run;
break;
case KeyerQueueCommand::Wait:
break;
default:
break;
}

1
src/utils.h
View File

@ -7,7 +7,6 @@ enum class KeyerQueueCommand {
Run,
Stop,
Config,
Wait,
SendMessage,
};

98
src/winkeyer.cpp
View File

@ -8,15 +8,15 @@
void WinKeyer::run(queue_t &queue)
{
const uint8_t USB_IF = 0;
static uint8_t buf[64] {0};
if (tud_cdc_n_available(USB_IF)) {
uint8_t buf[64];
// printf("AHA!!! %d\n", (int)tud_cdc_n_available(USB_IF));
uint32_t count = tud_cdc_n_read(USB_IF, buf, sizeof(buf));
if (count > 0) {
switch (buf[0]) {
if (m_commandState == CommandState::None) {
uint8_t value = tud_cdc_n_read_char(USB_IF);
switch (value) {
case ' ':
[[fallthrough]];
case '\"':
[[fallthrough]];
case '$':
@ -28,25 +28,79 @@ void WinKeyer::run(queue_t &queue)
case ')':
[[fallthrough]];
case '+' ... ']': {
KeyerQueueData keyerQueueData {KeyerQueueCommand::SendMessage, 0, Mode::IambicB, buf[0]};
queue_add_blocking(&queue, &keyerQueueData);
break;
}
case 0x00: // ADMIN COMMAND
switch (buf[1]) {
case 0x02: // HOST OPEN
usbSend(USB_IF, 9); // Send WK1 (v9) for now (no WinKeyer PTT control)
break;
case 0x04: // ECHO TEST
usbSend(USB_IF, &buf[2], 1); // Send the received byte back
break;
default:
printf("Unknown admin command: %x\n", buf[1]);
if (m_hostOpen) {
KeyerQueueData keyerQueueData {KeyerQueueCommand::SendMessage, 0, Mode::IambicB, value};
queue_add_blocking(&queue, &keyerQueueData);
}
break;
default:
printf("Unknown command: %d.\n", buf[0]);
}
case 0x00: // ADMIN
m_commandState = CommandState::Admin;
break;
case 0x07: // GET SPEED POT
printf("INFO: Get Speed Pot currently not supported.\n");
break;
case 0x0A: {
// TODO: Implement abort sending message
KeyerQueueData keyerQueueData {KeyerQueueCommand::Stop, 0, Mode::IambicB, value};
queue_add_blocking(&queue, &keyerQueueData);
} break;
case 0x0B: // KEY IMMEDIATE
m_commandState = CommandState::KeyImmediate;
break;
case 0x0F: // LOAD DEFAULTS
m_commandState = CommandState::LoadDefaults;
break;
case 0x13: // NOP
break;
case 0x15: // REQUEST WINKEY STATUS
printf("INFO: Request WinKey Status currently not supported.\n");
usbSend(USB_IF, 0b11000000);
break;
default:
printf("Unknown command: %x\n", value);
m_commandState = CommandState::None;
break;
}
} else if (m_commandState == CommandState::Admin) {
uint8_t value = tud_cdc_n_read_char(USB_IF);
switch (value) {
case 0x02: // HOST OPEN
usbSend(USB_IF, 9); // Send v9 back (Winkeyer 1)
m_hostOpen = true;
m_commandState = CommandState::None;
break;
case 0x03: // HOST CLOSE
m_hostOpen = false;
break;
case 0x04:
m_commandState = CommandState::AdminEchoTest;
break;
case 0x0a: // SET WK1 MODE
m_wkMode = WkMode::WK1;
m_commandState = CommandState::None;
break;
default:
printf("Unknown admin command: %x.\n", value);
m_commandState = CommandState::None;
break;
}
} else if (m_commandState == CommandState::AdminEchoTest) {
uint8_t value = tud_cdc_n_read_char(USB_IF);
usbSend(USB_IF, value); // Send the received byte back
m_commandState = CommandState::None;
} else if (m_commandState == CommandState::LoadDefaults) {
if (tud_cdc_n_available(USB_IF) < 15) {
printf("LOAD DEFAULTS: Waiting for remaining bytes ...\n");
return;
}
tud_cdc_n_read(USB_IF, buf, 15);
printf("INFO: Loading defaults currently not supported.\n");
m_commandState = CommandState::None;
} else if (m_commandState == CommandState::KeyImmediate) {
tud_cdc_n_read_char(USB_IF); // Silently ignore byte
printf("INFO: Tune not supported.\n");
m_commandState = CommandState::None;
}
}
}

16
src/winkeyer.h
View File

@ -8,4 +8,20 @@ class WinKeyer final
void run(queue_t &queue);
private:
enum class CommandState {
None,
Admin,
AdminEchoTest,
LoadDefaults,
KeyImmediate,
};
enum class WkMode {
WK1,
WK2,
WK3,
};
CommandState m_commandState {CommandState::None};
WkMode m_wkMode {WkMode::WK1};
bool m_hostOpen {false};
};