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

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

This commit is contained in:
Stefan `Sec` Zehl 2011-08-04 16:57:57 +02:00
parent 16da194336 a5c2ce55a6
commit 27793d76a5
43 changed files with 127 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/basic/basic.h
View File

@ -180,6 +180,7 @@ struct MENU {
};
#define MENU_TIMEOUT (1<<0)
#define MENU_JUSTONCE (1<<1)
extern uint8_t menuflags;

8
firmware/basic/menu.c
View File

@ -68,6 +68,10 @@ void handleMenu(const struct MENU *the_menu) {
case BTN_RIGHT:
if (the_menu->entries[menuselection].callback!=NULL)
the_menu->entries[menuselection].callback();
if (menuflags&MENU_JUSTONCE)
return;
break;
case BTN_ENTER:
lcdClear();
@ -77,6 +81,10 @@ void handleMenu(const struct MENU *the_menu) {
if (the_menu->entries[menuselection].callback!=NULL)
the_menu->entries[menuselection].callback();
lcdRefresh();
if (menuflags&MENU_JUSTONCE)
return;
getInputWait();
break;

53
firmware/l0dable/1boot.c Normal file
View File

@ -0,0 +1,53 @@
#include <sysinit.h>
#include "basic/basic.h"
#include "basic/config.h"
#include "lcd/print.h"
#include "usetable.h"
static void set_privacy();
static void privacy0();
static void privacy1();
static void privacy2();
static const char levels[][12] = {"0-trackable","1-mesh only","2-RF OFF"};
static const struct MENU submenu_privacy={ "Privacy?", {
{ levels[0], &privacy0},
{ levels[1], &privacy1},
{ levels[2], &privacy2},
{NULL,NULL}
}};
void ram(void){
// check privacy
menuflags|=MENU_JUSTONCE;
if ((GLOBAL(privacy)!=3)) { //TODO Change!
handleMenu(&submenu_privacy);
}
menuflags&= (~MENU_JUSTONCE);
};
static void privacy0() {
set_privacy(0);
}
static void privacy1() {
set_privacy(1);
}
static void privacy2() {
set_privacy(2);
}
static void set_privacy(int level) {
lcdClear();
lcdPrintln("Privacy:");
lcdPrintln(levels[level]);
lcdRefresh();
getInput();
GLOBAL(privacy) = level;
}

2
simulat0r/Makefile
View File

@ -3,6 +3,8 @@ all : tui gui
.PHONY : tui gui tui-core clean
tui-core :
$(MAKE) -C ../firmware/l0dable usetable.h
cd ..; $(SHELL) simulat0r/bin/update-bridge-files.sh
$(MAKE) -C firmware
$(MAKE) -C simcore
$(MAKE) -C tui

19
simulat0r/bin/update-bridge-files.sh
View File

@ -22,7 +22,7 @@ fi
done
echo "Updating bridge files for C source"
for i in `find firmware/ \! -path firmware/lcd/allfonts.h -type f -iname \*.[ch]`
for i in `find firmware/ \! -path firmware/lcd/allfonts.h \! -path firmware/l0dable/usetable.h -type f -iname \*.[ch]`
do
if test -f simulat0r/$i;
then
@ -45,10 +45,13 @@ do
fi
done
if cmp firmware/.gitignore simulat0r/firmware/.gitignore;
then
echo OK .gitignore is the same in firmware/ and simulat0r/firmware
else
echo WARNING: .gitignore mismatch in firmware/ and simulat0r/firmware
diff -y firmware/.gitignore simulat0r/firmware/.gitignore
fi
for i in `find firmware -type f -name .gitignore`; do
if cmp $i simulat0r/$i
then
echo OK $i and simulat0r/$i are the same
else
echo WARNING: $i mismatches simulat0r/$i
diff -y $i simulat0r/$i
fi
done

2
simulat0r/firmware/.gitignore vendored
View File

@ -4,3 +4,5 @@ lpc1xxx/memory.ld
applications/wrapper.c
lcd/allfonts.h
Makefile.dep
table.c
table.h

1
simulat0r/firmware/applications/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*.gen

2
simulat0r/firmware/applications/executor.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/applications/executor.c"

2
simulat0r/firmware/applications/final.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/applications/final.c"

2
simulat0r/firmware/applications/final/beacon.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/final/beacon.c"

2
simulat0r/firmware/applications/final/config.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/final/config.c"

2
simulat0r/firmware/applications/final/exe.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/final/exe.c"

2
simulat0r/firmware/applications/final/flame.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/final/flame.c"

2
simulat0r/firmware/applications/final/mesh.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/final/mesh.c"

2
simulat0r/firmware/applications/final/nickname.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/final/nickname.c"

2
simulat0r/firmware/applications/final/util.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/final/util.c"

2
simulat0r/firmware/applications/funk.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/applications/funk.c"

2
simulat0r/firmware/applications/l0dable.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/applications/l0dable.c"

2
simulat0r/firmware/applications/mandelbrot.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/applications/mandelbrot.c"

2
simulat0r/firmware/applications/mandelbrot2.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/applications/mandelbrot2.c"

1
simulat0r/firmware/applications/rect.c
View File

@ -1 +0,0 @@
#include "../../../firmware/applications/rect.c"

2
simulat0r/firmware/applications/remote.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/applications/remote.c"

2
simulat0r/firmware/applications/serial/config.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/serial/config.c"

2
simulat0r/firmware/applications/serial/remote.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/serial/remote.c"

2
simulat0r/firmware/applications/serial/uuid.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/serial/uuid.c"

2
simulat0r/firmware/applications/spaceinvaders.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/applications/spaceinvaders.c"

2
simulat0r/firmware/applications/tester/config.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../../firmware/applications/tester/config.c"

1
simulat0r/firmware/applications/waldbrand.c
View File

@ -1 +0,0 @@
#include "../../../firmware/applications/waldbrand.c"

4
simulat0r/firmware/l0dable/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
*.elf
*.bin
usetable.h
loadable.ld

2
simulat0r/firmware/l0dable/Makefile Normal file
View File

@ -0,0 +1,2 @@
# GENERATED INCLUDE BRIDGE/
include ../../../firmware/l0dable/Makefile

2
simulat0r/firmware/l0dable/blink.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/l0dable/blink.c"

2
simulat0r/firmware/l0dable/debug.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/l0dable/debug.c"

2
simulat0r/firmware/l0dable/invaders.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/l0dable/invaders.c"

2
simulat0r/firmware/l0dable/mandel.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/l0dable/mandel.c"

2
simulat0r/firmware/l0dable/recvcard.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/l0dable/recvcard.c"

2
simulat0r/firmware/l0dable/sendcard.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/l0dable/sendcard.c"

4
simulat0r/firmware/loadable/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
*.elf
*.bin
*.h
loadable.ld

2
simulat0r/firmware/loadable/blinktest2.c
View File

@ -1,2 +0,0 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/loadable/blinktest2.c"

2
simulat0r/firmware/loadable/mandelbrot.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/loadable/mandelbrot.c"

2
simulat0r/firmware/loadable/recvcard.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/loadable/recvcard.c"

2
simulat0r/firmware/loadable/sendcard.c Normal file
View File

@ -0,0 +1,2 @@
/* AUTOGENERATED SOURCE FILE */
#include "../../../firmware/loadable/sendcard.c"

1
simulat0r/gui/CMakeLists.txt
View File

@ -37,6 +37,7 @@ set(FIRMWARE_OBJS
../simcore/simcore.o
../simcore/misc.o
../simcore/timecounter.o
../firmware/table.o
)

2
simulat0r/tui/Makefile
View File

@ -24,6 +24,8 @@ LIBS += ../firmware/basic/libbasic.a
OBJS+=../simcore/simcore.o ../simcore/misc.o ../simcore/timecounter.o
OBJS += ../firmware/table.o
OBJS += simulat0r.o
.PHONY : all