mirror of
https://github.com/eried/portapack-mayhem.git
synced 2025-09-07 23:01:35 -04:00
Added roger beep option in mic TX
This commit is contained in:
furrtek
parent
37cfcd392d
commit
16acb9db28
9 changed files with 83 additions and 26 deletions
|
|
@ -629,6 +629,28 @@ static constexpr Bitmap bitmap_icon_previous {
|
|||
{ 16, 16 }, bitmap_icon_previous_data
|
||||
};
|
||||
|
||||
static constexpr uint8_t bitmap_icon_cwgen_data[] = {
|
||||
0x00, 0x00,
|
||||
0x00, 0x00,
|
||||
0xC0, 0xC0,
|
||||
0x20, 0x21,
|
||||
0x20, 0x21,
|
||||
0x21, 0x21,
|
||||
0x21, 0x21,
|
||||
0x21, 0x21,
|
||||
0x12, 0x12,
|
||||
0x12, 0x12,
|
||||
0x12, 0x12,
|
||||
0x12, 0x12,
|
||||
0x12, 0x12,
|
||||
0x0C, 0x0C,
|
||||
0x00, 0x00,
|
||||
0x00, 0x00,
|
||||
};
|
||||
static constexpr Bitmap bitmap_icon_cwgen {
|
||||
{ 16, 16 }, bitmap_icon_cwgen_data
|
||||
};
|
||||
|
||||
static constexpr uint8_t bitmap_icon_receivers_data[] = {
|
||||
0xC0, 0x07,
|
||||
0x30, 0x18,
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
//TEST: Imperial in whipcalc
|
||||
|
||||
//TODO: Roger beep in mic tx
|
||||
//TODO: Optimize (and group ?) CTCSS tone gen code
|
||||
//TODO: Morse use prosigns
|
||||
//TODO: Morse live keying mode ?
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,119 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
|
||||
* Copyright (C) 2016 Furrtek
|
||||
*
|
||||
* This file is part of PortaPack.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 51 Franklin Street,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __TONESETS_H__
|
||||
#define __TONESETS_H__
|
||||
|
||||
#include "portapack.hpp"
|
||||
|
||||
#define TONES_SAMPLERATE 1536000
|
||||
#define TONES_DELTA_COEF ((1ULL << 32) / TONES_SAMPLERATE)
|
||||
|
||||
#define TONES_F2D(f) (uint32_t)(f * TONES_DELTA_COEF)
|
||||
|
||||
#define DTMF_C0 TONES_F2D(1209)
|
||||
#define DTMF_C1 TONES_F2D(1336)
|
||||
#define DTMF_C2 TONES_F2D(1477)
|
||||
#define DTMF_C3 TONES_F2D(1633)
|
||||
#define DTMF_R0 TONES_F2D(697)
|
||||
#define DTMF_R1 TONES_F2D(770)
|
||||
#define DTMF_R2 TONES_F2D(852)
|
||||
#define DTMF_R3 TONES_F2D(941)
|
||||
|
||||
const uint32_t ccir_deltas[16] = {
|
||||
TONES_F2D(1981),
|
||||
TONES_F2D(1124),
|
||||
TONES_F2D(1197),
|
||||
TONES_F2D(1275),
|
||||
TONES_F2D(1358),
|
||||
TONES_F2D(1446),
|
||||
TONES_F2D(1540),
|
||||
TONES_F2D(1640),
|
||||
TONES_F2D(1747),
|
||||
TONES_F2D(1860),
|
||||
TONES_F2D(2400),
|
||||
TONES_F2D(930),
|
||||
TONES_F2D(2247),
|
||||
TONES_F2D(991),
|
||||
TONES_F2D(2110),
|
||||
TONES_F2D(1055)
|
||||
};
|
||||
|
||||
// 0123456789ABCD#*
|
||||
const uint32_t dtmf_deltas[16][2] = {
|
||||
{ DTMF_C1, DTMF_R3 },
|
||||
{ DTMF_C0, DTMF_R0 },
|
||||
{ DTMF_C1, DTMF_R0 },
|
||||
{ DTMF_C2, DTMF_R0 },
|
||||
{ DTMF_C0, DTMF_R1 },
|
||||
{ DTMF_C1, DTMF_R1 },
|
||||
{ DTMF_C2, DTMF_R1 },
|
||||
{ DTMF_C0, DTMF_R2 },
|
||||
{ DTMF_C1, DTMF_R2 },
|
||||
{ DTMF_C2, DTMF_R2 },
|
||||
{ DTMF_C3, DTMF_R0 },
|
||||
{ DTMF_C3, DTMF_R1 },
|
||||
{ DTMF_C3, DTMF_R2 },
|
||||
{ DTMF_C3, DTMF_R3 },
|
||||
{ DTMF_C2, DTMF_R3 },
|
||||
{ DTMF_C0, DTMF_R3 }
|
||||
};
|
||||
|
||||
const uint32_t eia_deltas[16] = {
|
||||
TONES_F2D(600),
|
||||
TONES_F2D(741),
|
||||
TONES_F2D(882),
|
||||
TONES_F2D(1023),
|
||||
TONES_F2D(1164),
|
||||
TONES_F2D(1305),
|
||||
TONES_F2D(1446),
|
||||
TONES_F2D(1587),
|
||||
TONES_F2D(1728),
|
||||
TONES_F2D(1869),
|
||||
TONES_F2D(2151),
|
||||
TONES_F2D(2433),
|
||||
TONES_F2D(2010),
|
||||
TONES_F2D(2292),
|
||||
TONES_F2D(459),
|
||||
TONES_F2D(1091)
|
||||
};
|
||||
|
||||
const uint32_t zvei_deltas[16] = {
|
||||
TONES_F2D(2400),
|
||||
TONES_F2D(1060),
|
||||
TONES_F2D(1160),
|
||||
TONES_F2D(1270),
|
||||
TONES_F2D(1400),
|
||||
TONES_F2D(1530),
|
||||
TONES_F2D(1670),
|
||||
TONES_F2D(1830),
|
||||
TONES_F2D(2000),
|
||||
TONES_F2D(2200),
|
||||
TONES_F2D(2800),
|
||||
TONES_F2D(810),
|
||||
TONES_F2D(970),
|
||||
TONES_F2D(885),
|
||||
TONES_F2D(2600),
|
||||
TONES_F2D(680)
|
||||
};
|
||||
|
||||
#endif/*__TONESETS_H__*/
|
||||
|
|
@ -49,7 +49,6 @@ void MicTXView::update_vumeter() {
|
|||
|
||||
void MicTXView::on_tx_done() {
|
||||
// Roger beep transmitted, stop transmitting
|
||||
transmitting = false;
|
||||
set_tx(false);
|
||||
}
|
||||
|
||||
|
|
@ -89,8 +88,8 @@ void MicTXView::set_tx(bool enable) {
|
|||
);
|
||||
gpio_tx.write(0);
|
||||
led_tx.off();
|
||||
transmitting = false;
|
||||
}
|
||||
transmitting = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -126,7 +125,7 @@ void MicTXView::do_timing() {
|
|||
} else {
|
||||
// PTT disable :(
|
||||
const auto switches_state = get_switches_state();
|
||||
if (!switches_state[1]) // Left button
|
||||
if (!switches_state[1] && transmitting) // Left button
|
||||
set_tx(false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -322,9 +322,9 @@ TransmitterCodedMenuView::TransmitterCodedMenuView(NavigationView& nav) {
|
|||
TransmitterAudioMenuView::TransmitterAudioMenuView(NavigationView& nav) {
|
||||
add_items<4>({ {
|
||||
{ "Soundboard", ui::Color::green(), &bitmap_icon_soundboard, [&nav](){ nav.push<SoundBoardView>(); } },
|
||||
{ "Numbers station", ui::Color::orange(),&bitmap_icon_numbers, [&nav](){ nav.push<NumbersStationView>(); } },
|
||||
{ "Numbers station", ui::Color::yellow(),&bitmap_icon_numbers, [&nav](){ nav.push<NumbersStationView>(); } },
|
||||
{ "Microphone", ui::Color::green(), &bitmap_icon_microphone, [&nav](){ nav.push<MicTXView>(); } },
|
||||
{ "Whistle", ui::Color::yellow(),&bitmap_icon_whistle, [&nav](){ nav.push<WhistleView>(); } },
|
||||
{ "Whistle", ui::Color::orange(),&bitmap_icon_whistle, [&nav](){ nav.push<WhistleView>(); } },
|
||||
} });
|
||||
on_left = [&nav](){ nav.pop(); };
|
||||
}
|
||||
|
|
@ -333,11 +333,11 @@ TransmitterAudioMenuView::TransmitterAudioMenuView(NavigationView& nav) {
|
|||
|
||||
UtilitiesView::UtilitiesView(NavigationView& nav) {
|
||||
add_items<5>({ {
|
||||
{ "Frequency manager", ui::Color::green(), nullptr, [&nav](){ nav.push<FreqManView>(); } },
|
||||
{ "CW generator", ui::Color::green(), nullptr, [&nav](){ nav.push<CWTXView>(); } },
|
||||
{ "Whip antenna length", ui::Color::yellow(),nullptr, [&nav](){ nav.push<WhipCalcView>(); } },
|
||||
{ "Notepad", ui::Color::grey(), nullptr, [&nav](){ nav.push<NotImplementedView>(); } },
|
||||
{ "Wipe SD card", ui::Color::red(), nullptr, [&nav](){ nav.push<WipeSDView>(); } },
|
||||
{ "Frequency manager", ui::Color::green(), nullptr, [&nav](){ nav.push<FreqManView>(); } },
|
||||
{ "CW generator", ui::Color::green(), &bitmap_icon_cwgen, [&nav](){ nav.push<CWTXView>(); } },
|
||||
{ "Whip antenna length", ui::Color::yellow(),nullptr, [&nav](){ nav.push<WhipCalcView>(); } },
|
||||
{ "Notepad", ui::Color::grey(), nullptr, [&nav](){ nav.push<NotImplementedView>(); } },
|
||||
{ "Wipe SD card", ui::Color::red(), nullptr, [&nav](){ nav.push<WipeSDView>(); } },
|
||||
} });
|
||||
on_left = [&nav](){ nav.pop(); };
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue