deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
12433 commits 6 branches 13 tags 80 MiB
Commit graph

100 commits

Author SHA1 Message Date
Harald Pichler e6dbb8c3f2 Merge branch 'master' into osd 
Conflicts:
	examples/osd/triggerbaord/sketch.pde
 2016-10-26 17:03:37 +02:00
Harald Pichler e410b2ddd2 add WCHaracter 2016-10-07 15:29:03 +02:00
Harald Pichler dfea93b2ff add spi and eeprom arduino libs 2016-10-02 18:53:44 +02:00
Harald Pichler fd12dcccf0 bugfix minimal push button time 2016-09-16 14:31:38 +02:00
Harald Pichler 91fcc28b12 Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd 
Conflicts:
	cpu/avr/dev/button-sensor.c
 2016-08-16 10:38:46 +02:00
Harald Pichler cf40f59843 add pin status 2016-08-15 20:22:49 +02:00
Harald Pichler 265d4e8723 shorter button deflipping time 2016-08-15 18:34:37 +02:00
Harald Pichler 6e67d1415c shorter button flipping test 2016-08-12 07:46:30 +02:00
Harald Pichler 3c8e91d74e cleanup confilicrts 2016-06-28 16:37:16 +02:00
Ralf Schlatterbeck 04bbba6c12 Multi-platform support, osd-merkur-{128,256} 
Rename guhRF platform to osd-merkur-256, previous osd-merkur platform is
now osd-merkur-128. Also check that everything is consistent.
Add both platforms to the regression tests.
Move redundant files in platform dev directory of both platforms to
cpu/avr/dev. Note that this probably needs some rework. Already
discovered some inconsistency in io definitions of both devices in the
avr/io.h includes. Added a workaround in the obvious cases.
The platform makefiles now set correct parameters for bootloader and for
reading mac-address from flash memory.
Factor the flash programming into cpu/avr and platform/osd-merkur* and
rework *all* osd example makefiles to use the new settings. Also update
all the flash.sh and run.sh to use the new settings.
The suli ledstrip modules (and osd example) have also been removed.
 2016-04-22 17:59:40 +02:00
Boernsman 79df347afa added guhRF; added atmega256rfr2 support 2016-04-21 08:41:48 +02:00
Robert Olsson d3980668ee Adding support for AtMega128RFR2 and AtMega256RFR2 2016-02-22 20:14:06 +01:00
Harald Pichler 428131e8a8 use dynamic sleep for loop 2016-01-06 21:57:29 +01:00
Simon Duquennoy ebc8d9fb1c Merge pull request #1344 from tsparber/fix-doxygen 
doxygen: Fixed all warnings
 2015-11-30 22:07:15 +01:00
Tommy Sparber 938a425949 Cleanup trailing spaces and convert tabs to spaces 
This commit removes trailing spaces and converts
tabs to spaces in all files affected by fix-doxygen PR.
 2015-11-18 11:09:43 +11:00
Tommy Sparber 938d17576b doxygen: Fix many warnings 
This commit fixes nearly all of the reported doxygen warnings.

I tried to not clutter the log with removed trailing spaces.
Removed whitespace and converted tab/spaces for all files affected by this commit
are in a separate branch.
 2015-11-18 11:07:58 +11:00
Harald Pichler 500078ef9a update to contiki 3.0 2015-08-26 16:01:57 +02:00
Benoît Thébaudeau 2eef189a0a doxygen: Fix some warnings 
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2015-06-20 03:22:31 +02:00
Harald Pichler 6a0d407806 Merge branch 'contiki' into osd 2015-05-19 10:54:55 +02:00
Moritz 'Morty' Strübe 0dab6926b3 Move MAX, MIN and ABS to sys/cc.h 2015-05-18 08:53:17 +02:00
Harald Pichler d31ecbf486 Merge branch 'contiki' into osd 2015-02-18 10:04:47 +01:00
George Oikonomou b6bd556805 Fix clock.h warnings caused by multiple, conflicting documentation blocks of clock functions 2015-02-15 21:48:30 +01:00
Harald Pichler 9efc5d41c1 Merge branch 'contiki' into osd 2014-12-29 08:20:00 +01:00
Bertrand Bonnefoy-Claudet 9baa378c97 usb/rndis: Add parentheses to an unsafe macro 2014-12-12 19:17:46 +01:00
Harald Pichler a02be51f08 Merge branch 'contiki' into osd 2014-12-07 15:24:00 +01:00
Josef Lusticky c6bea7d0e7 avr: fix divide when CLOCK_SECOND is not a power of two 2014-11-26 22:47:50 +01:00
Ralf Schlatterbeck 08abd8807d Fixes for platform timer code 
Some platforms are missing timer channels, this is now left to the
(missing) preprocessor definitions on those platforms, no
platform-specific defines needed anymore.
Also fix usage of timer counter register 3 (hardcoded) in
cpu/avr/dev/clock.c -- this code isn't used on many platforms as it
requires a very special quartz clock frequency but this now also uses
the platform timer specification.
 2014-11-19 13:48:42 +01:00
