TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-25 18:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added remaining buttons for TouchTunes remote

Browse Source 
LCR transmit UI cleanup
CC1101 data whitening function
Uniformized tx progress message handling
This commit is contained in:
furrtek
2017-09-24 20:05:42 +01:00
parent 26949773bb
commit 73d47cd77d
48 changed files with 504 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/common/emu_cc1101.hpp
View File

@@ -32,7 +32,6 @@ namespace cc1101 {
// Data rate (Bauds)
// Whitening: Everything except preamble and sync word, init value = 111111111
// See datasheet page 38 for logic schematic
// Packet format: preamble, sync word, (opt) length, (opt) address, payload, (opt) CRC
// Preamble: 8*n bits of 10101010
// Sync word: 2 bytes (can be repeated twice)
@@ -100,6 +99,12 @@ private:
modulation_t modulation_ { TWO_FSK };
uint8_t num_preamble_ { 4 };
size_t deviation_ { 4000 };
uint16_t whitening_pn { 0x1FF };
void whitening_init();
uint8_t whiten_byte(uint8_t byte);
};
} /* namespace cc1101 */

8
firmware/common/message.hpp
View File

@@ -73,7 +73,7 @@ public:
ReplayThreadDone = 20,
AFSKRxConfigure = 21,
TXDone = 30,
TXProgress = 30,
Retune = 31,
TonesConfigure = 32,
@@ -604,10 +604,10 @@ public:
ReplayConfig* const config;
};
class TXDoneMessage : public Message {
class TXProgressMessage : public Message {
public:
constexpr TXDoneMessage(
) : Message { ID::TXDone }
constexpr TXProgressMessage(
) : Message { ID::TXProgress }
{
}

8
firmware/common/portapack_persistent_memory.cpp
View File

@@ -51,9 +51,9 @@ using modem_baudrate_range_t = range_t<int32_t>;
constexpr modem_baudrate_range_t modem_baudrate_range { 50, 9600 };
constexpr int32_t modem_baudrate_reset_value { 1200 };
using modem_bw_range_t = range_t<int32_t>;
/*using modem_bw_range_t = range_t<int32_t>;
constexpr modem_bw_range_t modem_bw_range { 1000, 50000 };
constexpr int32_t modem_bw_reset_value { 15000 };
constexpr int32_t modem_bw_reset_value { 15000 };*/
using modem_repeat_range_t = range_t<int32_t>;
constexpr modem_repeat_range_t modem_repeat_range { 1, 99 };
@@ -151,14 +151,14 @@ void set_modem_baudrate(const int32_t new_value) {
data->modem_baudrate = modem_baudrate_range.clip(new_value);
}
int32_t modem_bw() {
/*int32_t modem_bw() {
modem_bw_range.reset_if_outside(data->modem_bw, modem_bw_reset_value);
return data->modem_bw;
}
void set_modem_bw(const int32_t new_value) {
data->modem_bw = modem_bw_range.clip(new_value);
}
}*/
uint8_t modem_repeat() {
modem_repeat_range.reset_if_outside(data->modem_repeat, modem_repeat_reset_value);

2
firmware/common/portapack_persistent_memory.hpp
View File

@@ -61,8 +61,6 @@ void set_modem_baudrate(const int32_t new_value);
uint8_t modem_repeat();
void set_modem_repeat(const uint32_t new_value);
int32_t modem_bw();
void set_modem_bw(const int32_t new_value);
uint32_t playing_dead();
void set_playing_dead(const uint32_t new_value);