ComThings / PandwaRF

PandwaRF: RF analysis tool with a sub-1 GHz wireless transceiver controlled by a smartphone or
https://pandwarf.com/
290 stars 53 forks source link

Add support for 4-FSK to decode DMR #12

Closed jthenley closed 6 years ago

jthenley commented 7 years ago

Please can you add support for 4-FSK demodulation for CC1111 (like YARD Stick One) in order to capture DMR data.

trollwookiee commented 7 years ago

We can try it. But I don't have DMR device to test it. If we enable 4-FSK it will be totally blindly on our side. Will you be able to test it and provide feedback ?

jthenley commented 7 years ago

Yes absolutely.

trollwookiee commented 6 years ago

Fixed

phretor commented 6 years ago

Is this implemented at the moment?

   1347     def reprMdmModulation(self, radiocfg=None):
   1348         mod = self.getMdmModulation(radiocfg)
-> 1349         return ("Modulation:          %s" % MODULATIONS[mod])
   1350
   1351     def getMdmChanSpc(self, mhz=24, radiocfg=None):

KeyError: 64L

In [5]: MODULATIONS
Out[5]:
{0: '2FSK',
 8: '2FSK/Manchester encoding',
 16: 'GFSK',
 24: 'GFSK/Manchester encoding',
 48: 'ASK/OOK',
 56: 'ASK/OOK/Manchester encoding',
 112: 'MSK',
 120: 'MSK/Manchester encoding'}
trollwookiee commented 6 years ago

It should be right now. Please check https://github.com/ComThings/PandwaRF/commit/1fa87e976dc5932b41279c2d726ea1fd466685f9

phretor commented 6 years ago

I'm glad I've ended up implementing the same change. Thought it was more complicated, but after reading the CC data sheet, the change became obvious. Thanks a lot for the quick response.

So far, I've tested it on a Mac, but I'm assuming RFCat is not meant to work on macOS. I'll let you know how it goes under Linux.

trollwookiee commented 6 years ago

Ok thanks

phretor commented 6 years ago

I'm not sure I understand this 100%. I guess this doesn't automatically grant support for 4FSK, right? I don't have the PandwaRF firmware source code to check, but RFCat's firmware for the CC1111 doesn't seem to set the registers for 4-FSK: https://github.com/atlas0fd00m/rfcat/blob/master/firmware/include/cc1110-ext.h#L1061 - am I missing something?

trollwookiee commented 6 years ago

This is not the FW we use for RF. Did you look at the video in https://pandwarf.com/news/pandwarf-demo-capture-retransmit-data-several-modulations/ At the end I make a 4FSK transmission. Is it what you want ?