Commit Graph

607 Commits

Author SHA1 Message Date
iggy 1ec147a663 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 01:44:52 +02:00
iggy cc366d2f8c 1boot improvements 2011-08-05 01:44:34 +02:00
Stefan `Sec` Zehl b48bb42f36 Big warning cleanup in firmware. 2011-08-05 01:33:48 +02:00
iggy 050fe57a50 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 01:25:59 +02:00
iggy 793304b568 more verbose input(), MAXNICK reduced to 17 2011-08-05 01:25:28 +02:00
Stefan `Sec` Zehl e68960f0c7 Add charge led function 2011-08-05 01:22:34 +02:00
Stefan `Sec` Zehl 608885ea06 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 01:18:40 +02:00
Stefan `Sec` Zehl 9a1ff11842 option to enable devel mode 2011-08-05 00:53:38 +02:00
Stefan `Sec` Zehl b6f330b032 kiu wanted it lowercase 2011-08-05 00:52:23 +02:00
iggy 24965deaed Merge branch 'master' of github.com:r0ket/r0ket 2011-08-05 00:49:39 +02:00
iggy 5a1ed63623 bootscreen, bugfix 2011-08-05 00:49:00 +02:00
Stefan `Sec` Zehl ccb45a6fc2 nick-loadable to display nick.lcd by default 2011-08-05 00:34:55 +02:00
Stefan `Sec` Zehl 09eb3b0ea1 Make exiting easier 2011-08-05 00:26:39 +02:00
Stefan `Sec` Zehl c2d7656a1e Make getInputWaitTimeout use microseconds 2011-08-05 00:24:50 +02:00
Stefan `Sec` Zehl 81815b1eef Try to be more iggy-friendly 2011-08-05 00:21:20 +02:00
Stefan `Sec` Zehl f6ec40de2f Add image helper functions 2011-08-04 23:50:44 +02:00
Stefan `Sec` Zehl 7281329206 Fix pointer bug. Shouldn't 've worked before 2011-08-04 21:58:33 +02:00
Stefan `Sec` Zehl 0dc02b6b02 Merge branch 'master' of github.com:r0ket/r0ket 2011-08-04 21:50:00 +02:00
Stefan `Sec` Zehl a875cd62ff add pwgen from mazzoo 2011-08-04 21:49:33 +02:00
iggy 8537ef4b3d 1boot bigmenu 2011-08-04 21:46:28 +02:00
Stefan `Sec` Zehl 639fe12fb6 Double-space menu option for iggy 2011-08-04 21:41:51 +02:00
iggy 50b89a076d Merge branch 'master' of github.com:r0ket/r0ket 2011-08-04 21:39:28 +02:00
iggy 8f002a719b 1boot improved 2011-08-04 21:38:48 +02:00
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