Commit graph

931 commits

Author SHA1 Message Date
Stefan `Sec` Zehl
b53f11bf7e revert part of eee6ae55 (mistakenly committed) 2012-01-26 23:49:37 +01:00
Stefan `Sec` Zehl
376db6a607 dbgmesg: show stackpointer 2012-01-26 23:48:23 +01:00
Stefan `Sec` Zehl
53bc25c0fa dbgmesh: Don't exit while no key is pressed. 2012-01-26 23:40:39 +01:00
Stefan `Sec` Zehl
243b9a847b Change mesh behavior: only accept time once per generation. This should fix the drifting. 2012-01-26 23:37:18 +01:00
schneider
a25e3e00fd openbeacon: removed junk code 2012-01-26 23:09:03 +01:00
Stefan `Sec` Zehl
44cd75423c Merge branch 'master' into meshdebug
Conflicts:
	firmware/funk/mesh.c
	firmware/main.c
2012-01-26 20:27:36 +01:00
Stefan `Sec` Zehl
f6dc1f793d Change timelimits for mesh into something more sensible for real users :) 2012-01-26 20:08:06 +01:00
Stefan `Sec` Zehl
ad9affa382 Merge branch 'master' of github.com:r0ket/r0ket 2012-01-25 20:51:47 +01:00
Stefan `Sec` Zehl
9ea8561363 increase release no 2012-01-25 20:23:04 +01:00
Stefan `Sec` Zehl
f5df1d1ccc move mesh break date to the future, again 2012-01-25 20:22:04 +01:00
Stefan `Sec` Zehl
f8e1227cff move date to right, so i can read it better 2012-01-25 20:21:29 +01:00
Stefan `Sec` Zehl
0142939508 Merge remote branch 'origin/master' 2012-01-25 20:15:48 +01:00
Stefan `Sec` Zehl
3f75d3d025 Cleanup: C files don't need an executable bit. 2012-01-24 01:52:50 +01:00
Stefan `Sec` Zehl
f823ef2504 Add "fake memcpy" lib so broken gcc can compile this 2012-01-24 00:18:36 +01:00
schneider
f17893c8b1 Merge branch 'master' of github.com:r0ket/r0ket 2012-01-19 23:01:31 +01:00
schneider
d9b7a2c6bd added some filtering for the voltage reading 2012-01-19 23:01:00 +01:00
schneider
d82dde9ecf added authors to w0rpcore 2012-01-19 01:32:05 +01:00
schneider
4b0f5e6a6d Merge branch 'warpdrive-nick' of https://github.com/wertarbyte/r0ket into wertarbyte-warpdrivenick 2012-01-19 01:29:34 +01:00
schneider
abca3eeb7e Merge branch 'master' of https://github.com/thammi/r0ket into thammi-tron 2012-01-19 01:17:15 +01:00
schneider
eee6ae55f0 openbeacon: set rf strength to 3 after sending 2012-01-18 20:59:12 +01:00
schneider
29c7dfdf64 improved accuracy of battery voltage measurement
Slowing down the ADC 10x while reading the voltage gives better
results due to the very high impedance of the voltage devider.
Readings are now about 100mV higher than before.
2012-01-16 15:50:48 +01:00
Stefan `Sec` Zehl
71c9a6dc64 Make basic/ecc also use our global include 2012-01-15 14:04:57 +01:00
Stefan `Sec` Zehl
f38fb4c148 Remove duplicate sydefs.h confusion. 2012-01-15 14:04:26 +01:00
Stefan `Sec` Zehl
18277c5511 Extend valid time area again 2012-01-15 13:47:07 +01:00
Stefan `Sec` Zehl
860e4addbf remove space in dbgmesh again 2012-01-05 17:53:39 +01:00
schneider
020d141995 added jeopardy game announcing l0dable 2012-01-05 16:31:58 +01:00
Stefan `Sec` Zehl
56dd1d942c Re-allow invaders packet for debugging. Also: turn on LED on meshpanic. 2012-01-05 12:49:21 +01:00
Stefan `Sec` Zehl
db44512fe3 More panic messages to debug. 2012-01-05 04:13:57 +01:00
Stefan `Sec` Zehl
cbb698e11c Merge branch 'master' into meshdebug 2012-01-04 19:23:13 +01:00
Stefan `Sec` Zehl
701d17e5a1 I'm not sure I wan to talk about this, but this might've been the problem. 2012-01-04 19:22:02 +01:00
Stefan `Sec` Zehl
1c3db0288b More mesh debugging 2012-01-04 16:31:46 +01:00
Stefan `Sec` Zehl
da38c7a0c4 Merge branch 'master' into meshdebug 2012-01-03 22:34:05 +01:00
Stefan `Sec` Zehl
1a61837fa8 Increase release no. to identify this version 2012-01-03 22:27:10 +01:00
Stefan `Sec` Zehl
ccaa6cd00e Restore mesh to old condition on master branch 2012-01-03 22:26:37 +01:00
Stefan `Sec` Zehl
a76813ffe3 dbgmesh l0dable now has release no. 2012-01-03 22:23:46 +01:00
Stefan `Sec` Zehl
97268f237d Remove unused duplicate line 2012-01-03 22:23:24 +01:00
Stefan `Sec` Zehl
845883fa13 More debugging stuff 2012-01-03 22:23:01 +01:00
Stefan `Sec` Zehl
6316af756b Move time to the right, because the displays still have a sticker in the top left %-) 2012-01-03 13:57:39 +01:00
Stefan `Sec` Zehl
5e9e35910d erm. getting the precedence right 2012-01-03 05:45:36 +01:00
Stefan `Sec` Zehl
e4d2ba7fa0 Fix issue #21 on github. (Incorrect authorship) 2012-01-03 03:31:58 +01:00
Stefan `Sec` Zehl
77b0a2fe1a fix typo 2012-01-03 03:18:13 +01:00
Stefan `Sec` Zehl
a52c028e66 Add debugmesh l0dable. (Can be used as l0nick :-) 2012-01-03 02:54:12 +01:00
Stefan `Sec` Zehl
8d0de435dc Only panic once 2012-01-03 02:48:39 +01:00
Stefan `Sec` Zehl
b64b48d777 Enhance panic message by packet no. 2012-01-03 02:45:48 +01:00
Stefan `Sec` Zehl
14c31ed175 Erm. Do not panic instantly after power on :-) 2012-01-03 02:16:24 +01:00
Stefan `Sec` Zehl
dda913d107 More mesh_panic stuff, trying to debug the mesh problems for real now. 2012-01-03 01:09:20 +01:00
Steve Dierker
b7726b592a * added randomisation to package killing in meshGetMessage
(cherry picked from commit dd67ddd708a8a5eada1a8b6cbd5afe51c6f4a134)

