chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added extended alphabet for special characters

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-26 12:47:03 -04:00
parent 9e9c996813
commit de66664635
3 changed files with 201 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mainwindow.cpp
View File

@ -164,7 +164,7 @@ namespace
{ {
Radio::Frequency constexpr default_frequency {14074000}; Radio::Frequency constexpr default_frequency {14074000};
QRegExp message_alphabet {"[- A-Za-z0-9+./?:!^]*"}; QRegExp message_alphabet {"[- A-Za-z0-9+./?:!^]*"};
QRegExp message_input_alphabet {"[- A-Za-z0-9+./?\\n:!^@&|$%]*"}; // @&|$% are used for commands but are never transmitted QRegExp message_input_alphabet {"[- A-Za-z0-9+./?\\n:!^,&@#$%*()<>'\"|=]*"};
// grid exact match excluding RR73 // grid exact match excluding RR73
QRegularExpression grid_regexp {"\\A(?![Rr]{2}73)[A-Ra-r]{2}[0-9]{2}([A-Xa-x]{2}){0,1}\\z"}; QRegularExpression grid_regexp {"\\A(?![Rr]{2}73)[A-Ra-r]{2}[0-9]{2}([A-Xa-x]{2}){0,1}\\z"};
@ -5637,7 +5637,9 @@ QPair<QStringList, QStringList> MainWindow::buildFT8MessageFrames(QString const&
QString dirFrame = Varicode::packDirectedMessage(line, basecall, &dirCmd, &n); QString dirFrame = Varicode::packDirectedMessage(line, basecall, &dirCmd, &n);
int m = 0; int m = 0;
QString datFrame = Varicode::packDataMessage(line.left(21) + "\x04", &m); // 63 / 3 = 21 (maximum number of 3bit chars we could possibly stuff in here) // packDataMessage can output a new line (huff escaping special characters)
QString datLineOut;
QString datFrame = Varicode::packDataMessage(line.left(21) + "\x04", &datLineOut, &m); // 63 / 3 = 21 (maximum number of 3bit chars we could possibly stuff in here)
// if this parses to a standard FT8 free text message // if this parses to a standard FT8 free text message
// but it can be parsed as a directed message, then we // but it can be parsed as a directed message, then we
@ -5649,6 +5651,9 @@ QPair<QStringList, QStringList> MainWindow::buildFT8MessageFrames(QString const&
} else if ((isFree || hasDirected) && m > 0) { } else if ((isFree || hasDirected) && m > 0) {
useDat = true; useDat = true;
frame = datFrame; frame = datFrame;
if(!datLineOut.isEmpty()){
line = datLineOut;
}
} else { } else {
useStd = true; useStd = true;
frame = stdFrame; frame = stdFrame;

253
varicode.cpp
View File

@ -74,59 +74,110 @@ QRegularExpression directed_re("^"
"(?<num>\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?" "(?<num>\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?"
); );
QMap<QChar, QString> huff = { QMap<QChar, QString> hufftable = {
// char code weight // char code weight
{' ' , "000" }, // 1300 { ' ' , "000" }, // 1300
{'E' , "001" }, // 1270.2 { 'E' , "001" }, // 1270.2
{'T' , "1100" }, // 905.6 { 'T' , "1100" }, // 905.6
{'A' , "1010" }, // 816.7 { 'A' , "1010" }, // 816.7
{'O' , "0111" }, // 750.7 { 'O' , "0111" }, // 750.7
{'I' , "0101" }, // 696.6 { 'I' , "0101" }, // 696.6
{'N' , "0100" }, // 674.9 { 'N' , "0100" }, // 674.9
{'S' , "11111" }, // 632.7 { 'S' , "11111" }, // 632.7
{'H' , "11110" }, // 609.4 { 'H' , "11110" }, // 609.4
{'R' , "11101" }, // 598.7 { 'R' , "11101" }, // 598.7
{'D' , "10111" }, // 425.3 { 'D' , "10111" }, // 425.3
{'L' , "10110" }, // 402.5 { 'L' , "10110" }, // 402.5
{'C' , "111001" }, // 278.2 { 'C' , "111001" }, // 278.2
{'U' , "111000" }, // 275.8 { 'U' , "111000" }, // 275.8
{'M' , "110111" }, // 240.6 { 'M' , "110111" }, // 240.6
{'W' , "110110" }, // 236.0 { 'W' , "110110" }, // 236.0
{'F' , "110100" }, // 222.8 { 'F' , "110100" }, // 222.8
{'G' , "100111" }, // 201.5 { 'G' , "100111" }, // 201.5
{'Q' , "100110" }, // 200 { 'Q' , "100110" }, // 200
{'Y' , "011010" }, // 197.4 { 'Y' , "011010" }, // 197.4
{'P' , "011001" }, // 192.9 { 'P' , "011001" }, // 192.9
{'B' , "011000" }, // 149.2 { 'B' , "011000" }, // 149.2
{'!' , "0110111" }, // 100 { '\\' , "0110111" }, // 100 <- escape
{'.' , "1000000" }, // 100 { '.' , "1000000" }, // 100
{'0' , "1000001" }, // 100 { '0' , "1000001" }, // 100
{'1' , "1000010" }, // 100 { '1' , "1000010" }, // 100
{'2' , "1000011" }, // 100 { '2' , "1000011" }, // 100
{'3' , "1000100" }, // 100 { '3' , "1000100" }, // 100
{'4' , "1000101" }, // 100 { '4' , "1000101" }, // 100
{'5' , "1000110" }, // 100 { '5' , "1000110" }, // 100
{'6' , "1000111" }, // 100 { '6' , "1000111" }, // 100
{'7' , "1001000" }, // 100 { '7' , "1001000" }, // 100
{'8' , "1001001" }, // 100 { '8' , "1001001" }, // 100
{'9' , "1001010" }, // 100 { '9' , "1001010" }, // 100
{'?' , "1001011" }, // 100 { '?' , "1001011" }, // 100
{'^' , "1101010" }, // 100 <- shift { '/' , "1101010" }, // 100
{'V' , "0110110" }, // 97.8 { 'V' , "0110110" }, // 97.8
{'K' , "11010111" }, // 77.2 { 'K' , "11010111" }, // 77.2
{'J' , "1101011010" }, // 15.3 { 'J' , "1101011010" }, // 15.3
{'X' , "1101011001" }, // 15.0 { 'X' , "1101011001" }, // 15.0
{'Z' , "11010110110" }, // 7.4 { 'Z' , "11010110110" }, // 7.4
{':' , "11010110000" }, // 5 { ':' , "11010110000" }, // 5
{'+' , "110101100011" }, // 5 { '+' , "110101100011" }, // 5
{'-' , "110101101110" }, // 5 { '-' , "110101101110" }, // 5
{'/' , "110101101111" }, // 5 { '!' , "110101101111" }, // 5
{'\x04' , "110101100010" }, // 1 <- eot { '\x04' , "110101100010" }, // 1 <- eot
// A-Z 0-9 Space . ! ? ^ : + - / /*
A-Z 0-9 Space . ! ? : + - / \\
special chars that are escaped will be added here too...
*/
}; };
QChar huffeot = '\x04'; /*
original: space + - / ? . ! : \\
needed: ^,&@#$%*()<>'"|={}[];_~`
*/
QMap<QString, QChar> huffescapes = {
{ "\\ ", '^' },
{ "\\E", ',' },
{ "\\T", '&' },
{ "\\A", '@' },
{ "\\O", '#' },
{ "\\I", '$' },
{ "\\N", '%' },
{ "\\S", '\'' },
{ "\\H", '\"' },
{ "\\R", '(' },
{ "\\D", ')' },
{ "\\L", '<' },
{ "\\C", '>' },
{ "\\U", '|' },
{ "\\M", '*' },
{ "\\W", '[' },
{ "\\F", ']' },
{ "\\G", '{' },
{ "\\Q", '}' },
{ "\\Y", '=' },
{ "\\P", ';' },
{ "\\B", '_' },
{ "\\.", '~' },
{ "\\0", '`' },
#if 0
// reserved <= 14 bits
{ "\\1", '' },
{ "\\2", '' },
{ "\\3", '' },
{ "\\4", '' },
{ "\\5", '' },
{ "\\6", '' },
{ "\\7", '' },
{ "\\8", '' },
{ "\\9", '' },
{ "\\?", '' },
{ "\\/", '' },
{ "\\V", '' },
#endif
};
QChar ESC = '\\'; // Escape char
QChar EOT = '\x04'; // EOT char
quint32 nbasecall = 37 * 36 * 10 * 27 * 27 * 27; quint32 nbasecall = 37 * 36 * 10 * 27 * 27 * 27;
@ -158,6 +209,35 @@ QMap<int, int> dbm2mw = {
{60 , 1000000}, // 1000W {60 , 1000000}, // 1000W
}; };
QMap<QChar, QString> initializeEscapes(QMap<QChar, QString> huff, QMap<QString, QChar> escapes){
QMap<QChar, QString> newhuff(huff);
foreach(auto escapeString, escapes.keys()){
auto ch = escapes[escapeString];
auto encoded = Varicode::huffEncode(huff, escapeString);
auto bits = Varicode::bitsListToBits(encoded);
newhuff[ch] = Varicode::bitsToStr(bits);
}
#if PRINT_VARICODE_ALPHABET
auto keys = newhuff.keys();
qSort(keys.begin(), keys.end(), [newhuff](QChar a, QChar b){
return newhuff[a].length() < newhuff[b].length();
});
foreach(auto ch, keys){
qDebug() << ch << newhuff[ch] << newhuff[ch].length();
}
#endif
return newhuff;
}
QMap<QChar, QString> hufftableescaped = initializeEscapes(hufftable, huffescapes);
/*
* UTILITIES
*/
int mwattsToDbm(int mwatts){ int mwattsToDbm(int mwatts){
int dbm = 0; int dbm = 0;
auto values = dbm2mw.values(); auto values = dbm2mw.values();
@ -182,6 +262,10 @@ int dbmTomwatts(int dbm){
return iter.value(); return iter.value();
} }
/*
* VARICODE
*/
QString Varicode::formatSNR(int snr){ QString Varicode::formatSNR(int snr){
if(snr < -60 || snr > 60){ if(snr < -60 || snr > 60){
return QString(); return QString();
@ -272,7 +356,7 @@ QStringList Varicode::parseGrids(const QString &input){
return grids; return grids;
} }
QList<QVector<bool>> Varicode::huffEncode(QString const& text){ QList<QVector<bool>> Varicode::huffEncode(QMap<QChar, QString> const &huff, QString const& text){
QList<QVector<bool>> out; QList<QVector<bool>> out;
foreach(auto ch, text){ foreach(auto ch, text){
@ -285,16 +369,8 @@ QList<QVector<bool>> Varicode::huffEncode(QString const& text){
return out; return out;
} }
QVector<bool> Varicode::huffFlatten(QList<QVector<bool>> &list){ QString Varicode::huffDecode(QMap<QChar, QString> const &huff, QVector<bool> const& bitvec, int pad){
QVector<bool> out; QString text;
foreach(auto vec, list){
out += vec;
}
return out;
}
QString Varicode::huffDecode(QVector<bool> const& bitvec, int pad){
QString out;
QString bits = bitsToStr(bitvec).mid(0, bitvec.length()-pad); QString bits = bitsToStr(bitvec).mid(0, bitvec.length()-pad);
@ -303,12 +379,12 @@ QString Varicode::huffDecode(QVector<bool> const& bitvec, int pad){
bool found = false; bool found = false;
foreach(auto key, huff.keys()){ foreach(auto key, huff.keys()){
if(bits.startsWith(huff[key])){ if(bits.startsWith(huff[key])){
if(key == huffeot){ if(key == EOT){
out.append(" "); text.append(" ");
found = false; found = false;
break; break;
} }
out.append(key); text.append(key);
bits = bits.mid(huff[key].length()); bits = bits.mid(huff[key].length());
found = true; found = true;
} }
@ -318,9 +394,38 @@ QString Varicode::huffDecode(QVector<bool> const& bitvec, int pad){
} }
} }
return out; return text;
} }
QString Varicode::huffUnescape(QString const &input){
QString text = input;
// unescape alternate alphabet
foreach(auto escaped, huffescapes.keys()){
text = text.replace(escaped, huffescapes[escaped]);
}
return text;
}
QString Varicode::huffEscape(QString const &input){
QString text = input;
// escape alternate alphabet
foreach(auto unescaped, huffescapes.values()){
text = text.replace(unescaped, huffescapes.key(unescaped));
}
return text;
}
bool Varicode::huffShouldEscape(QString const &input){
foreach(auto ch, huffescapes.values()){
if(input.contains(ch)){
return true;
}
}
return false;
}
// convert char* array of 0 bytes and 1 bytes to bool vector // convert char* array of 0 bytes and 1 bytes to bool vector
QVector<bool> Varicode::bytesToBits(char *bitvec, int n){ QVector<bool> Varicode::bytesToBits(char *bitvec, int n){
QVector<bool> bits; QVector<bool> bits;
@ -382,6 +487,14 @@ quint64 Varicode::bitsToInt(QVector<bool>::ConstIterator start, int n){
return v; return v;
} }
QVector<bool> Varicode::bitsListToBits(QList<QVector<bool>> &list){
QVector<bool> out;
foreach(auto vec, list){
out += vec;
}
return out;
}
quint8 Varicode::unpack5bits(QString const& value){ quint8 Varicode::unpack5bits(QString const& value){
return alphabet.indexOf(value.at(0)); return alphabet.indexOf(value.at(0));
} }
@ -882,7 +995,7 @@ QStringList Varicode::unpackDirectedMessage(const QString &text){
return unpacked; return unpacked;
} }
QString Varicode::packDataMessage(const QString &text, int *n){ QString Varicode::packDataMessage(const QString &input, QString * out, int *n){
QString frame; QString frame;
// [1][63],[5] = 69 // [1][63],[5] = 69
@ -892,7 +1005,9 @@ QString Varicode::packDataMessage(const QString &text, int *n){
); );
int i = 0; int i = 0;
foreach(auto charBits, Varicode::huffEncode(text)){
// we use the escaped table here, so they the escapes and the characters are packed together...
foreach(auto charBits, Varicode::huffEncode(hufftableescaped, input)){
if(frameBits.length() + charBits.length() < 63){ if(frameBits.length() + charBits.length() < 63){
frameBits += charBits; frameBits += charBits;
i++; i++;
@ -930,7 +1045,11 @@ QString Varicode::unpackDataMessage(const QString &text){
// pop off the is_data bit // pop off the is_data bit
bits.removeAt(0); bits.removeAt(0);
unpacked = Varicode::huffDecode(bits, pad); // huff decode the bits (without escapes)
unpacked = Varicode::huffDecode(hufftable, bits, pad);
// then... unescape special characters
unpacked = Varicode::huffUnescape(unpacked);
return unpacked; return unpacked;
} }

12
varicode.h
View File

@ -39,9 +39,12 @@ public:
static QStringList parseCallsigns(QString const &input); static QStringList parseCallsigns(QString const &input);
static QStringList parseGrids(QString const &input); static QStringList parseGrids(QString const &input);
static QList<QVector<bool>> huffEncode(QString const& text); static QList<QVector<bool>> huffEncode(const QMap<QChar, QString> &huff, QString const& text);
static QVector<bool> huffFlatten(QList<QVector<bool>> &list); static QString huffDecode(const QMap<QChar, QString> &huff, QVector<bool> const& bitvec, int pad=0);
static QString huffDecode(QVector<bool> const& bitvec, int pad=0);
static QString huffUnescape(QString const &input);
static QString huffEscape(QString const &input);
static bool huffShouldEscape(QString const &input);
static QVector<bool> bytesToBits(char * bitvec, int n); static QVector<bool> bytesToBits(char * bitvec, int n);
static QVector<bool> strToBits(QString const& bitvec); static QVector<bool> strToBits(QString const& bitvec);
@ -50,6 +53,7 @@ public:
static QVector<bool> intToBits(quint64 value, int expected=0); static QVector<bool> intToBits(quint64 value, int expected=0);
static quint64 bitsToInt(QVector<bool> const value); static quint64 bitsToInt(QVector<bool> const value);
static quint64 bitsToInt(QVector<bool>::ConstIterator start, int n); static quint64 bitsToInt(QVector<bool>::ConstIterator start, int n);
static QVector<bool> bitsListToBits(QList<QVector<bool>> &list);
static quint8 unpack5bits(QString const& value); static quint8 unpack5bits(QString const& value);
static QString pack5bits(quint8 packed); static QString pack5bits(quint8 packed);
@ -84,7 +88,7 @@ public:
static QString packDirectedMessage(QString const& text, QString const& callsign, QString * pCmd, int *n); static QString packDirectedMessage(QString const& text, QString const& callsign, QString * pCmd, int *n);
static QStringList unpackDirectedMessage(QString const& text); static QStringList unpackDirectedMessage(QString const& text);
static QString packDataMessage(QString const& text, int *n); static QString packDataMessage(QString const& text, QString *out, int *n);
static QString unpackDataMessage(QString const& text); static QString unpackDataMessage(QString const& text);
}; };