From 57d7f7dd51a06e107a1ebcc1c5d1aa3f55f0ec59 Mon Sep 17 00:00:00 2001 From: schneider Date: Tue, 27 Dec 2011 13:02:45 +0100 Subject: [PATCH 1/3] player: set signal strength to max --- firmware/l0dable/EXPORTS | 1 + firmware/l0dable/r_player.c | 1 + 2 files changed, 2 insertions(+) diff --git a/firmware/l0dable/EXPORTS b/firmware/l0dable/EXPORTS index 4ff2c34..1a3d7d5 100644 --- a/firmware/l0dable/EXPORTS +++ b/firmware/l0dable/EXPORTS @@ -137,4 +137,5 @@ o_set_shader o_identity o_transform getrelease +nrf_set_strength #Add stuff here diff --git a/firmware/l0dable/r_player.c b/firmware/l0dable/r_player.c index 51cf0d3..3d2728c 100644 --- a/firmware/l0dable/r_player.c +++ b/firmware/l0dable/r_player.c @@ -116,6 +116,7 @@ void ram(void) config.channel = ANNOUNCE_CHANNEL; memcpy(config.mac0, ANNOUNCE_MAC, 5); nrf_config_set(&config); + nrf_set_strength(3); id = getRandom(); ctr = 1; From 84a41297a1d8ca67f9393c5b88d378ab64418b3c Mon Sep 17 00:00:00 2001 From: schneider Date: Tue, 27 Dec 2011 18:46:26 +0100 Subject: [PATCH 2/3] rem0te: added massgame and reader support --- tools/game/r0ketrem0te/game.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/game/r0ketrem0te/game.py b/tools/game/r0ketrem0te/game.py index 8df5f70..b074201 100644 --- a/tools/game/r0ketrem0te/game.py +++ b/tools/game/r0ketrem0te/game.py @@ -12,8 +12,9 @@ class Player(): self.timeout = 10 self.active = False +# set shortpackets=True if you want to announce a game to be read with OpenBeacon readers class Game: - def __init__(self, device, gameName, gameChannel, announcechannel, announcemac, maxplayer=0, askname=False): + def __init__(self, device, gameName, gameChannel, announcechannel, announcemac, maxplayer=0, askname=False, shortpackets=False): self.gameName = gameName self.channel = gameChannel self.gamemac = [int(random.random()*254) for x in range(1,6)] @@ -21,9 +22,14 @@ class Game: self.playermac[4]+=1 self.gameid = int(random.random()*(2**15)) + flags = 0 + if maxplayer == 0: + flags = 1 + if shortpackets: + flags += 2 self.bridge = bridge.Bridge(device, self.channel, self.gamemac) self.announce = packets.Announce(self.gamemac, self.channel, - self.gameid, 0, self.gameName) + self.gameid, flags, self.gameName) self.announcequeue = Queue.Queue() self.bridge.registerQueue(self.announcequeue) From cafb7d5cf2e44ea2aae55b4e21312fada899da62 Mon Sep 17 00:00:00 2001 From: schneider Date: Tue, 27 Dec 2011 18:48:22 +0100 Subject: [PATCH 3/3] bumped revision --- firmware/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/main.c b/firmware/main.c index f193350..77c34ec 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -77,5 +77,5 @@ int main(void) { } int getrelease(void){ - return 0x00000105; + return 0x00000106; };