Commit Graph

534 Commits

Author SHA1 Message Date
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