ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

structs neeed to be packed, added some dbg output

This commit is contained in:
schneider 2011-12-12 18:00:14 +01:00
parent a33cafde2f
commit e359032580
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
firmware/l0dable/r_player.c
View File

@ -37,13 +37,7 @@
//#error "CDC is not defined" //#error "CDC is not defined"
//#endif //#endif
struct NRF_CFG config = { //for some reason this has to be global struct NRF_CFG config;
.channel= REMOTE_CHANNEL,
.txmac= GAME_MAC,
.nrmacs=1,
.mac0= PLAYER_MAC,
.maclen ="\x20",
};
struct packet{ struct packet{
uint8_t len; uint8_t len;
@ -57,25 +51,24 @@ struct packet{
struct button{ struct button{
uint8_t button; uint8_t button;
uint8_t reserved[18]; uint8_t reserved[18];
}button; }__attribute__((packed)) button;
struct text{ struct text{
uint8_t x; uint8_t x;
uint8_t y; uint8_t y;
uint8_t flags; uint8_t flags;
uint8_t text[16]; uint8_t text[16];
}text; }__attribute__((packed)) text;
struct nick{ struct nick{
uint8_t flags; uint8_t flags;
uint8_t text[18]; uint8_t text[18];
}nick; }__attribute__((packed)) nick;
struct nickrequest{ struct nickrequest{
uint8_t reserved[19]; uint8_t reserved[19];
}nickrequest; }__attribute__((packed)) nickrequest;
struct ack{ struct ack{
uint8_t flags; uint8_t flags;
uint8_t reserved[19]; uint8_t reserved[18];
}ack; }__attribute__((packed)) ack;
struct announce{ struct announce{
uint8_t gameMac[5]; uint8_t gameMac[5];
uint8_t gameChannel; uint8_t gameChannel;
@ -83,13 +76,16 @@ struct packet{
uint32_t gameId; uint32_t gameId;
uint8_t gameFlags; uint8_t gameFlags;
uint8_t gameTitle[8]; uint8_t gameTitle[8];
}announce; }__attribute__((packed)) announce;
struct join{ struct join{
uint32_t gameId; uint32_t gameId;
}join; uint8_t reserved[15];
}__attribute__((packed)) join;
}c; }c;
uint16_t crc; uint16_t crc;
}; }__attribute__((packed));
#define sizeof(p) (sizeof(struct packet))
#define FLAGS_MASS_GAME 1 #define FLAGS_MASS_GAME 1
@ -122,11 +118,14 @@ void processAnnounce(struct announce *a);
uint8_t selectGame(); uint8_t selectGame();
void playGame(); void playGame();
struct announce games[10]; struct announce games[7];
uint8_t gamecount; uint8_t gamecount;
void ram(void) void ram(void)
{ {
config.nrmacs=1;
config.maclen[0] = 32;
id = getRandom(); id = getRandom();
ctr = 1; ctr = 1;
@ -181,6 +180,7 @@ void showGames(uint8_t selected)
uint8_t joinGame() uint8_t joinGame()
{ {
int i; int i;
lcdClear();
for(i=0; i<10; i++){ for(i=0; i<10; i++){
struct packet p; struct packet p;
p.len=sizeof(p); p.len=sizeof(p);
@ -189,8 +189,9 @@ uint8_t joinGame()
p.id= id; p.id= id;
p.ctr= ++ctr; p.ctr= ++ctr;
p.c.join.gameId=gameId; p.c.join.gameId=gameId;
nrf_snd_pkt_crc(sizeof(p),(uint8_t*)&p); int r = nrf_snd_pkt_crc(sizeof(p),(uint8_t*)&p);
lcdPrint("send: "); lcdPrintInt(r);lcdPrintln("");
lcdRefresh();
int len; int len;
len = nrf_rcv_pkt_time(30,sizeof(p),(uint8_t*)&p); len = nrf_rcv_pkt_time(30,sizeof(p),(uint8_t*)&p);
if( len==sizeof(p) ){ if( len==sizeof(p) ){
@ -212,16 +213,18 @@ uint8_t selectGame()
{ {
int len, i, selected; int len, i, selected;
struct packet p; struct packet p;
int a = 0;
config.channel = REMOTE_CHANNEL; config.channel = REMOTE_CHANNEL;
memcpy(config.txmac, GAME_MAC, 5); memcpy(config.txmac, GAME_MAC, 5);
memcpy(config.mac0, PLAYER_MAC, 5); memcpy(config.mac0, PLAYER_MAC, 5);
nrf_config_set(&config); nrf_config_set(&config);
gamecount = 0; gamecount = 0;
for(i=0;i<30;i++){ for(i=0;i<60;i++){
len= nrf_rcv_pkt_time(30, sizeof(p), (uint8_t*)&p); len= nrf_rcv_pkt_time(30, sizeof(p), (uint8_t*)&p);
if (len==sizeof(p)){ if (len==sizeof(p)){
if( a ) a = 0; else a = 1;
gpioSetValue (RB_LED2, a);
processPacket(&p); processPacket(&p);
} }
} }
@ -265,7 +268,7 @@ uint8_t selectGame()
void processPacket(struct packet *p) void processPacket(struct packet *p)
{ {
if ((p->len==32) && (p->protocol=='G') && p->id == id){ //check sanity, protocol, id if ((p->len==32) && (p->protocol=='G') && (p->id == id || p->id == 0) ){ //check sanity, protocol, id
if (p->command=='T'){ if (p->command=='T'){
//processText(&(p->c.text)); //processText(&(p->c.text));
} }