ced37e9aab
Merge branch 'master' of https://github.com/r0ket/r0ket
2011-08-03 19:28:43 +02:00
c241ad30f5
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-03 19:25:15 +02:00
9f4b1cf7bc
added some stdint includes
2011-08-03 19:24:05 +02:00
ef4f5d1371
Remove stuff that is now loadable
2011-08-03 19:21:15 +02:00
f546e7a1aa
Fix mktable regexp
2011-08-03 19:13:20 +02:00
28df8b638e
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-03 19:09:57 +02:00
77d35aff7a
added spaceinvaders l0dable
2011-08-03 19:09:03 +02:00
99ce5e362d
save space by telling the compiler that lcdRefresh is actually lcdDisplay
2011-08-03 19:08:44 +02:00
e34df30333
fix zoom: long click = in, double click = out
2011-08-03 19:02:05 +02:00
2799821daf
added receive card l0adable
2011-08-03 19:00:26 +02:00
c856eb4f99
Remove stuff for old loadable requirements
2011-08-03 18:52:56 +02:00
04e0577b55
Remove unneeded/wrong braces
2011-08-03 18:51:58 +02:00
ad0c993136
lcd/render.c: save 56 bytes
...
Introduce a utility function that reads a single byte from the current position
in the font file.
2011-08-03 18:49:28 +02:00
81294835ec
save 4 bytes by making internal function static
2011-08-03 18:49:28 +02:00
c4c67865e8
simpletime refactor away 28 bytes
2011-08-03 18:49:28 +02:00
5244d1cda2
removed 76 bytes from stringin
2011-08-03 18:49:28 +02:00
b23caed454
add static to local-only stuff
2011-08-03 18:37:41 +02:00
18dc658956
inline these helper functions to save space
2011-08-03 18:28:24 +02:00
8ec395879b
Fix off-by-one bug. [Found by 9r]
2011-08-03 18:23:56 +02:00
c62c06c087
Make prototypes single-line so my parser understands them
2011-08-03 18:21:49 +02:00
3028583e28
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-03 18:20:25 +02:00
11ae0a5b9a
Make Timeout of 0 work as intended (no timeout)
2011-08-03 18:19:07 +02:00
3bb82a2676
invaders cleanup, no more warnings
2011-08-03 18:01:16 +02:00
4f5ec4e8fc
invaders scoring
2011-08-03 17:45:57 +02:00
6c20c8cad9
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-03 17:38:53 +02:00
6dcdaf17fe
added sendcard l0dable
2011-08-03 17:38:30 +02:00
3542f8acd6
Ignore empty lines in EXPORTS
2011-08-03 17:11:50 +02:00
ecc8a0e0fb
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-03 17:11:21 +02:00
9b2cee24d0
Allow parsing of /*-style comments
2011-08-03 17:10:52 +02:00
c93ce80fbd
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-03 16:51:02 +02:00
3457388389
Guard against double-include
2011-08-03 16:50:25 +02:00
335e14e17f
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-03 16:47:00 +02:00
187fde3638
Add mesh debugging counter
2011-08-03 16:46:48 +02:00
540a76faf8
Support missing symbols
2011-08-03 16:44:46 +02:00
4a5aa5a592
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-03 16:36:13 +02:00
ce87f3b8f5
New loadable style with big dispatcher table.
2011-08-03 16:34:09 +02:00
d827cf26ae
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-03 16:32:36 +02:00
830ee24cb7
positioning of invaders
2011-08-03 15:02:51 +02:00
761c56f4f2
s.c
2011-08-03 11:34:18 +02:00
8f7664a938
vcard: moved more code into loadables
2011-08-03 10:54:22 +02:00
7539f4e6f7
moved code for vacrd from flash to loadables
2011-08-03 10:38:43 +02:00
e5a4cdf427
added send/receive card loadables
2011-08-03 10:27:56 +02:00
01f7fde0d4
added vcard loadable draft
2011-08-03 10:21:31 +02:00
16bfed499d
spaceinvaders: saved 18 bytes
2011-08-03 09:29:36 +02:00
eccdc2b536
spaceinvaders: saved 8 bytes
2011-08-03 09:21:40 +02:00
b07eb7c577
executor: made encryption work
2011-08-03 08:59:55 +02:00
d8a1d0c78d
fixed greather than/less than for mode change
2011-08-03 00:53:33 +02:00
0aadf3fba8
Do the init automatically now, also fix "=>" to ">=" :)
2011-08-03 00:44:12 +02:00
222f491205
fixed mode changes (greater than/lesser than), removed unused flameEnabled check
2011-08-03 00:35:02 +02:00
5a19b970bb
Honor privacy in mesh
2011-08-03 00:25:09 +02:00
718f3fc381
Set correct channel for openbeacon
2011-08-03 00:24:31 +02:00
69907e7d16
Send OpenBeacon (if privacy allows)
2011-08-03 00:23:31 +02:00
f176bed03f
Truncate file on writing, or we keep garbage at the end...
2011-08-02 23:54:07 +02:00
080cffff23
Err. cut&paste mistake
2011-08-02 23:53:41 +02:00
9cf0b573c3
Make the config menu use repeat functionality. Also: more speed :)
2011-08-02 23:39:37 +02:00
e25e591287
support repeat. Swap up&down. Also some cleanup
2011-08-02 23:34:47 +02:00
691fa7d09b
Add getInputWaitRepeat, to support key repeat
2011-08-02 23:34:13 +02:00
f57e0a9e90
frob fontselector
2011-08-02 21:23:10 +02:00
d76bf573d0
Re-add msc mode
2011-08-02 21:21:58 +02:00
cf219be0c1
fix a warning
2011-08-02 21:01:48 +02:00
32e05be404
Center nickname
2011-08-02 21:01:27 +02:00
b6ef360f43
Check stackpointer
2011-08-02 20:53:43 +02:00
861994ef93
Remove mandel2, its a loadable now
2011-08-02 20:51:46 +02:00
a267e2caf6
Support menu timeout
2011-08-02 20:49:55 +02:00
f7fcaf0ab8
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-02 20:46:29 +02:00
4b74112148
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-02 18:20:43 +02:00
2baf1e4c57
invaders, mostly finished now
2011-08-02 18:20:16 +02:00
c2b42a8d1f
Move mandelbrot into loadables.
2011-08-02 14:16:06 +02:00
665a0e0c32
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-02 13:33:04 +02:00
3a4490db18
Some menu changes. Also: cleanup apps and make the rest build again
2011-08-02 13:31:57 +02:00
c875d98456
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-02 13:10:15 +02:00
d5dd653fbe
invaders stuff
2011-08-02 13:09:58 +02:00
7eaa5f4e4b
more utility/debugging/info stuff
2011-08-02 10:55:01 +02:00
3c3d1032c5
Correct default for contrast setting.
...
Add alivecheck(systick blink) setting
2011-08-02 10:54:05 +02:00
999b3bd809
Properly turn off flame when it's day.
...
Also: skip everything if disabled.
And: debugging display
2011-08-02 10:51:34 +02:00
942440ec0c
Whoops. Swapped day/night invert
2011-08-02 10:50:51 +02:00
d357e6000f
Clean up util.c
2011-08-02 02:45:25 +02:00
0824a2cd25
Some stuff we probably want in the final firmware.
2011-08-02 02:10:15 +02:00
2d3d2af051
Config variables for flame
2011-08-02 02:09:37 +02:00
5dacadbb3e
Mesh now supports non-timestamp but increasing messages.
2011-08-02 01:40:44 +02:00
a19b8ac64a
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-02 01:39:31 +02:00
2957ee4f21
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-02 01:13:20 +02:00
bad31c466a
spacinvaders stuff
2011-08-02 01:12:52 +02:00
623582bbb4
Saner code.
2011-08-02 00:03:37 +02:00
162fd9775c
Whoops. Remove debugging info :)
2011-08-01 23:53:09 +02:00
60e31bbfaf
Add ReInit to be used after msc mode
2011-08-01 23:51:41 +02:00
4ed86ed5bc
Fix fileselect0r (no files, down-scroll)
2011-08-01 23:51:08 +02:00
42fd4f116c
cleanup a bit
2011-08-01 23:50:58 +02:00
5a6be961a0
Fix the default background stuff properly.
2011-08-01 23:49:41 +02:00
21be4195eb
added config options for menu
2011-08-01 23:34:13 +02:00
b225322bce
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-01 21:45:11 +02:00
cafdbed82f
bunkers in spaceinvaders
2011-08-01 21:44:48 +02:00
99f3095b46
Fix invader font
2011-08-01 20:03:12 +02:00
4ccd0bf18d
Merge branch 'master' of github.com:r0ket/r0ket
2011-08-01 18:30:18 +02:00
f82cb8382a
spaceinvaders improved
2011-08-01 18:29:50 +02:00
5b7a675e1f
Whoops. Make systick called again in APP=tester
2011-08-01 16:09:04 +02:00
bd047cbe5a
Add simple lcdRefresh() speedtest
2011-08-01 14:32:22 +02:00
49c49e328f
Disable too flashy backlight cycling in life
2011-08-01 06:15:44 +02:00
174e7ee9e5
The calls to nrf_off on lowpower-off require a -lfunk at the end
2011-08-01 06:10:22 +02:00
377d614c38
Fix build on Mac OS X
...
The header stdio.h on Mac OS X includes some defines to do buffer
overflow checks if using _FORTIFY_SOURCE > 2, which is the default.
Defining _FORTIFY_SOURCE=0 disables this behavior.
The Mac OS X linker ld64 has problem with common symbols in static
archives. The workaround here is to run 'ranlib -c' on the static
archive.
2011-08-01 05:45:16 +02:00
d4c48f66c2
Disable nrf on lowpower-off
2011-08-01 05:31:47 +02:00
26515e2717
I forgot this new .h file a few commits ago.
2011-08-01 05:23:14 +02:00
cccb869423
Fix a few warnings
2011-08-01 05:22:24 +02:00
61c1293611
Add Timestamp support for filesystem. This took me 3h to debug :-/
2011-08-01 05:11:56 +02:00
6bd703f006
fix new font setting for internal fonts
2011-08-01 05:11:04 +02:00
34869e2973
modernize menu.c
2011-08-01 05:10:37 +02:00
f41d900e0d
Adjust startup value
2011-08-01 05:06:20 +02:00
d5e93a1fca
Merge branch 'master' of github.com:r0ket/r0ket
...
Conflicts:
firmware/basic/config.c
2011-08-01 05:05:47 +02:00
13df9eec9d
select: wait for key release
2011-08-01 02:18:36 +02:00
2a632870fd
added 32 level contrast
2011-08-01 02:18:03 +02:00
f2c5d53cb9
Oops. We need to close the files, too.
2011-08-01 01:55:04 +02:00
29df9b9e1f
Add missing config.h
2011-08-01 01:34:11 +02:00
6299286348
Two utility functions to read/write small files
2011-08-01 01:12:58 +02:00
5d0887be71
Move config stuff into own include. Iggy said its better :-)
2011-08-01 01:12:21 +02:00
621bca40b3
improve application Makfile
2011-08-01 01:08:05 +02:00
1ccda41467
Sign error. Whoops.
2011-07-31 22:46:24 +02:00
aa821fca3f
Fix a few things.
2011-07-31 22:13:06 +02:00
c95eb0844f
Merge branch 'master' of github.com:r0ket/r0ket
2011-07-31 20:35:36 +02:00
b28920fec8
initial: no watchdog in isp mode
2011-07-31 20:34:56 +02:00
e4869f6ec0
initial: wait for flashed.cfg
2011-07-31 20:32:37 +02:00
e3d46f01bd
Fix a few global config regressions, and add sample config menu
2011-07-31 18:20:55 +02:00
cfe6e328e5
You will probably hate me, but commit new, global config framework
...
hopefully it will be stable now. Sorry for breaking your stuff
2011-07-31 18:15:44 +02:00
2c62859a60
more pretty-printing
2011-07-31 00:55:02 +02:00
a20a260117
Show badge uptime
2011-07-31 00:54:41 +02:00
8bc5424607
Fix time and generation handling a bit
2011-07-31 00:53:53 +02:00
06ac802ee5
More abstracted num to string functions
2011-07-31 00:53:14 +02:00
e911376fe6
Merge branch 'master' of github.com:r0ket/r0ket
...
Conflicts:
firmware/basic/Makefile
2011-07-30 19:31:12 +02:00
d8cbdc79fa
string input + demo
2011-07-30 19:28:37 +02:00
8625d1b3ef
Mesh++ Now we can display messages.
2011-07-30 19:06:12 +02:00
1a23641c8d
Refactor mesh stuff
2011-07-30 16:10:30 +02:00
1077b5fd1e
Fix filename to be the same in read && write
2011-07-30 15:30:35 +02:00
e8f06b2388
Some time related functionality
2011-07-30 15:25:14 +02:00
f79f8a93f5
Mesh in systick. Now retransmits the time correctly
2011-07-30 11:51:05 +02:00
4b95235843
More serial support
2011-07-30 11:43:08 +02:00
75c5ae71d9
streamlined bootstrap application
2011-07-30 11:17:35 +02:00
6c95119e38
do lcd_mirror command by default. (so schneider can test it)
2011-07-30 03:27:53 +02:00
da6cc353da
Better serial input/output
2011-07-30 03:27:29 +02:00
d621d9b117
make TYPE=serial a proper air debugging tool
2011-07-29 22:30:36 +02:00
62a8270609
Time transmit now works
2011-07-29 19:49:24 +02:00
9cf36467e4
First minimesh code.
2011-07-29 19:40:24 +02:00
76ee150b3f
Add GetTimer()
2011-07-29 19:06:23 +02:00
01e1077e25
Merge branch 'master' of github.com:r0ket/r0ket
2011-07-29 19:02:01 +02:00
3fc7fb22ac
forgot a "void" here.
2011-07-29 19:01:41 +02:00
3f7ac1c777
Merge git://github.com/r0ket/r0ket
2011-07-29 04:38:12 +02:00
9d933f7d4c
Use untracked Makefile.sitespecific to optionally override some build flags
2011-07-29 04:33:29 +02:00
e0ae77294e
Removed #error statement (that was left in after debugging architektur ifdef?)
2011-07-29 02:46:22 +02:00
ad62356734
Semi-functional remo0te with 1st attemt at message-back
2011-07-28 01:32:45 +02:00
7993bc3f0d
library dependency fix
2011-07-28 01:32:13 +02:00
03e95c9681
More funk test code (rem0te/game support)
2011-07-27 23:43:14 +02:00
5e1ac514ea
Add simple itoa-style function
2011-07-27 23:41:09 +02:00
932d5502d2
Add #include <time.h> for time_t definition
2011-07-27 23:40:14 +02:00
28cc6e63ca
OOps: Remove debugging-#error
2011-07-27 23:39:07 +02:00
625af67f3f
New polling-based funk receive functions.
2011-07-27 23:38:52 +02:00
196ac680e9
First version of an serial openbeaconsniffer. Yay.
2011-07-27 19:03:25 +02:00
9e4f27ad12
More usbserial utility functions
2011-07-27 18:22:53 +02:00
ce6b63046f
Whoops. (Cygwin-)Symlinks and git don't mix
2011-07-27 17:33:55 +02:00
838f04505c
Add small lcd documentation :)
2011-07-27 17:19:29 +02:00
63ff0de8b2
Actually try to use USB-serial code. "make APP=tester TYPE=serial"
2011-07-27 15:41:18 +02:00
250ea3213f
Make backlight and lcd-state config vars actually work
2011-07-27 01:15:52 +02:00
477dfcf98a
APP=initial is compiled without default.c
2011-07-27 01:02:26 +02:00
5a55da7f76
Fix some menu regressions because of getInputWait() changes
2011-07-27 00:58:48 +02:00
535b635b0e
First draft of the new global config system
...
Sorry if your display is mirrored again %)
2011-07-27 00:57:36 +02:00
833a6387fb
always remove libapp.a before rebuilding it.
2011-07-27 00:28:08 +02:00
2da811bf61
Make our systick interval a #define
2011-07-27 00:25:24 +02:00
e124c142f2
Fix more instances of wrong define used
2011-07-27 00:18:23 +02:00
0a268ebfc3
Fix #define to somethin which works :)
2011-07-27 00:11:30 +02:00
0477dc01e2
Merge branch 'master' of ssh://github.com/r0ket/r0ket
2011-07-26 23:41:24 +02:00
3e30e03ba9
Actually enable formatting the DF
2011-07-26 02:09:52 +02:00
3d701fda1b
If no filesystem, fail configstuff quickly
2011-07-26 02:06:10 +02:00
cb5ebc57d8
add APP=initial, template for initial firmware to be flashed.
2011-07-26 01:55:33 +02:00
e182a2c179
APP=tester now supports systick-functions, too
2011-07-26 01:18:31 +02:00
292d1ba36f
Rename timer.c into more correct queue.c
2011-07-26 01:09:31 +02:00
7eba1c5240
Fix delayms_power to do proper timecounting
2011-07-26 01:04:34 +02:00
bb178629a2
oops
2011-07-25 23:41:26 +02:00
0b930aef48
Use new mutex :)
2011-07-25 23:26:18 +02:00
d8563eb64d
Merge branch 'master' of github.com:r0ket/r0ket
2011-07-25 23:25:44 +02:00
0fbdd071ab
added adc mutex
2011-07-25 23:25:00 +02:00
68b5afbe47
handle i2c through queue, probe i2c for flame
2011-07-25 20:33:20 +02:00
ea8754c1dd
Implemented time counter in simulat0r
2011-07-25 08:50:33 +02:00
242bb480a0
Code cleanup, got rid of warnings
2011-07-25 08:48:19 +02:00
78f3f25937
vcard: funny errors with vcard...
2011-07-25 02:11:41 +02:00
8daf823d98
fs: improved file selector
2011-07-25 00:32:36 +02:00
34b0ba6e58
Renamed C++ keyword "new" to "qnew" in function prototypes
2011-07-24 22:25:35 +02:00
31efd30e85
Merge branch 'master' of http://www.itfuzzi.de/git/r0ket
2011-07-24 22:19:46 +02:00
f668dff151
ifdefed ASMs
2011-07-24 22:14:06 +02:00
4c8839b2ba
vcard: read keys from filesystem
2011-07-24 21:53:11 +02:00
f79d3b49f4
More powersaving/queue-working
2011-07-24 16:29:14 +02:00
c896b4645e
rename random() to getRandom(), just to please you.
2011-07-24 15:58:47 +02:00
80f914e58f
Make GetInputWait() work our new queue. Make the menu code use it by default.
2011-07-24 15:54:18 +02:00
7a019d06e7
Add simple queue to move jobs from systick to main/idle.
2011-07-24 15:44:35 +02:00
235cadaa89
remove unused variable
2011-07-24 15:38:28 +02:00
9b95dab688
remove use of removed global variable
2011-07-24 15:37:03 +02:00
860f226e45
Whoops. Forgot "mktester" shell script for APP=tester support
2011-07-24 14:12:30 +02:00
ea3b4f3337
another "select()" function renamed. This time its lcd_select()
2011-07-24 14:08:52 +02:00
6a76e01a67
bring baisc.h in line with new uuid.h form schneider
2011-07-24 10:28:17 +02:00
53ff9f468e
Merge branch 'master' of github.com:r0ket/r0ket
2011-07-24 10:26:39 +02:00
abfe5342c9
Rename inconveniently-named select() to more correct mmc_select()
2011-07-24 10:26:04 +02:00
9a77b01cef
Use xor drawing to animate game of life over arbitrary display content
2011-07-24 08:59:56 +02:00
cd1d43883d
Merge branch 'master' of github.com:r0ket/r0ket
2011-07-24 03:32:20 +02:00
a7c737f62c
added secs night detection
2011-07-24 03:31:47 +02:00
Kilian Neuner