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

prepare for sending messages

Browse source
This commit is contained in:
Martin Brodbeck 2024-02-23 09:18:02 +01:00
parent 4a3dc6bd63
commit c57f9251c2
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/keyer.cpp
View file

@ -10,7 +10,7 @@ extern const uint LEFT_PADDLE_PIN;
extern const uint RIGHT_PADDLE_PIN; extern const uint RIGHT_PADDLE_PIN;
extern const uint BUZZER_PIN; extern const uint BUZZER_PIN;
extern const uint CW_OUT_PIN; extern const uint CW_OUT_PIN;
//extern const uint AUDIO_OUT_PIN; // extern const uint AUDIO_OUT_PIN;
const uint SIDETONE_FREQ = 622; const uint SIDETONE_FREQ = 622;
@ -51,6 +51,11 @@ void Keyer::run()
{ {
auto timestamp = get_absolute_time(); auto timestamp = get_absolute_time();
// If there is something to send …
if (!m_messageQueue.empty()) {
// TODO
}
// If we are in Straight key mode … // If we are in Straight key mode …
if (m_mode == Mode::Straight) { if (m_mode == Mode::Straight) {
if (left_paddle_pressed()) { if (left_paddle_pressed()) {
@ -93,7 +98,7 @@ void Keyer::run()
gpio_put(LED_PIN, 1); gpio_put(LED_PIN, 1);
gpio_put(CW_OUT_PIN, 1); gpio_put(CW_OUT_PIN, 1);
m_buzzer.on(SIDETONE_FREQ); m_buzzer.on(SIDETONE_FREQ);
//m_audioOut.on(SIDETONE_FREQ); // m_audioOut.on(SIDETONE_FREQ);
} else { } else {
// If right paddle üressed -> note for Iambic B // If right paddle üressed -> note for Iambic B
if (right_paddle_pressed() && !m_keyNextIambicB) { if (right_paddle_pressed() && !m_keyNextIambicB) {
@ -105,7 +110,7 @@ void Keyer::run()
gpio_put(LED_PIN, 0); gpio_put(LED_PIN, 0);
gpio_put(CW_OUT_PIN, 0); gpio_put(CW_OUT_PIN, 0);
m_buzzer.off(); m_buzzer.off();
//m_audioOut.off(); // m_audioOut.off();
m_previousState = State::Dit; m_previousState = State::Dit;
m_state = State::DitPause; m_state = State::DitPause;
} }
@ -118,7 +123,7 @@ void Keyer::run()
gpio_put(LED_PIN, 1); gpio_put(LED_PIN, 1);
gpio_put(CW_OUT_PIN, 1); gpio_put(CW_OUT_PIN, 1);
m_buzzer.on(SIDETONE_FREQ); m_buzzer.on(SIDETONE_FREQ);
//m_audioOut.on(SIDETONE_FREQ); // m_audioOut.on(SIDETONE_FREQ);
} else { } else {
// If left paddle pressed -> Note for Iambic B // If left paddle pressed -> Note for Iambic B
if (left_paddle_pressed() && !m_keyNextIambicB) { if (left_paddle_pressed() && !m_keyNextIambicB) {
@ -130,7 +135,7 @@ void Keyer::run()
gpio_put(LED_PIN, 0); gpio_put(LED_PIN, 0);
gpio_put(CW_OUT_PIN, 0); gpio_put(CW_OUT_PIN, 0);
m_buzzer.off(); m_buzzer.off();
//m_audioOut.off(); // m_audioOut.off();
m_previousState = State::Dah; m_previousState = State::Dah;
m_state = State::DahPause; m_state = State::DahPause;
} }
@ -180,7 +185,7 @@ void Keyer::run()
gpio_put(LED_PIN, 0); gpio_put(LED_PIN, 0);
gpio_put(CW_OUT_PIN, 0); gpio_put(CW_OUT_PIN, 0);
m_buzzer.off(); m_buzzer.off();
//m_audioOut.off(); // m_audioOut.off();
m_keyNextIambicB = false; m_keyNextIambicB = false;
m_currentlyPausing = false; m_currentlyPausing = false;
m_currentlyKeying = false; m_currentlyKeying = false;

7
src/keyer.h
View file

@ -1,5 +1,8 @@
#pragma once #pragma once
#include <queue>
#include <string>
#include "settings.h" #include "settings.h"
#include "sidetone.h" #include "sidetone.h"
@ -32,7 +35,7 @@ class Keyer final
absolute_time_t m_pausing_until {0}; absolute_time_t m_pausing_until {0};
Sidetone m_buzzer; Sidetone m_buzzer;
//Sidetone m_audioOut; // Sidetone m_audioOut;
State m_state {State::Wait}; State m_state {State::Wait};
State m_previousState {State::Wait}; State m_previousState {State::Wait};
@ -40,4 +43,6 @@ class Keyer final
bool m_currentlyKeying {false}; bool m_currentlyKeying {false};
bool m_currentlyPausing {false}; bool m_currentlyPausing {false};
bool m_keyNextIambicB {false}; bool m_keyNextIambicB {false};
std::queue<std::string> m_messageQueue;
}; };