X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=projects%2Fmicrob2010%2Ftests%2Fbeacon_tsop%2Fboard2010.h;h=e55856117bd2d955528acd6248afa1fb7f7a4857;hb=8a0b4d5c16a9a304515b42f56ff321c2cdd27eb6;hp=669d5903e5b7603d65d942d5aafbca28f3c07a6a;hpb=1714f4ee916fca95ce24120ea6e698237913f947;p=aversive.git

diff --git a/projects/microb2010/tests/beacon_tsop/board2010.h b/projects/microb2010/tests/beacon_tsop/board2010.h
index 669d590..e558561 100644
--- a/projects/microb2010/tests/beacon_tsop/board2010.h
+++ b/projects/microb2010/tests/beacon_tsop/board2010.h
@@ -64,37 +64,37 @@
 
 #define EICRx_TSOP EICRB /* EICRA is not ok, cannot do intr on any edge */
 
-#define INTx_TSOP_OPP  INT5
-#define ISCx0_TSOP_OPP ISC50
-#define ISCx1_TSOP_OPP ISC(1
-#define SIG_TSOP_OPP   SIG_INTERRUPT5
-#define TSOP_OPP_READ() (!(PINE & 0x20))
-
-#define INTx_TSOP_STA  INT6
-#define ISCx0_TSOP_STA ISC60
-#define ISCx1_TSOP_STA ISC61
-#define SIG_TSOP_STA   SIG_INTERRUPT6
-#define TSOP_STA_READ() (!(PINE & 0x40))
-
-#define TSOP_FREQ_455_MHZ 0.455
-#define N_PERIODS_455   10.
-#define TSOP_FREQ_38_MHZ 0.038
+#define INTx_TSOP_OPP  INT6
+#define ISCx0_TSOP_OPP ISC60
+#define ISCx1_TSOP_OPP ISC61
+#define SIG_TSOP_OPP   SIG_INTERRUPT6
+#define TSOP_OPP_READ() (!(PINE & 0x40))
+
+#define INTx_TSOP_STA  INT5
+#define ISCx0_TSOP_STA ISC50
+#define ISCx1_TSOP_STA ISC51
+#define SIG_TSOP_STA   SIG_INTERRUPT5
+#define TSOP_STA_READ() (!(PINE & 0x20))
+
+#define TSOP_FREQ_455_KHZ 0.455
+#define N_PERIODS_455   15.
+#define TSOP_FREQ_38_KHZ 0.038
 #define N_PERIODS_38   15.
-#define TSOP_FREQ_30_MHZ 0.030
+#define TSOP_FREQ_30_KHZ 0.030
 #define N_PERIODS_30   15.
-#define TSOP_FREQ_56_MHZ 0.056
+#define TSOP_FREQ_56_KHZ 0.056
 #define N_PERIODS_56   15.
 
 /* TSOP STATIC */
 
-#define TSOP_STA_PERIOD_US (1./TSOP_FREQ_38_MHZ)
-#define TSOP_STA_N_PERIODS  (N_PERIODS_38)
+#define TSOP_STA_PERIOD_US (1./TSOP_FREQ_455_KHZ)
+#define TSOP_STA_N_PERIODS  (N_PERIODS_455)
 
 #define TSOP_STA_TIME_SHORT_US (1.5 * TSOP_STA_N_PERIODS * TSOP_STA_PERIOD_US)
 #define TSOP_STA_TIME_LONG_US  (2.5 * TSOP_STA_N_PERIODS * TSOP_STA_PERIOD_US)
 
-#define TSOP_STA_TIME_SHORT ((uint16_t)(TSOP_STA_TIME_SHORT_US*2))
-#define TSOP_STA_TIME_LONG  ((uint16_t)(TSOP_STA_TIME_LONG_US*2))
+#define TSOP_STA_TIME_SHORT ((uint16_t)(TSOP_STA_TIME_SHORT_US/4))
+#define TSOP_STA_TIME_LONG  ((uint16_t)(TSOP_STA_TIME_LONG_US/4))
 
 #define TSOP_STA_FRAME_LEN 16
 #define TSOP_STA_FRAME_MASK ((1UL << TSOP_STA_FRAME_LEN) - 1)
@@ -109,14 +109,14 @@
 
 /* TSOP OPP */
 
-#define TSOP_OPP_PERIOD_US (1./TSOP_FREQ_455_MHZ)
-#define TSOP_OPP_N_PERIODS  (N_PERIODS_455)
+#define TSOP_OPP_PERIOD_US (1./TSOP_FREQ_56_KHZ)
+#define TSOP_OPP_N_PERIODS  (N_PERIODS_56)
 
 #define TSOP_OPP_TIME_SHORT_US (1.5 * TSOP_OPP_N_PERIODS * TSOP_OPP_PERIOD_US)
 #define TSOP_OPP_TIME_LONG_US  (2.5 * TSOP_OPP_N_PERIODS * TSOP_OPP_PERIOD_US)
 
-#define TSOP_OPP_TIME_SHORT ((uint16_t)(TSOP_OPP_TIME_SHORT_US*2))
-#define TSOP_OPP_TIME_LONG  ((uint16_t)(TSOP_OPP_TIME_LONG_US*2))
+#define TSOP_OPP_TIME_SHORT ((uint16_t)(TSOP_OPP_TIME_SHORT_US/4))
+#define TSOP_OPP_TIME_LONG  ((uint16_t)(TSOP_OPP_TIME_LONG_US/4))
 
 #define TSOP_OPP_FRAME_LEN 16
 #define TSOP_OPP_FRAME_MASK ((1UL << TSOP_OPP_FRAME_LEN) - 1)