Enrico Joerns 0b8769e576 [doc] Various fixes for doxygen grouping etc. 2014-11-10 23:53:32 +01:00
Rémy Léone 25c8b0835d Closing doxygen groups 2014-05-30 11:01:20 +02:00
Adam Dunkels bb2dcaa057 A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
Adam Dunkels 1af22fa4fe Removed old unused RTL8019 code that had license issues 2012-10-29 16:08:09 +01:00
Adam Dunkels 944537fccf Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree 2012-10-26 15:54:49 +02:00
David Kopf cac4e9a222 Add clock_delay_us and clock_set_seconds to clock.h. Modify clock_wait to use clock_time_t. 
Remove the troublesome avr/dev/delay.* files.
Add PLATFORM_NAME and combine the confusing *_REVISION defines into a single PLATFORM_TYPE
 2012-04-09 15:49:53 -04:00
David Kopf 6e45dfe5ff PROGMEM changes needed for newer avr-gcc compiler 2012-02-21 11:10:57 -05:00
Nicholas J Humfrey 1cda3da17e Converted u8_t to uint8_t and u16_t to uint16_t in the cpu directory. 2012-02-21 08:33:24 -05:00
David Kopf 7ca141b457 Access uart registers directly instead of through intermediate addresses in a RAM struct. 
Add a platform define to reduce the number of ports supported by the cpu.
 2012-01-21 13:49:58 -05:00
David Kopf 58298f59db Add F_CPU=0x800000 option with phase lock to external 32768 Hz crystal 
Add MCU_CONF_LOW_WEAR option to avoid eeprom writes during development.
 2012-01-10 12:42:27 -05:00
David Kopf 81af871db9 Bugfix: use 16 bit tick count to adjust clock after sleep 2011-12-01 09:58:55 -05:00
David Kopf d1cd3f213c Add general unsupported interrupt vector suggested by Daniel Willmann 2011-11-14 11:36:18 -05:00
David Kopf f721f646fa Adjust sleep time by ticks instead of seconds, proposed by Ivan Delamer 2011-09-10 12:44:49 -04:00
David Kopf bdec65b889 Fix typos and file endings 2011-08-28 16:04:36 -04:00
David Kopf 53737d9a38 Use correct prescale factor 2011-08-18 13:58:20 -04:00
David Kopf 3ea102050b Apply patch of Ivan Delamer for atmega1281 @ 4 MHz 2011-08-17 13:16:46 -04:00
David Kopf 36fa735323 Calculate best prescaler based on F_CPU and CLOCK_CONF_SECONDS. Inspired by patch from Ivan Delamer. 2011-08-17 13:15:26 -04:00
David Kopf 50d1086553 Add changes needed for contikimac 2011-08-13 11:38:38 -04:00
David Kopf b70d2b3163 Remove duplicate code block 2011-08-05 17:34:38 -04:00
David Kopf c9b19ce655 Change timer setups for arbitrary CLOCK_CONF_SECOND 
Change raven to 128 ticks and enable 32KHz crystal as default.
 2011-08-05 15:14:35 -04:00
David Kopf e2ad2acde4 Add stk500 platform and changes suggested by Daniel Willmann 2011-08-03 11:18:55 -04:00
David Kopf 0bb585fd60 Replace WEBSERVER by AVR_WEBSERVER 2011-07-24 11:43:17 -04:00
dak664 59109b9893 Fix type, diagnostic interrupt code on conditional 2011-03-13 14:08:02 -04:00