natas_hw
/
mspsim
mirror of https://github.com/contiki-ng/mspsim
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed channel calculations

This commit is contained in:
Joakim Eriksson 2012-05-15 15:25:36 +02:00
parent 213677fc01
commit 4bb3c2e5f3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
se/sics/mspsim/chip/CC2520.java
View File

@ -1234,8 +1234,9 @@ public class CC2520 extends Chip implements USARTListener, RFListener, RFSource,
*****************************************************************************/
public void updateActiveFrequency() {
/* INVERTED: f = 5 * (c - 11) + 357 + 0x4000 */
activeFrequency = memory[REG_FSCTRL] - 357 + 2405 - 0x4000;
activeChannel = (memory[REG_FSCTRL] - 357 - 0x4000)/5 + 11;
int freg = memory[REG_FREQCTRL] & 0x7f;
activeFrequency = freg + 2394;
activeChannel = 11 + (freg - 11) / 5;
}
public int getActiveFrequency() {