TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-12-03 14:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed messup after last squashed commits

Browse Source
This commit is contained in:
furrtek
2016-12-24 16:54:44 +01:00
parent 6bcb7dc1b1
commit 9470028308
11 changed files with 7 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/application/rds.hpp
View File

@@ -37,19 +37,11 @@ namespace rds {
struct RDS_flags {
uint16_t PI_code;
<<<<<<< HEAD
uint8_t PTY;
uint8_t DI;
bool TP;
bool TA;
bool MS;
=======
bool TP;
uint8_t PTY;
bool TA;
bool MS;
bool DI;
>>>>>>> d402a87... RDS radiotext and time group generators
};
uint32_t makeblock(uint32_t blockdata, uint16_t offset);