Merge branch 'master' of github.com:r0ket/r0ket

This commit is contained in:
Stefan `Sec` Zehl 2011-08-04 00:57:26 +02:00
commit 4697a92817
4 changed files with 31 additions and 4 deletions

View File

@ -65,3 +65,5 @@ meshGetMessage
nickname nickname
uint32touint8p uint32touint8p
uint8ptouint32 uint8ptouint32
memset
nrf_config_set

View File

@ -24,9 +24,20 @@
uint8_t mac[5] = {1,2,3,2,1}; uint8_t mac[5] = {1,2,3,2,1};
struct NRF_CFG config = {
.channel= 81,
.txmac= "\x1\x2\x3\x2\x1",
.nrmacs=1,
.mac0= "\x1\x2\x3\x2\x1",
.maclen ="\x20",
};
void ram(void) void ram(void)
{ {
memset(0,0,0);
nrf_config_set(&config);
if( sendKeys() ) if( sendKeys() )
return; return;

View File

@ -30,12 +30,23 @@
//#include "lcd/print.h" //#include "lcd/print.h"
void sendFile(char *filename);
uint8_t mac[5] = {1,2,3,2,1}; uint8_t mac[5] = {1,2,3,2,1};
struct NRF_CFG config = {
.channel= 81,
.txmac= "\x1\x2\x3\x2\x1",
.nrmacs=1,
.mac0= "\x1\x2\x3\x2\x1",
.maclen ="\x20",
};
void ram(void) void ram(void)
{ {
nrf_config_set(&config);
char file[13]; char file[13];
selectFile(file,"TXT"); selectFile(file,"TXT");
sendFile(file); sendFile(file);
@ -43,7 +54,8 @@ void ram(void)
void sendR(uint8_t *rx, uint8_t *ry) void sendR(uint8_t *rx, uint8_t *ry)
{ {
uint8_t exp[2 + 4*NUMWORDS + 2]; //uint8_t exp[2 + 4*NUMWORDS + 2];
uint8_t exp[32];
exp[0] = 'R'; exp[0] = 'R';
for(int i=0; i<4*NUMWORDS; i++) for(int i=0; i<4*NUMWORDS; i++)
exp[2+i] = rx[i]; exp[2+i] = rx[i];
@ -54,6 +66,7 @@ void sendR(uint8_t *rx, uint8_t *ry)
for(int i=0; i<4*NUMWORDS; i++) for(int i=0; i<4*NUMWORDS; i++)
exp[2+i] = ry[i]; exp[2+i] = ry[i];
nrf_snd_pkt_crc(32, exp); nrf_snd_pkt_crc(32, exp);
delayms(10); delayms(10);
} }

View File

@ -1,3 +1,4 @@
size_t strlen(const char *s); size_t strlen(const char *s);
char * strcpy(char * restrict dst, const char * restrict src); char strcpy(char * restrict dst, const char * restrict src);
void * memcpy(void *dst, const void *src, size_t len); void memcpy(void *dst, const void *src, size_t len);
void memset(void *s, int c, size_t n);