Commit Graph

432 Commits

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