Signed-off-by: Stefan `Sec` Zehl <sec@42.org>
2012-01-03 00:22:42 +01:00
Stefan `Sec` Zehl
3e22f2b652 Some documentation for the Makefile system here 2012-01-02 23:57:06 +01:00
Stefan `Sec` Zehl
b8687bbf1c Make "make flash" honor the APP= firmware name 2012-01-02 23:56:41 +01:00
Stefan `Sec` Zehl
36fa18875f Add USBSERIAL=YES to avoid the need for editing projectconfig.h
also make "make APP=<foo>" build <foo>.bin so you don't overwrite your
firmware.bin :)
2012-01-02 23:54:46 +01:00
Frank Zschockelt
f242c667ab unions need to be packed
(cherry picked from commit b28d2d355d48efa913aba48be31d7907ea8af45f)

Signed-off-by: Stefan `Sec` Zehl <sec@42.org>
2012-01-02 21:26:45 +01:00
roy rocket
0dbfe1fcd2 added mp0ng 2011-12-30 14:50:46 +01:00
roy rocket
2782a05ca9 New Fahrplan binary fixes 24bit pointer bug 2011-12-30 01:10:26 +01:00
Stefan `Sec` Zehl
89b5bc500c Merge branch 'master' of github.com:r0ket/r0ket 2011-12-28 15:36:13 +01:00
Stefan `Sec` Zehl
b9ee9293aa forgot to increment version number. 2011-12-28 12:49:23 +01:00
roy rocket
007765d9be Fahrplan 1.1 2011-12-28 12:31:04 +01:00
Stefan `Sec` Zehl
85b2a3c1c2 Change MAC for fixed mesh 2011-12-28 01:44:30 +01:00
Stefan `Sec` Zehl
e9194825d9 I shouldn't tell. But apparently I'm stupid. 2011-12-28 01:06:22 +01:00
schneider
cafb7d5cf2 bumped revision 2011-12-27 18:48:22 +01:00
schneider
d88250fc5a Merge branch 'master' of github.com:r0ket/r0ket 2011-12-27 17:34:36 +01:00
schneider
57d7f7dd51 player: set signal strength to max 2011-12-27 13:02:45 +01:00
Stefan `Sec` Zehl
642a71303d New loadable to show release 2011-12-27 02:05:35 +01:00
Stefan `Sec` Zehl
b0b30b86a5 Fix mesh. Actually check CRCs again. Increment release no. 2011-12-27 01:53:48 +01:00
roy rocket
e94680838d Fahrplan 0.92. Bug in l0dable fixed, now more than 128 lines desc possible... 2011-12-26 10:17:30 +01:00
Stefan `Sec` Zehl
8f93286de9 forgot EXPORTS in last commit (and a newline) 2011-12-25 20:48:38 +01:00
Stefan `Sec` Zehl
52085b91b5 add rudimentary release version support 2011-12-25 20:15:42 +01:00
Stefan `Sec` Zehl
53242bb263 Merge branch 'master' of github.com:r0ket/r0ket 2011-12-25 20:14:09 +01:00
roy rocket
6cb9845b63 Reduced delay in Fahrplan, V0.003 2011-12-25 20:12:04 +01:00
roy rocket
f7e016e846 Neue Fahrplanordnung 2011-12-25 20:04:52 +01:00
Stefan `Sec` Zehl
6dddb7639e Add propagation test packet 2011-12-25 20:02:41 +01:00
roy rocket
806c2eb222 Merge branch 'master' of ssh://github.com/r0ket/r0ket 2011-12-25 15:57:12 +01:00
roy rocket
01e33ff31f Fahrplan 0.91 2011-12-25 15:56:38 +01:00
schneider
e2f560642f Merge branch 'master' of github.com:r0ket/r0ket 2011-12-25 14:14:01 +01:00
schneider
6747f09c99 fxed flame code 2011-12-25 14:12:30 +01:00
roy rocket
4acf7d0e6e Oops. Versionsnummer vergessen. 2011-12-25 00:28:35 +01:00
roy rocket
4c7ed0c200 New Fahrplan l0dable and scd files 2011-12-25 00:27:44 +01:00
schneider
4af4cfdf38 game: added fallback to channel 81 2011-12-23 21:08:45 +01:00
schneider
9b4eaa0606 player: moved to channel 87 by default 2011-12-23 20:50:44 +01:00
roy rocket
de2e722661 Merge branch 'master' of ssh://github.com/r0ket/r0ket 2011-12-23 14:30:27 +01:00
roy rocket
d5044e71b3 Fixes in Nickscr0ller for new proportional fonts 2011-12-23 14:29:06 +01:00
schneider
f800530aa9 moved ISP and MSC before fs init 2011-12-23 13:22:13 +01:00
roy rocket
380b22e57f Fahrplan l0dable added 2011-12-23 11:45:51 +01:00
Stefan `Sec` Zehl
c15123eb7b Support for extra (non-executable) files 2011-12-23 11:05:13 +01:00
Stefan `Sec` Zehl
0d34d10f3a Merge branch 'master' of github.com:r0ket/r0ket 2011-12-23 11:02:37 +01:00
bsx
8002095eb4 Merge branch 'master' of github.com:r0ket/r0ket 2011-12-23 09:41:48 +01:00
Stefan `Sec` Zehl
4be69a1eab Restrict default mesh messages to discourage spamming. Allow generation wrapping. Remove some more schnitzel code. 2011-12-23 02:44:17 +01:00
Stefan `Sec` Zehl
d69199e563 Fix all warnings (except table.c and ff.c). Turn off "unused function" warnings 2011-12-23 01:07:48 +01:00
Stefan `Sec` Zehl
23696109cc Disable crypto in serial for now 2011-12-23 00:37:46 +01:00
schneider
3904870f32 usbcdc: increased ringbuffer size 2011-12-23 00:33:09 +01:00
schneider
68148e38c3 player: only send acks if not in mass game mode 2011-12-22 22:25:41 +01:00
schneider
de4f010c2a player: fixed length of ack packets 2011-12-22 21:32:11 +01:00
schneider
41d96707c0 player: show game name when playing 2011-12-22 20:47:38 +01:00
schneider
f92234da78 made initanim internal 2011-12-22 20:47:21 +01:00
schneider
ee4c420b41 added initial animation before config 2011-12-22 20:15:59 +01:00
schneider
6c2c5127c6 reactivated graphic lib 2011-12-22 20:11:03 +01:00
Stefan `Sec` Zehl
d06b050f82 Lock down mesh propagation: only propagate fahrplan and time.
Also fix time limit for 28c3 duration
2011-12-22 19:59:56 +01:00
Stefan `Sec` Zehl
fb010d0250 Change room names. Remove schnitzeljagd protocode 2011-12-22 19:45:52 +01:00
schneider
acd07331a4 player: memset packets to zero 2011-12-22 17:12:51 +01:00
schneider
d870849e4c player: use different buffer for acks 2011-12-22 16:13:33 +01:00
schneider
fa1d207bfe format: erase more sectors to be on the safe side 2011-12-22 15:17:00 +01:00