Commit Graph

784 Commits

Author SHA1 Message Date
Stefan `Sec` Zehl bc2ba6ecc2 more functions 2011-08-04 21:23:29 +02:00
Stefan `Sec` Zehl 3254389951 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-04 20:46:40 +02:00
iggy b844a2b1a1 invaders can exit, size reduction with static fkts 2011-08-04 20:37:02 +02:00
Stefan `Sec` Zehl c8310c23d5 use new queue stuff to run smoother 2011-08-04 20:24:45 +02:00
Stefan `Sec` Zehl d67e7debcb fix time packet display 2011-08-04 20:23:14 +02:00
iggy ccc8ce1395 more queue handling in invaders 2011-08-04 20:11:12 +02:00
Stefan `Sec` Zehl a41ca4d93d queue_plus: allows for incremental queue stuff (nrf receive mostly) 2011-08-04 19:10:22 +02:00
Stefan `Sec` Zehl 009897df88 Fix stupidity. nrf needs to go in the queue 2011-08-04 19:00:02 +02:00
Stefan `Sec` Zehl 5bcb504a1d tell me who you are. 2011-08-04 17:57:59 +02:00
Stefan `Sec` Zehl 0f53352763 Break receiving down. 2011-08-04 17:52:38 +02:00
Stefan `Sec` Zehl 9da6d74f2e Use 1boot loadable for real 2011-08-04 17:20:24 +02:00
Stefan `Sec` Zehl b933ebce40 add menuflags export for iggy's 1boot 2011-08-04 16:59:01 +02:00
Stefan `Sec` Zehl 27793d76a5 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-04 16:57:57 +02:00
Stefan `Sec` Zehl 16da194336 Support l0dable nickname display. 2011-08-04 16:57:18 +02:00
Stefan `Sec` Zehl 1091daeb9d Sample nickname application 2011-08-04 16:55:52 +02:00
Stefan `Sec` Zehl d69cf154a0 Add life.c nickscroller. I hacked around quite a bit to get it small. 2011-08-04 16:41:43 +02:00
iggy a5c2ce55a6 1boot alpha 2011-08-04 16:34:56 +02:00
iggy 13f5444745 option added for menus to show "JUSTONCE" 2011-08-04 16:29:13 +02:00
Stefan `Sec` Zehl b7fe341739 Fix config with disabled entries 2011-08-04 16:05:30 +02:00
Stefan `Sec` Zehl 323143d734 Support for develmode 2011-08-04 15:02:51 +02:00
Stefan `Sec` Zehl ff2c891961 config cleanups 2011-08-04 14:55:09 +02:00
Stefan `Sec` Zehl 2e1f1a69d1 Mesh now turns message LED on on new message 2011-08-04 14:54:16 +02:00
Stefan `Sec` Zehl b814761438 All LEDs default to off now 2011-08-04 14:53:13 +02:00
Stefan `Sec` Zehl a7894361e6 config now allows hiding of variables.
flame options are hidden unless flame present
also fix alivechk setting
2011-08-04 14:33:39 +02:00
Stefan `Sec` Zehl 9b115fea4c File selector now omits extension for display. 2011-08-04 13:52:36 +02:00
Stefan `Sec` Zehl d68b51f230 Make initial app clearer for badges who already have a display :) 2011-08-04 13:43:49 +02:00
Stefan `Sec` Zehl 64d22980f2 Add nrf_check_reset, and run it every 5 seconds.
Also: add more debugging
2011-08-04 13:11:28 +02:00
Stefan `Sec` Zehl 55d15269c5 fix make clean, and run mktable if usetable.h is missing 2011-08-04 11:07:32 +02:00
Stefan `Sec` Zehl d8371af9ab Revert "Revert "lcd/render.c: save 56 bytes""
This reverts commit a5f8a9b04f.
2011-08-04 10:56:02 +02:00
Stefan `Sec` Zehl 3b7f41bb58 Revert "Revert "save 4 bytes by making internal function static""
This reverts commit 8875fc8d8b.
2011-08-04 10:55:41 +02:00
Stefan `Sec` Zehl ef0d134a34 table.c/table.h are generated and need not be commited 2011-08-04 10:54:09 +02:00
Stefan `Sec` Zehl 340276a9f7 Be more clear on charging status 2011-08-04 10:53:52 +02:00
Stefan `Sec` Zehl 4697a92817 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-04 00:57:26 +02:00
Stefan `Sec` Zehl 30b852a09f Remove debugging from menu (and thus codesize) 2011-08-04 00:57:00 +02:00
schneider 0a266eae4a vcard: added system includes 2011-08-04 00:50:45 +02:00
schneider cf2824511e added exports for vcard 2011-08-04 00:49:46 +02:00
schneider 8513771825 recvcard: init nrf 2011-08-04 00:49:28 +02:00
schneider eda19fa10c sendfile: removed debug output 2011-08-04 00:46:53 +02:00
schneider b1d4bf019a sendcard: buffer overflow #fail 2011-08-04 00:44:13 +02:00
Stefan `Sec` Zehl 6de83a0b6f Revert "remove debugging code"
This reverts commit e498ab2815.
2011-08-04 00:27:05 +02:00
Stefan `Sec` Zehl 9124a186b9 gna. 2011-08-04 00:26:21 +02:00
Stefan `Sec` Zehl dcbecb6ebd Remove flamedebug. It breaks other stuff 2011-08-04 00:25:29 +02:00
Stefan `Sec` Zehl 4cd445ad02 Fix DoIntX - compiler fails on dynmic-sized-arrays? 2011-08-04 00:23:53 +02:00
Stefan `Sec` Zehl b51e6885d0 Ooops forgot file 2011-08-04 00:18:06 +02:00
Stefan `Sec` Zehl 5a8735fdc5 Also standalone l0dables allowed 2011-08-04 00:12:11 +02:00
Stefan `Sec` Zehl d490211d92 also show date. 2011-08-03 23:36:16 +02:00
Stefan `Sec` Zehl 28375b9ed1 Enhance+flame debug 2011-08-03 23:32:26 +02:00
Stefan `Sec` Zehl e498ab2815 remove debugging code 2011-08-03 23:31:59 +02:00
Stefan `Sec` Zehl aeec12c3eb Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 23:16:41 +02:00
Stefan `Sec` Zehl fe500650e9 invaders now do meshscore 2011-08-03 23:13:44 +02:00
Stefan `Sec` Zehl 8b93635425 bugfix 2011-08-03 23:12:43 +02:00
kiu 94926a1958 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 22:55:50 +02:00
kiu 2a18d27530 fixed stupid casting issues for overfloew detection 2011-08-03 22:54:42 +02:00
Stefan `Sec` Zehl 3067880746 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 22:35:19 +02:00
iggy 3a5415c0a6 invaders bugfixes 2011-08-03 22:34:55 +02:00
Stefan `Sec` Zehl 996287e0ce Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 22:34:44 +02:00
Stefan `Sec` Zehl 8875fc8d8b Revert "save 4 bytes by making internal function static"
This reverts commit 81294835ec.
2011-08-03 22:33:14 +02:00
Stefan `Sec` Zehl a5f8a9b04f Revert "lcd/render.c: save 56 bytes"
This reverts commit ad0c993136.
2011-08-03 22:31:46 +02:00
Stefan `Sec` Zehl 35c73e6266 Revert "simpletime refactor away 28 bytes"
This reverts commit c4c67865e8.
2011-08-03 22:20:44 +02:00
Stefan `Sec` Zehl 5256464953 Revert "Remove unneeded/wrong braces"
This reverts commit 04e0577b55.
2011-08-03 22:20:20 +02:00
iggy 3f3d1a9d23 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 22:02:01 +02:00
Stefan `Sec` Zehl 03a1001344 uuid is 32bit 2011-08-03 22:01:48 +02:00
iggy 69a58edf48 invaders mesh highscore preparation 2011-08-03 22:01:30 +02:00
Stefan `Sec` Zehl 44802d4b28 More ram size for loadables 2011-08-03 21:59:47 +02:00
Stefan `Sec` Zehl 5a33df1fc9 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 21:59:04 +02:00
Stefan `Sec` Zehl ca86558f3a better make clean 2011-08-03 21:58:39 +02:00
Stefan `Sec` Zehl 2cb8870258 Invaders renamed for 8.3 2011-08-03 21:58:11 +02:00
Stefan `Sec` Zehl 0c7afe0eb1 Disable unencrypted receive by default. also add meshkey 2011-08-03 21:57:09 +02:00
Stefan `Sec` Zehl 7170789b3e Enhance serial code 2011-08-03 21:56:41 +02:00
iggy dd4666b3d7 scoring bug in invaders 2011-08-03 21:18:11 +02:00
Kilian Neuner 858429cd15 fix zoom: doubleclick = out, longclick = in; zoomlimits 2011-08-03 20:15:24 +02:00
Kilian Neuner ced37e9aab Merge branch 'master' of https://github.com/r0ket/r0ket 2011-08-03 19:28:43 +02:00
Stefan `Sec` Zehl c241ad30f5 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 19:25:15 +02:00
schneider 9f4b1cf7bc added some stdint includes 2011-08-03 19:24:05 +02:00
Stefan `Sec` Zehl ef4f5d1371 Remove stuff that is now loadable 2011-08-03 19:21:15 +02:00
Stefan `Sec` Zehl f546e7a1aa Fix mktable regexp 2011-08-03 19:13:20 +02:00
Stefan `Sec` Zehl 28df8b638e Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 19:09:57 +02:00
schneider 77d35aff7a added spaceinvaders l0dable 2011-08-03 19:09:03 +02:00
Stefan `Sec` Zehl 99ce5e362d save space by telling the compiler that lcdRefresh is actually lcdDisplay 2011-08-03 19:08:44 +02:00
Kilian Neuner e34df30333 fix zoom: long click = in, double click = out 2011-08-03 19:02:05 +02:00
schneider 2799821daf added receive card l0adable 2011-08-03 19:00:26 +02:00
Stefan `Sec` Zehl c856eb4f99 Remove stuff for old loadable requirements 2011-08-03 18:52:56 +02:00
Stefan `Sec` Zehl 04e0577b55 Remove unneeded/wrong braces 2011-08-03 18:51:58 +02:00
Øyvind Kolås 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
Øyvind Kolås 81294835ec save 4 bytes by making internal function static 2011-08-03 18:49:28 +02:00
Øyvind Kolås c4c67865e8 simpletime refactor away 28 bytes 2011-08-03 18:49:28 +02:00
Øyvind Kolås 5244d1cda2 removed 76 bytes from stringin 2011-08-03 18:49:28 +02:00
Stefan `Sec` Zehl b23caed454 add static to local-only stuff 2011-08-03 18:37:41 +02:00
Stefan `Sec` Zehl 18dc658956 inline these helper functions to save space 2011-08-03 18:28:24 +02:00
Stefan `Sec` Zehl 8ec395879b Fix off-by-one bug. [Found by 9r] 2011-08-03 18:23:56 +02:00
Stefan `Sec` Zehl c62c06c087 Make prototypes single-line so my parser understands them 2011-08-03 18:21:49 +02:00
Stefan `Sec` Zehl 3028583e28 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 18:20:25 +02:00
Stefan `Sec` Zehl 11ae0a5b9a Make Timeout of 0 work as intended (no timeout) 2011-08-03 18:19:07 +02:00
iggy 3bb82a2676 invaders cleanup, no more warnings 2011-08-03 18:01:16 +02:00
iggy 4f5ec4e8fc invaders scoring 2011-08-03 17:45:57 +02:00
schneider 6c20c8cad9 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 17:38:53 +02:00
schneider 6dcdaf17fe added sendcard l0dable 2011-08-03 17:38:30 +02:00
Stefan `Sec` Zehl 3542f8acd6 Ignore empty lines in EXPORTS 2011-08-03 17:11:50 +02:00
schneider ecc8a0e0fb Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 17:11:21 +02:00
Stefan `Sec` Zehl 9b2cee24d0 Allow parsing of /*-style comments 2011-08-03 17:10:52 +02:00
schneider c93ce80fbd Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 16:51:02 +02:00
Stefan `Sec` Zehl 3457388389 Guard against double-include 2011-08-03 16:50:25 +02:00
schneider 335e14e17f Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 16:47:00 +02:00
Stefan `Sec` Zehl 187fde3638 Add mesh debugging counter 2011-08-03 16:46:48 +02:00
Stefan `Sec` Zehl 540a76faf8 Support missing symbols 2011-08-03 16:44:46 +02:00
schneider 4a5aa5a592 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 16:36:13 +02:00
Stefan `Sec` Zehl ce87f3b8f5 New loadable style with big dispatcher table. 2011-08-03 16:34:09 +02:00
schneider d827cf26ae Merge branch 'master' of github.com:r0ket/r0ket 2011-08-03 16:32:36 +02:00
iggy 830ee24cb7 positioning of invaders 2011-08-03 15:02:51 +02:00
schneider 761c56f4f2 s.c 2011-08-03 11:34:18 +02:00
schneider 8f7664a938 vcard: moved more code into loadables 2011-08-03 10:54:22 +02:00
schneider 7539f4e6f7 moved code for vacrd from flash to loadables 2011-08-03 10:38:43 +02:00
schneider e5a4cdf427 added send/receive card loadables 2011-08-03 10:27:56 +02:00
schneider 01f7fde0d4 added vcard loadable draft 2011-08-03 10:21:31 +02:00
schneider 16bfed499d spaceinvaders: saved 18 bytes 2011-08-03 09:29:36 +02:00
schneider eccdc2b536 spaceinvaders: saved 8 bytes 2011-08-03 09:21:40 +02:00
schneider b07eb7c577 executor: made encryption work 2011-08-03 08:59:55 +02:00
kiu d8a1d0c78d fixed greather than/less than for mode change 2011-08-03 00:53:33 +02:00
Stefan `Sec` Zehl 0aadf3fba8 Do the init automatically now, also fix "=>" to ">=" :) 2011-08-03 00:44:12 +02:00
kiu 222f491205 fixed mode changes (greater than/lesser than), removed unused flameEnabled check 2011-08-03 00:35:02 +02:00
Stefan `Sec` Zehl 5a19b970bb Honor privacy in mesh 2011-08-03 00:25:09 +02:00
Stefan `Sec` Zehl 718f3fc381 Set correct channel for openbeacon 2011-08-03 00:24:31 +02:00
Stefan `Sec` Zehl 69907e7d16 Send OpenBeacon (if privacy allows) 2011-08-03 00:23:31 +02:00
Stefan `Sec` Zehl f176bed03f Truncate file on writing, or we keep garbage at the end... 2011-08-02 23:54:07 +02:00
Stefan `Sec` Zehl 080cffff23 Err. cut&paste mistake 2011-08-02 23:53:41 +02:00
Stefan `Sec` Zehl 9cf0b573c3 Make the config menu use repeat functionality. Also: more speed :) 2011-08-02 23:39:37 +02:00
Stefan `Sec` Zehl e25e591287 support repeat. Swap up&down. Also some cleanup 2011-08-02 23:34:47 +02:00
Stefan `Sec` Zehl 691fa7d09b Add getInputWaitRepeat, to support key repeat 2011-08-02 23:34:13 +02:00
Stefan `Sec` Zehl f57e0a9e90 frob fontselector 2011-08-02 21:23:10 +02:00
Stefan `Sec` Zehl d76bf573d0 Re-add msc mode 2011-08-02 21:21:58 +02:00
Stefan `Sec` Zehl cf219be0c1 fix a warning 2011-08-02 21:01:48 +02:00
Stefan `Sec` Zehl 32e05be404 Center nickname 2011-08-02 21:01:27 +02:00
Stefan `Sec` Zehl b6ef360f43 Check stackpointer 2011-08-02 20:53:43 +02:00
Stefan `Sec` Zehl 861994ef93 Remove mandel2, its a loadable now 2011-08-02 20:51:46 +02:00
Stefan `Sec` Zehl a267e2caf6 Support menu timeout 2011-08-02 20:49:55 +02:00
Stefan `Sec` Zehl f7fcaf0ab8 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-02 20:46:29 +02:00
iggy 4b74112148 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-02 18:20:43 +02:00
iggy 2baf1e4c57 invaders, mostly finished now 2011-08-02 18:20:16 +02:00
Stefan `Sec` Zehl c2b42a8d1f Move mandelbrot into loadables. 2011-08-02 14:16:06 +02:00
Stefan `Sec` Zehl 665a0e0c32 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-02 13:33:04 +02:00
Stefan `Sec` Zehl 3a4490db18 Some menu changes. Also: cleanup apps and make the rest build again 2011-08-02 13:31:57 +02:00
iggy c875d98456 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-02 13:10:15 +02:00
iggy d5dd653fbe invaders stuff 2011-08-02 13:09:58 +02:00
Stefan `Sec` Zehl 7eaa5f4e4b more utility/debugging/info stuff 2011-08-02 10:55:01 +02:00
Stefan `Sec` Zehl 3c3d1032c5 Correct default for contrast setting.
Add alivecheck(systick blink) setting
2011-08-02 10:54:05 +02:00
Stefan `Sec` Zehl 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
Stefan `Sec` Zehl 942440ec0c Whoops. Swapped day/night invert 2011-08-02 10:50:51 +02:00
Stefan `Sec` Zehl d357e6000f Clean up util.c 2011-08-02 02:45:25 +02:00
Stefan `Sec` Zehl 0824a2cd25 Some stuff we probably want in the final firmware. 2011-08-02 02:10:15 +02:00
Stefan `Sec` Zehl 2d3d2af051 Config variables for flame 2011-08-02 02:09:37 +02:00
Stefan `Sec` Zehl 5dacadbb3e Mesh now supports non-timestamp but increasing messages. 2011-08-02 01:40:44 +02:00
Stefan `Sec` Zehl a19b8ac64a Merge branch 'master' of github.com:r0ket/r0ket 2011-08-02 01:39:31 +02:00
iggy 2957ee4f21 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-02 01:13:20 +02:00
iggy bad31c466a spacinvaders stuff 2011-08-02 01:12:52 +02:00
Stefan `Sec` Zehl 623582bbb4 Saner code. 2011-08-02 00:03:37 +02:00
Stefan `Sec` Zehl 162fd9775c Whoops. Remove debugging info :) 2011-08-01 23:53:09 +02:00
Stefan `Sec` Zehl 60e31bbfaf Add ReInit to be used after msc mode 2011-08-01 23:51:41 +02:00
Stefan `Sec` Zehl 4ed86ed5bc Fix fileselect0r (no files, down-scroll) 2011-08-01 23:51:08 +02:00
Stefan `Sec` Zehl 42fd4f116c cleanup a bit 2011-08-01 23:50:58 +02:00
Stefan `Sec` Zehl 5a6be961a0 Fix the default background stuff properly. 2011-08-01 23:49:41 +02:00
kiu 21be4195eb added config options for menu 2011-08-01 23:34:13 +02:00
iggy b225322bce Merge branch 'master' of github.com:r0ket/r0ket 2011-08-01 21:45:11 +02:00
iggy cafdbed82f bunkers in spaceinvaders 2011-08-01 21:44:48 +02:00
Stefan `Sec` Zehl 99f3095b46 Fix invader font 2011-08-01 20:03:12 +02:00
iggy 4ccd0bf18d Merge branch 'master' of github.com:r0ket/r0ket 2011-08-01 18:30:18 +02:00
iggy f82cb8382a spaceinvaders improved 2011-08-01 18:29:50 +02:00
Stefan `Sec` Zehl 5b7a675e1f Whoops. Make systick called again in APP=tester 2011-08-01 16:09:04 +02:00
Stefan `Sec` Zehl bd047cbe5a Add simple lcdRefresh() speedtest 2011-08-01 14:32:22 +02:00
bernd 49c49e328f Disable too flashy backlight cycling in life 2011-08-01 06:15:44 +02:00
bernd 174e7ee9e5 The calls to nrf_off on lowpower-off require a -lfunk at the end 2011-08-01 06:10:22 +02:00
Rainer Mueller 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
Stefan `Sec` Zehl d4c48f66c2 Disable nrf on lowpower-off 2011-08-01 05:31:47 +02:00
Stefan `Sec` Zehl 26515e2717 I forgot this new .h file a few commits ago. 2011-08-01 05:23:14 +02:00
Stefan `Sec` Zehl cccb869423 Fix a few warnings 2011-08-01 05:22:24 +02:00
Stefan `Sec` Zehl 61c1293611 Add Timestamp support for filesystem. This took me 3h to debug :-/ 2011-08-01 05:11:56 +02:00
Stefan `Sec` Zehl 6bd703f006 fix new font setting for internal fonts 2011-08-01 05:11:04 +02:00
Stefan `Sec` Zehl 34869e2973 modernize menu.c 2011-08-01 05:10:37 +02:00
Stefan `Sec` Zehl f41d900e0d Adjust startup value 2011-08-01 05:06:20 +02:00
Stefan `Sec` Zehl d5e93a1fca Merge branch 'master' of github.com:r0ket/r0ket
Conflicts:
	firmware/basic/config.c
2011-08-01 05:05:47 +02:00
schneider 13df9eec9d select: wait for key release 2011-08-01 02:18:36 +02:00
schneider 2a632870fd added 32 level contrast 2011-08-01 02:18:03 +02:00
Stefan `Sec` Zehl f2c5d53cb9 Oops. We need to close the files, too. 2011-08-01 01:55:04 +02:00
Stefan `Sec` Zehl 29df9b9e1f Add missing config.h 2011-08-01 01:34:11 +02:00
Stefan `Sec` Zehl 6299286348 Two utility functions to read/write small files 2011-08-01 01:12:58 +02:00
Stefan `Sec` Zehl 5d0887be71 Move config stuff into own include. Iggy said its better :-) 2011-08-01 01:12:21 +02:00
Stefan `Sec` Zehl 621bca40b3 improve application Makfile 2011-08-01 01:08:05 +02:00
Stefan `Sec` Zehl 1ccda41467 Sign error. Whoops. 2011-07-31 22:46:24 +02:00
Stefan `Sec` Zehl aa821fca3f Fix a few things. 2011-07-31 22:13:06 +02:00
schneider c95eb0844f Merge branch 'master' of github.com:r0ket/r0ket 2011-07-31 20:35:36 +02:00
schneider b28920fec8 initial: no watchdog in isp mode 2011-07-31 20:34:56 +02:00
schneider e4869f6ec0 initial: wait for flashed.cfg 2011-07-31 20:32:37 +02:00
Stefan `Sec` Zehl e3d46f01bd Fix a few global config regressions, and add sample config menu 2011-07-31 18:20:55 +02:00
Stefan `Sec` Zehl 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
Stefan `Sec` Zehl 2c62859a60 more pretty-printing 2011-07-31 00:55:02 +02:00
Stefan `Sec` Zehl a20a260117 Show badge uptime 2011-07-31 00:54:41 +02:00
Stefan `Sec` Zehl 8bc5424607 Fix time and generation handling a bit 2011-07-31 00:53:53 +02:00
Stefan `Sec` Zehl 06ac802ee5 More abstracted num to string functions 2011-07-31 00:53:14 +02:00
iggy e911376fe6 Merge branch 'master' of github.com:r0ket/r0ket
Conflicts:
	firmware/basic/Makefile
2011-07-30 19:31:12 +02:00
iggy d8cbdc79fa string input + demo 2011-07-30 19:28:37 +02:00
Stefan `Sec` Zehl 8625d1b3ef Mesh++ Now we can display messages. 2011-07-30 19:06:12 +02:00
Stefan `Sec` Zehl 1a23641c8d Refactor mesh stuff 2011-07-30 16:10:30 +02:00
Stefan `Sec` Zehl 1077b5fd1e Fix filename to be the same in read && write 2011-07-30 15:30:35 +02:00
Stefan `Sec` Zehl e8f06b2388 Some time related functionality 2011-07-30 15:25:14 +02:00
Stefan `Sec` Zehl f79f8a93f5 Mesh in systick. Now retransmits the time correctly 2011-07-30 11:51:05 +02:00
Stefan `Sec` Zehl 4b95235843 More serial support 2011-07-30 11:43:08 +02:00
schneider 75c5ae71d9 streamlined bootstrap application 2011-07-30 11:17:35 +02:00
Stefan `Sec` Zehl 6c95119e38 do lcd_mirror command by default. (so schneider can test it) 2011-07-30 03:27:53 +02:00
Stefan `Sec` Zehl da6cc353da Better serial input/output 2011-07-30 03:27:29 +02:00
Stefan `Sec` Zehl d621d9b117 make TYPE=serial a proper air debugging tool 2011-07-29 22:30:36 +02:00
Stefan `Sec` Zehl 62a8270609 Time transmit now works 2011-07-29 19:49:24 +02:00
Stefan `Sec` Zehl 9cf36467e4 First minimesh code. 2011-07-29 19:40:24 +02:00
Stefan `Sec` Zehl 76ee150b3f Add GetTimer() 2011-07-29 19:06:23 +02:00
Stefan `Sec` Zehl 01e1077e25 Merge branch 'master' of github.com:r0ket/r0ket 2011-07-29 19:02:01 +02:00
Stefan `Sec` Zehl 3fc7fb22ac forgot a "void" here. 2011-07-29 19:01:41 +02:00
bernd 3f7ac1c777 Merge git://github.com/r0ket/r0ket 2011-07-29 04:38:12 +02:00
bernd 9d933f7d4c Use untracked Makefile.sitespecific to optionally override some build flags 2011-07-29 04:33:29 +02:00
bernd e0ae77294e Removed #error statement (that was left in after debugging architektur ifdef?) 2011-07-29 02:46:22 +02:00
Stefan `Sec` Zehl ad62356734 Semi-functional remo0te with 1st attemt at message-back 2011-07-28 01:32:45 +02:00
Stefan `Sec` Zehl 7993bc3f0d library dependency fix 2011-07-28 01:32:13 +02:00
Stefan `Sec` Zehl 03e95c9681 More funk test code (rem0te/game support) 2011-07-27 23:43:14 +02:00
Stefan `Sec` Zehl 5e1ac514ea Add simple itoa-style function 2011-07-27 23:41:09 +02:00
Stefan `Sec` Zehl 932d5502d2 Add #include <time.h> for time_t definition 2011-07-27 23:40:14 +02:00
Stefan `Sec` Zehl 28cc6e63ca OOps: Remove debugging-#error 2011-07-27 23:39:07 +02:00
Stefan `Sec` Zehl 625af67f3f New polling-based funk receive functions. 2011-07-27 23:38:52 +02:00
Stefan `Sec` Zehl 196ac680e9 First version of an serial openbeaconsniffer. Yay. 2011-07-27 19:03:25 +02:00
Stefan `Sec` Zehl 9e4f27ad12 More usbserial utility functions 2011-07-27 18:22:53 +02:00
Stefan `Sec` Zehl ce6b63046f Whoops. (Cygwin-)Symlinks and git don't mix 2011-07-27 17:33:55 +02:00
Stefan `Sec` Zehl 838f04505c Add small lcd documentation :) 2011-07-27 17:19:29 +02:00
Stefan `Sec` Zehl 63ff0de8b2 Actually try to use USB-serial code. "make APP=tester TYPE=serial" 2011-07-27 15:41:18 +02:00
Stefan `Sec` Zehl 250ea3213f Make backlight and lcd-state config vars actually work 2011-07-27 01:15:52 +02:00
Stefan `Sec` Zehl 477dfcf98a APP=initial is compiled without default.c 2011-07-27 01:02:26 +02:00
Stefan `Sec` Zehl 5a55da7f76 Fix some menu regressions because of getInputWait() changes 2011-07-27 00:58:48 +02:00
Stefan `Sec` Zehl 535b635b0e First draft of the new global config system
Sorry if your display is mirrored again %)
2011-07-27 00:57:36 +02:00
Stefan `Sec` Zehl 833a6387fb always remove libapp.a before rebuilding it. 2011-07-27 00:28:08 +02:00
Stefan `Sec` Zehl 2da811bf61 Make our systick interval a #define 2011-07-27 00:25:24 +02:00
Stefan `Sec` Zehl e124c142f2 Fix more instances of wrong define used 2011-07-27 00:18:23 +02:00
Stefan `Sec` Zehl 0a268ebfc3 Fix #define to somethin which works :) 2011-07-27 00:11:30 +02:00
roy rocket 0477dc01e2 Merge branch 'master' of ssh://github.com/r0ket/r0ket 2011-07-26 23:41:24 +02:00
Stefan `Sec` Zehl 3e30e03ba9 Actually enable formatting the DF 2011-07-26 02:09:52 +02:00
Stefan `Sec` Zehl 3d701fda1b If no filesystem, fail configstuff quickly 2011-07-26 02:06:10 +02:00
Stefan `Sec` Zehl cb5ebc57d8 add APP=initial, template for initial firmware to be flashed. 2011-07-26 01:55:33 +02:00
Stefan `Sec` Zehl e182a2c179 APP=tester now supports systick-functions, too 2011-07-26 01:18:31 +02:00
Stefan `Sec` Zehl 292d1ba36f Rename timer.c into more correct queue.c 2011-07-26 01:09:31 +02:00
Stefan `Sec` Zehl 7eba1c5240 Fix delayms_power to do proper timecounting 2011-07-26 01:04:34 +02:00
Stefan `Sec` Zehl bb178629a2 oops 2011-07-25 23:41:26 +02:00
Stefan `Sec` Zehl 0b930aef48 Use new mutex :) 2011-07-25 23:26:18 +02:00
schneider d8563eb64d Merge branch 'master' of github.com:r0ket/r0ket 2011-07-25 23:25:44 +02:00
schneider 0fbdd071ab added adc mutex 2011-07-25 23:25:00 +02:00
kiu 68b5afbe47 handle i2c through queue, probe i2c for flame 2011-07-25 20:33:20 +02:00
bernd ea8754c1dd Implemented time counter in simulat0r 2011-07-25 08:50:33 +02:00
bernd 242bb480a0 Code cleanup, got rid of warnings 2011-07-25 08:48:19 +02:00
schneider 78f3f25937 vcard: funny errors with vcard... 2011-07-25 02:11:41 +02:00
schneider 8daf823d98 fs: improved file selector 2011-07-25 00:32:36 +02:00
bernd 34b0ba6e58 Renamed C++ keyword "new" to "qnew" in function prototypes 2011-07-24 22:25:35 +02:00
bernd 31efd30e85 Merge branch 'master' of http://www.itfuzzi.de/git/r0ket 2011-07-24 22:19:46 +02:00
roy rocket f668dff151 ifdefed ASMs 2011-07-24 22:14:06 +02:00
schneider 4c8839b2ba vcard: read keys from filesystem 2011-07-24 21:53:11 +02:00
Stefan `Sec` Zehl f79d3b49f4 More powersaving/queue-working 2011-07-24 16:29:14 +02:00
Stefan `Sec` Zehl c896b4645e rename random() to getRandom(), just to please you. 2011-07-24 15:58:47 +02:00
Stefan `Sec` Zehl 80f914e58f Make GetInputWait() work our new queue. Make the menu code use it by default. 2011-07-24 15:54:18 +02:00
Stefan `Sec` Zehl 7a019d06e7 Add simple queue to move jobs from systick to main/idle. 2011-07-24 15:44:35 +02:00
Stefan `Sec` Zehl 235cadaa89 remove unused variable 2011-07-24 15:38:28 +02:00
Stefan `Sec` Zehl 9b95dab688 remove use of removed global variable 2011-07-24 15:37:03 +02:00
Stefan `Sec` Zehl 860f226e45 Whoops. Forgot "mktester" shell script for APP=tester support 2011-07-24 14:12:30 +02:00
Stefan `Sec` Zehl ea3b4f3337 another "select()" function renamed. This time its lcd_select() 2011-07-24 14:08:52 +02:00
Stefan `Sec` Zehl 6a76e01a67 bring baisc.h in line with new uuid.h form schneider 2011-07-24 10:28:17 +02:00
Stefan `Sec` Zehl 53ff9f468e Merge branch 'master' of github.com:r0ket/r0ket 2011-07-24 10:26:39 +02:00
Stefan `Sec` Zehl abfe5342c9 Rename inconveniently-named select() to more correct mmc_select() 2011-07-24 10:26:04 +02:00
bernd 9a77b01cef Use xor drawing to animate game of life over arbitrary display content 2011-07-24 08:59:56 +02:00
kiu cd1d43883d Merge branch 'master' of github.com:r0ket/r0ket 2011-07-24 03:32:20 +02:00
kiu a7c737f62c added secs night detection 2011-07-24 03:31:47 +02:00
Stefan `Sec` Zehl 3204b537b5 Add APP=tester with menu-modules in tester/*c 2011-07-24 02:57:35 +02:00
Stefan `Sec` Zehl f13a772cca Merge branch 'master' of github.com:r0ket/r0ket 2011-07-24 01:52:19 +02:00
Stefan `Sec` Zehl da8d8003aa Read ambient light and toggle display background accordingly. Also: isNight() 2011-07-24 01:51:28 +02:00
schneider cdaa8f78ca added random number generator based on adc and xxtea 2011-07-23 23:47:42 +02:00
schneider b9a26a5698 openbeacon: corrected header 2011-07-23 22:29:57 +02:00
kiu c01a8e7e82 Merge branch 'master' of github.com:r0ket/r0ket 2011-07-23 22:12:06 +02:00
kiu a6b9622764 prepared night support 2011-07-23 22:11:33 +02:00
schneider f77bb1f04a basic: don't crash on bus interrupt 2011-07-23 21:47:29 +02:00
schneider 404b789c04 openbeacon: use chip id 2011-07-23 19:17:14 +02:00
schneider 76a84b354f vcard: small clean up 2011-07-23 17:58:56 +02:00
schneider ec956a3263 working encrypted filetransfer. 2011-07-23 15:35:00 +02:00
Stefan `Sec` Zehl 30d3089cc8 Allow fonts from dataflash. use "setExtFont(filename)". for flash fonts use "setIntFont(&font)". 2011-07-23 14:39:50 +02:00
kiu d01fd1ef25 glowing flame 2011-07-23 06:04:04 +02:00
kiu dae166e99e Merge branch 'master' of github.com:r0ket/r0ket 2011-07-21 23:32:50 +02:00
kiu 3cc75be31d some i2c tests 2011-07-21 23:32:28 +02:00
kiu cb5288e220 enable fast mode plus for i2c 2011-07-21 23:03:11 +02:00
Stefan `Sec` Zehl 89e430de97 Add more code to test scrolling 2011-07-21 22:32:48 +02:00
Stefan `Sec` Zehl bb3dc0044c Add scrolling to lcdPrint() & co. 2011-07-21 22:31:26 +02:00
Stefan `Sec` Zehl c69431c085 Whoops. lcdShiftV8 had up/down swapped :) 2011-07-21 22:27:08 +02:00
Stefan `Sec` Zehl 80ea686dc8 Fix "wrap==false" scrolling case. 2011-07-21 22:21:41 +02:00
Stefan `Sec` Zehl 63572af567 Refactor getInput() using getInputRaw() 2011-07-21 20:37:04 +02:00
Stefan `Sec` Zehl 148b2d9aee Also allow diagonal movement here. 2011-07-21 20:08:00 +02:00
Stefan `Sec` Zehl 742c422439 Also enable diagonal scrolling. 2011-07-21 20:02:44 +02:00
Stefan `Sec` Zehl f81e2b8283 fix missing include. Also make lcdScroll nicer to read. 2011-07-21 20:01:49 +02:00
Sebastian 'iggy' Steuer a5b227b60e Merge branch 'master' of github.com:r0ket/r0ket 2011-07-21 17:22:23 +02:00
Sebastian 'iggy' Steuer 62bc287d0f mandelbrot displaybuffer scrolling, zoom out 2011-07-21 17:04:22 +02:00
bernd 71d7bb28b1 Use cbitset for game of life to reduce data size - making it run on r0ket 2011-07-20 08:08:09 +02:00
bernd eabf38452f Use cbitset for game of life to reduce data size - making it run on r0ket 2011-07-20 08:03:02 +02:00
bernd ff6a7882a1 Merge git://github.com/r0ket/r0ket 2011-07-20 06:02:18 +02:00
kiu f5c5ccea3d removed unused init 2011-07-20 00:03:15 +02:00
kiu ed7119b45d initial flame test 2011-07-20 00:00:37 +02:00
bernd f917464315 Code cleanup: removed remaining spaceinvader definitions 2011-07-19 12:35:08 +02:00
bernd 54dfa15718 Merge branch 'master' of http://www.itfuzzi.de/git/r0ket 2011-07-19 12:29:22 +02:00
bernd cef9ad9540 Added life application 2011-07-19 12:28:21 +02:00
bernd 95c92d764c Merge git://github.com/r0ket/r0ket 2011-07-19 10:47:52 +02:00
Stefan `Sec` Zehl 18dc47fa2b Fix dependecies and building for APP=loadable 2011-07-19 10:14:54 +02:00
Stefan `Sec` Zehl 6a8da54274 Add APP=loadable, simple loadable module wrapper to run them as app.
Build with "make APP=loadable LAPP=spaceinvaders"
2011-07-19 10:01:00 +02:00
Stefan `Sec` Zehl c5e8b92c4a Rename key to openbeaconkey to reduce global namespace pollution 2011-07-19 09:59:16 +02:00
bernd 3edfff8d59 Wrapped ARM specific code with #ifdef ARM because of simulat0r 2011-07-19 08:30:57 +02:00
Sebastian 'iggy' Steuer 4bef39e4f3 Merge branch 'master' of github.com:r0ket/r0ket 2011-07-19 02:49:43 +02:00
Sebastian 'iggy' Steuer eb5dd5cc9c Merge branch 'master' of github.com:r0ket/r0ket 2011-07-19 02:43:56 +02:00
Sebastian 'iggy' Steuer c65fe4c523 lcdBuffer scrolling 2011-07-19 02:43:15 +02:00
schneider b49a49f31c filesystem: add option to decode loadables 2011-07-19 01:21:05 +02:00
schneider 43eddd123b filesystem: check signature of loadables with cbc-mc 2011-07-19 01:12:53 +02:00
schneider 27412ef03d basic: added cbc-mac with xxtea for messages with n*4 words 2011-07-19 00:51:07 +02:00
schneider 643e8365aa openbeacon: increment seq counter on boot 2011-07-19 00:19:50 +02:00
Stefan `Sec` Zehl f4dee3550c Remove argument from lcdDisplay() and ISPandReset() 2011-07-18 22:09:31 +02:00
Stefan `Sec` Zehl c39052259d Use 24c3 encryption key 2011-07-18 21:42:59 +02:00
Stefan `Sec` Zehl 7b88a9f7a9 implement ntoh with one assembler byte 2011-07-18 21:42:17 +02:00
schneider 6b59593b2a voltage: enable voltage reading again 2011-07-18 21:37:15 +02:00
Stefan `Sec` Zehl 49c55eae0e Fix warnings 2011-07-18 20:27:18 +02:00
Stefan `Sec` Zehl 3281d591dc APP=font actually needs all the fonts it can get 2011-07-18 20:00:31 +02:00
Stefan `Sec` Zehl dae367b568 Add dependency handling for lcd/ subdir 2011-07-18 18:53:17 +02:00
Stefan `Sec` Zehl ff5bbad940 Add smallfonts back to lcd.h. Many APPs need it. This should probably change 2011-07-18 18:32:30 +02:00
Stefan `Sec` Zehl 2788612f89 Fix includes on main.c 2011-07-18 18:25:14 +02:00
Stefan `Sec` Zehl f90c995053 Fix "use of unitialized variable" in xxtea.c and byteorder.c 2011-07-18 18:24:34 +02:00
Stefan `Sec` Zehl 628b88ce73 Merge branch 'master' of github.com:r0ket/r0ket 2011-07-18 18:20:02 +02:00
Stefan `Sec` Zehl fcf3ec22c5 Fix includes to remove unneccessary dependencies on <allfonts.h> 2011-07-18 18:19:22 +02:00
schneider 00d4edb8aa Merge branch 'master' of github.com:r0ket/r0ket 2011-07-18 10:32:28 +02:00
schneider a684899016 openbeacon: use 24c3 key 2011-07-18 10:31:58 +02:00
schneider 0343e5f895 added stupid network byte order shuffel to xxtea 2011-07-18 10:31:20 +02:00
Stefan `Sec` Zehl 4b6bf26481 Fix make depend 2011-07-18 10:12:52 +02:00
schneider 2d4e1163d0 Merge branch 'master' of github.com:r0ket/r0ket 2011-07-18 01:17:44 +02:00
schneider 0eb87072ff funk: use openbeacon code 2011-07-18 01:16:44 +02:00
Stefan `Sec` Zehl 4d5a355e96 Fix warnings. Remove unnecesssary dup of get_rc 2011-07-17 22:20:14 +02:00
Stefan `Sec` Zehl 71bd7e97c6 font_direction is no more 2011-07-17 22:09:13 +02:00
Stefan `Sec` Zehl ea90f92ebb add proper "const" qualifiers 2011-07-17 22:08:27 +02:00
Stefan `Sec` Zehl 54e29bc10b Merge branch 'master' of github.com:r0ket/r0ket 2011-07-17 21:58:44 +02:00
Stefan `Sec` Zehl c306f82883 Stupid error. Fixed. %-) 2011-07-17 21:58:02 +02:00
schneider 84d09d8fb9 default: we only have one file open 2011-07-17 21:02:37 +02:00
schneider cf9a19de17 openbeacon: set mac 2011-07-17 21:01:09 +02:00
schneider c9ca6d1be6 removed broken xxtea byte level routines 2011-07-17 20:34:59 +02:00
schneider bfbc6c2732 openbeacon: save seq to file 2011-07-17 20:32:17 +02:00
schneider 812a8f8b13 Merge branch 'master' of github.com:r0ket/r0ket 2011-07-17 20:01:48 +02:00
schneider e2039ec2f4 added byteorder utils 2011-07-17 20:01:29 +02:00
Stefan `Sec` Zehl 093370587f add nrf_set_strength() - openbeacon needs it :-) 2011-07-17 20:01:07 +02:00
Stefan `Sec` Zehl 462d9f3a32 Merge branch 'master' of github.com:r0ket/r0ket 2011-07-17 18:28:44 +02:00
Stefan `Sec` Zehl eaa37b4a4a font_direction is no more 2011-07-17 18:13:52 +02:00
schneider 30900a87ba openbeacon: fixes 2011-07-17 17:42:19 +02:00