Harald Pichler
a90a6e0f65
add /p/name and p/model resource, remove info
2014-11-19 13:39:19 +01:00
Marcus Priesch
630bd8e9e4
Factored to support configurable amount of pwm's, fixes
2014-11-19 13:38:58 +01:00
Marcus Priesch
85d29b6473
initial check in
2014-11-19 13:38:51 +01:00
Harald Pichler
088c7118e0
compile all osd-examples
2014-11-19 13:38:38 +01:00
Harald Pichler
4760891bb4
simplified led resource to one led actuator
2014-11-19 13:38:29 +01:00
Harald Pichler
425f348daa
initial upload
2014-11-19 13:38:16 +01:00
Harald Pichler
11b13a7a7e
remove link status and bugfix params.c
2014-11-19 13:37:41 +01:00
Harald Pichler
f2bd00b660
add patch milligrad ds1820 from Jan-Benedict Glaw
2014-11-19 13:37:33 +01:00
Harald Pichler
9906e9736c
temp and hum sensors values xxxx -> xx.xx
2014-11-19 13:37:21 +01:00
Harald Pichler
e5baf940e7
add dhtxx temp coap
2014-11-19 13:37:13 +01:00
Harald Pichler
1b04a24022
config panid over defines
2014-11-19 13:37:06 +01:00
Harald Pichler
8b323633cd
define new tria pins, configurable type ligt or shutter or plug
2014-11-19 13:36:58 +01:00
Harald Pichler
35668c8aed
initial upload
2014-11-19 13:36:52 +01:00
Harald Pichler
7ea29294d7
cleanup code add coap13 support
2014-11-19 13:36:44 +01:00
Harald Pichler
fd57fcef72
cleanup code, add coap13 support
2014-11-19 13:36:28 +01:00
Harald Pichler
a9b36497f6
del unused files
2014-11-19 13:36:19 +01:00
Harald Pichler
3a3091c884
del unused file
2014-11-19 13:36:10 +01:00
Harald Pichler
f7e4fb6499
code cleanup
2014-11-19 13:35:58 +01:00
Harald Pichler
cc950ace98
cleanup code
2014-11-19 13:35:47 +01:00
Harald Pichler
96f1264120
remove old project use climate instead
2014-11-19 13:35:36 +01:00
Harald Pichler
fa7920952f
delete old example
2014-11-19 13:35:27 +01:00
Harald Pichler
c3f00a7106
cleanup code
2014-11-19 13:35:18 +01:00
Harald Pichler
829cd2517d
cleanup code
2014-11-19 13:35:10 +01:00
Harald Pichler
09813190aa
20 neighbors with status and routes
2014-11-19 13:34:55 +01:00
Harald Pichler
171c1290c3
update boarder router to new rpl tables
2014-11-19 13:34:47 +01:00
Harald Pichler
e2edd006d4
initial upload
2014-11-19 13:34:27 +01:00
Harald Pichler
837f70770a
cleanup plattform defines, disable energest, radiostatistics
2014-11-19 13:34:20 +01:00
Harald Pichler
29c7297591
bugfix RH03 sensor
2014-11-19 13:33:50 +01:00
Harald Pichler
45ede69308
add dht22 and RHT03 support
2014-11-19 13:33:40 +01:00
Harald Pichler
7cc5312937
update coap13
2014-11-19 13:33:02 +01:00
Harald Pichler
666ca8436b
bugfix wrong define
2014-11-19 13:32:53 +01:00
Harald Pichler
bd45ee7aea
add coap 13 support
2014-11-19 13:32:23 +01:00
Harald Pichler
d85ce4b42b
initial upload
2014-11-19 13:32:12 +01:00
Harald Pichler
decc9fcb0f
bugfix buffers
2014-11-19 13:32:03 +01:00
Harald Pichler
21bd674622
bugfix buffers
2014-11-19 13:31:53 +01:00
Harald Pichler
0881290bbc
add coap 13
2014-11-19 13:24:58 +01:00
Harald Pichler
532063c422
bugfix compile error
2014-11-19 13:24:47 +01:00
Harald Pichler
89723ebfa8
bugfix hw_init()
2014-11-19 13:24:32 +01:00
Harald Pichler
deea693f82
bugfix led button battery
2014-11-19 13:24:06 +01:00
Harald Pichler
ba2e08aebf
update to caop 13
2014-11-19 13:23:28 +01:00
Harald Pichler
e9c033688b
bugfix
2014-11-19 13:21:52 +01:00
Harald Pichler
15709add91
initial upload
2014-11-19 13:20:12 +01:00
Harald Pichler
d5ca328050
initial upload
2014-11-19 13:14:29 +01:00
Harald Pichler
558184f106
remove unused code, bugfix const
2014-11-19 13:14:07 +01:00
Harald Pichler
3f9e1962a1
bugfix accept type const
2014-11-19 13:13:58 +01:00
Harald Pichler
909bdd2d90
bugfix pullup key_init
2014-11-19 13:13:50 +01:00
Harald Pichler
d1bf2bbb69
add button logic
2014-11-19 13:13:41 +01:00
Harald Pichler
a66fb13e4f
cleanup debug prints
2014-11-19 13:13:09 +01:00
Harald Pichler
795580b6ae
bugfix ->startup led red off
2014-11-19 13:12:51 +01:00
Harald Pichler
245d801862
add merkurboard coap client demo
2014-11-19 12:14:24 +01:00
Harald Pichler
a4986b71dc
add isr
2014-11-19 12:14:08 +01:00
Harald Pichler
b992fc43cc
etimer read buttons
2014-11-19 12:13:51 +01:00
Harald Pichler
617dfba4cb
add pcint buttons
2014-11-19 12:13:33 +01:00
Andreas Reder
03b7dc8719
added run.sh and flash.sh
2014-11-19 12:13:09 +01:00
Harald Pichler
673b167f8f
cleanup er-rest-example-merkurboard
2014-11-19 12:11:40 +01:00
Marcus Priesch
42c28e0bf7
timer4 servo pwm
2014-11-19 12:11:19 +01:00
Marcus Priesch
277f63d76a
timer4 servo pwm
2014-11-19 12:10:09 +01:00
Harald Pichler
54114b0943
many bugfixes, add cputemp
2014-11-19 12:07:31 +01:00
Harald Pichler
b33ea9659c
add relay
2014-11-19 12:07:22 +01:00
Harald Pichler
fbd4b0be9c
add debug led code
2014-11-19 12:07:14 +01:00
Harald Pichler
e645833a99
add light-actor
2014-11-19 12:06:54 +01:00
Harald Pichler
8c08364cad
add servo example
2014-11-19 12:06:45 +01:00
Harald Pichler
cb41c216e9
bugfix compile and flash
2014-11-19 12:06:34 +01:00
Harald Pichler
f6fa014a1f
add merkur board example
2014-11-19 12:06:23 +01:00
Harald Pichler
300716164c
change plattform to osd-merkur
2014-11-19 12:05:54 +01:00
Harald Pichler
c5a9a22e0f
change plattform to osd-merkur
2014-11-19 12:05:46 +01:00
Harald Pichler
3c142b8bbb
change plattform to osd-merkur
2014-11-19 12:05:35 +01:00
Harald Pichler
562434e90e
change plattform to osd-merkur
2014-11-19 12:05:27 +01:00
Harald Pichler
e9196aebb7
change plattform to osd-merkur
2014-11-19 12:05:19 +01:00
Harald Pichler
30b8d433f9
change plattform to osd-merkur
2014-11-19 12:05:12 +01:00
Harald Pichler
37d8ca16fe
change plattform to osd-merkur
2014-11-19 12:05:03 +01:00
Harald Pichler
81e6734626
add climate example
2014-11-19 12:04:53 +01:00
Harald Pichler
cd194ae1ab
remove old files
2014-11-19 12:04:20 +01:00
Harald Pichler
d00df76ada
cleanup project
2014-11-19 12:04:04 +01:00
Harald Pichler
892de50059
cleanup code
2014-11-19 12:03:50 +01:00
Harald Pichler
c4c92ea630
add button sensor with debug
2014-11-19 12:03:35 +01:00
Harald Pichler
fc6055b420
initial upload
2014-11-19 12:03:04 +01:00
Harald Pichler
ff15332aa5
change rt tag and disable energest and radio stat
2014-11-19 12:02:39 +01:00
Harald Pichler
808a249862
add battery sensor
2014-11-19 12:01:49 +01:00
Harald Pichler
ab3f3c8644
setup 15 NBR 50 DS6-Route
2014-11-19 12:01:22 +01:00
Harald Pichler
2c172bfd31
update to latest version
2014-11-19 12:01:09 +01:00
Harald Pichler
30b5333123
remove if attribute
2014-11-19 12:00:59 +01:00
Harald Pichler
c4d8e6a6e8
use ds1820.c from /dev directory
2014-11-19 12:00:28 +01:00
Harald Pichler
5ac3e3a220
new dht11 uri schema
2014-11-19 12:00:01 +01:00
Harald Pichler
9e2f71b7d8
add sensors, internal temperature, battery
2014-11-19 11:59:37 +01:00
Harald Pichler
3019a8e3ef
add DHT11 humidity sensor
2014-11-19 11:58:21 +01:00
Harald Pichler
a6a1a7b375
initial upload
2014-11-19 11:57:16 +01:00
Harald Pichler
17c7e35621
initial upload
2014-11-19 11:56:43 +01:00
harald42
19561efacb
update project to coap 13
2014-11-14 15:59:22 +01:00
harald42
dfa4da2e98
initial upload
2014-11-14 11:02:45 +01:00
harald42
ee1759ba4a
initial upload
2014-11-14 10:46:30 +01:00
harald42
114d7e883a
Merge branch 'master' of https://github.com/osdomotics/osd-contiki
2014-10-23 11:07:48 +02:00
harald42
408d1cabfe
initial upload
2014-10-23 11:06:25 +02:00
harald42
8ed94bf819
initial upload
2014-10-11 22:53:08 +02:00
Billy Everyteen
9f4f828976
initial upload
2014-09-18 15:08:55 +02:00
powermik
d7a6d8560a
UNSUPPORTED_MADIA_TYPE is a typo
2014-08-04 20:14:40 +02:00
harald
fa53bc3241
use Arduino like optotriac driver
2014-07-15 13:35:31 +02:00
harald
c25dc70d26
simplify code, bugfixes PE3
2014-07-15 08:23:33 +02:00
Ralf Schlatterbeck
4b984153ab
Fix A0-A5 ADC constants, use in example sketch
2014-06-30 10:24:49 +02:00
Ralf Schlatterbeck
60156d1c48
Fix off-by-one error in digitalPinToTimer
2014-06-29 18:06:48 +02:00
Ralf Schlatterbeck
d8bc9f761c
Remove obsolet macro in example
2014-06-29 17:32:00 +02:00
Ralf Schlatterbeck
77c02d58f8
Refactor A/D conversion in adc.c
...
Now the necessary settings are in adc.h. Refactored to allow repeated
ADC reads without reinitialization. Arduino allows setting
analogReference, this is now also implemented.
ADC is now initialized to sane values in apps/arduino/arduino-process.c
dev/arduino/arduino-compat.h now has all hardware independent settings
for arduino (some moved from platform/osd-merkur/dev/hw-arduino.h).
turnOffPWM re-implemented with hw_timer, removed from wiring_digital.c
ADC-specific arduino stuff moved to arduino-compat.h
Arduinos wiring_analog no longer necessary.
arduino-sketch example now reads analog inputs 1 and 5 using analogRead.
2014-06-29 17:26:15 +02:00
Ralf Schlatterbeck
4643c5d02d
Factor resources, fix time
...
Now there is a generic resource that can generate and parse
application/json as well as text/plain. It can be re-used, only the
from_string and to_string routines have to be written and the resource
properly set up. A new resource format is specified, see
GENERIC_RESOURCE in, e.g., examples/osd/pwm-example. This is now used in
all my examples, namely pwm-example, arduino-sketch, wallclock-time.
There was an off by one error for the month in time formatting (in
gmtime and localtime). And the leap-year computation was broken. Both
fixed now, so we get a correct date. For localtime we are still 2 hours
off because daylight saving isn't implemented yet.
Also renamed gmtime to utc.
2014-06-27 22:25:51 +02:00
Ralf Schlatterbeck
c5d25f5bfe
Last minute bug-fix of arduino-sketch
...
... happens when not completing testing before pushing commit :-)
2014-06-26 19:07:48 +02:00
Ralf Schlatterbeck
f0f5391409
Make Arduino timer stuff work on Contiki
...
New discovery: Contiki also uses timer 0. With almost the same interface
as Arduino. So we now completely get rid of wiring.c (only the main
file, the other wiring_xxx stay) and implement Arduino timer, delay, etc
in terms of the corresponding Contiki routines. Verified that now delay
works as expected. The LED in examples/osd/arduino-sketch blinks!
Before this, the arduino_init routine in wiring.c destroyed the timer-0
initialization of contiki, making both, contiki timer implementation
*and* contiki timer implementation fail if the arduino_init routine was
called. Now both work.
2014-06-26 18:37:13 +02:00
Ralf Schlatterbeck
e65dabb119
Add Arduino compatibility layer
...
We can now directly compile arduino sketches (.pde) files.
Arduino compatible analogWrite works now.
But there is still a long way to go, serial I/O and timer stuff (delay,
millis etc) currently don't work (not tested but I don't expect this to
work).
It can be used in an arduino sketch or in a normal contiki program.
We get a PWM frequency of 490.2 Hz (a period of 2.040 ms), that's
Arduino compatible. If you need different frequencies see native timer
usage in examples/osd/pwm-example
In a contiki program you have to call arduino_pwm_timer_init to
initialize the timer before pwm works. The arduino sketch wrapper
already does this.
For running a sketch, see examples/osd/arduino-sketch
2014-06-26 11:00:01 +02:00
Ralf Schlatterbeck
5991c3e3db
Initial implementation of avr hardware timer
...
Mainly for PWM use for now.
With example to set the LED to different brightness via COAP.
We switch the LED with 50 kHz (20µs) in this example.
2014-06-22 13:32:05 +02:00
Ralf Schlatterbeck
47d1c2a74d
Merge branch 'master' of github.com:osdomotics/osd-contiki
2014-05-29 17:37:00 +02:00
Ralf Schlatterbeck
f48566d51f
Add wallclock time handling
...
New application and new example.
We use the built-in timer routines and add an offset to get the
wallclock time. The offset can be set by time-changing routines
(currently only settimeofday).
We also maintain an offset for timezone handling but this isn't
currently fully implemented.
2014-05-29 17:31:19 +02:00
harald
0c29b2b7db
initial upload
2014-05-27 11:34:10 +02:00
harald
2d424bd259
initial upload
2014-05-27 11:33:10 +02:00
harald
078faa39d4
cleanup code
2014-05-27 11:31:54 +02:00
harald
90ed9d14d2
add Arduino pin definition and commands
2014-05-22 16:25:15 +02:00
Ralf Schlatterbeck
be01bf77a9
Allow changing bootloader_get_mac address
...
Current default in the Makefile is the *new* bootloader address.
But for backward compatibility we've modified the run*.sh files
to use the old address. The run*.sh also now explain how to change
the default.
2014-05-13 16:56:59 +02:00
harald
0a5872e261
change resources to simple and make climate2 default
2014-05-08 13:04:27 +02:00
harald
5fcac26e80
get s/button ->show button status 0/1
2014-04-30 15:20:25 +02:00
harald
40bd9950d1
add 0.5s delay between off and on
2014-04-24 13:55:21 +02:00
harald
59bd18df7d
add timer and shutter functionality
2014-04-23 16:13:58 +02:00
harald
598a0da30d
change to port F6,F7
2014-04-23 16:13:23 +02:00
harald
ac79f1b596
change battery and cpttem format to xx.xx
2014-04-16 09:31:48 +02:00
harald
b0c8597dbc
add shutter control resources, reset,timer
2014-04-15 17:29:05 +02:00
harald
b6e0ef1d95
add contiki led, remove led1,led2
2014-04-15 07:27:33 +02:00
harald
f77717158d
simplify project-conf.h
2014-04-15 07:27:33 +02:00
harald
f9d67ed10c
bugfix statusled include
2014-04-15 07:27:33 +02:00
harald
f40bf6d803
bugfix includes and names
2014-04-15 07:27:33 +02:00
harald
67dba47c23
remove not needed binary files
2014-04-15 07:27:33 +02:00
harald
aa568a28a3
add /s/cputemp resource
2014-04-15 07:27:32 +02:00
harald
f9abb44d6e
add /p/name and p/model resource, remove info
2014-04-15 07:27:32 +02:00
Marcus Priesch
992e54fe25
Factored to support configurable amount of pwm's, fixes
2014-04-15 07:27:32 +02:00
Marcus Priesch
bf6f388691
initial check in
2014-04-15 07:27:32 +02:00
harald
67783600aa
compile all osd-examples
2014-04-15 07:27:32 +02:00
harald
251abdda29
simplified led resource to one led actuator
2014-04-15 07:27:32 +02:00
harald
d87287b745
initial upload
2014-04-15 07:27:32 +02:00
harald
d8d0a507e1
remove link status and bugfix params.c
2014-04-15 07:27:32 +02:00
harald
11b7022ce6
add patch milligrad ds1820 from Jan-Benedict Glaw
2014-04-15 07:27:32 +02:00
harald
87028c1f60
temp and hum sensors values xxxx -> xx.xx
2014-04-15 07:27:32 +02:00
harald
f8c298a495
add dhtxx temp coap
2014-04-15 07:27:32 +02:00
harald
51f179eacf
config panid over defines
2014-04-15 07:27:32 +02:00
harald
1f586c7735
define new tria pins, configurable type ligt or shutter or plug
2014-04-15 07:27:32 +02:00
harald42
7d354d8a37
initial upload
2014-04-15 07:27:32 +02:00
harald42
2ddd2ba38a
cleanup code add coap13 support
2014-04-15 07:27:32 +02:00
harald42
806de3f204
cleanup code, add coap13 support
2014-04-15 07:27:32 +02:00
harald42
15167d541e
del unused files
2014-04-15 07:27:31 +02:00
harald42
39a830d9a9
del unused file
2014-04-15 07:27:31 +02:00
harald42
116ce888c4
code cleanup
2014-04-15 07:27:31 +02:00
harald42
184dee491e
cleanup code
2014-04-15 07:27:31 +02:00
harald42
4f05557905
remove old project use climate instead
2014-04-15 07:27:31 +02:00
harald42
1b56526fe0
delete old example
2014-04-15 07:27:31 +02:00
harald42
aac4fcc8e1
cleanup code
2014-04-15 07:27:31 +02:00
harald42
3c0908f2da
cleanup code
2014-04-15 07:27:31 +02:00
harald42
d3eb7da297
20 neighbors with status and routes
2014-04-15 07:27:31 +02:00
harald42
0a14fd6a18
update boarder router to new rpl tables
2014-04-15 07:27:31 +02:00
harald42
da39da39dc
initial upload
2014-04-15 07:27:31 +02:00
harald42
afa20ee0ae
cleanup plattform defines, disable energest, radiostatistics
2014-04-15 07:27:31 +02:00
harald42
7b46026b52
bugfix RH03 sensor
2014-04-15 07:27:31 +02:00
harald42
310234e0dc
add dht22 and RHT03 support
2014-04-15 07:27:30 +02:00
harald
a58322a62b
with coap13
2014-04-15 07:27:30 +02:00
harald
ffae9fce58
update coap13
2014-04-15 07:27:30 +02:00
harald42
4a981f1c47
bugfix wrong define
2014-04-15 07:27:30 +02:00
harald42
7ee65e72a5
add coap 13 support
2014-04-15 07:27:30 +02:00
Harald Pichler
16c8c3853d
initial upload
2014-04-15 07:27:30 +02:00
harald42
015a6a3c65
bugfix buffers
2014-04-15 07:27:30 +02:00
harald42
1968ebc626
bugfix buffers
2014-04-15 07:27:30 +02:00
Andreas Reder
d5eda89c39
changed char c to signed char c to be compatible to armhf architecture
2014-04-15 07:27:30 +02:00
harald42
9c1b87bbb9
add coap 13
2014-04-15 07:27:30 +02:00
harald42
5c3303eef0
bugfix compile error
2014-04-15 07:27:30 +02:00
harald42
cd715cb222
bugfix hw_init()
2014-04-15 07:27:29 +02:00
harald42
2441cc38ee
bugfix led button battery
2014-04-15 07:27:29 +02:00
harald42
11d4c9553e
update to caop 13
2014-04-15 07:27:29 +02:00
harald42
243fd6f11e
bugfix binarys
2014-04-15 07:27:29 +02:00
harald42
ae7b37d1c3
add binarys
2014-04-15 07:27:29 +02:00
harald42
7478d719cf
initial upload
2014-04-15 07:27:29 +02:00
harald42
b27469d218
initial upload
2014-04-15 07:27:29 +02:00
Harald Pichler
080eadc79b
remove unused code, bugfix const
2014-04-15 07:27:29 +02:00
Harald Pichler
ef5b9474fd
bugfix accept type const
2014-04-15 07:27:29 +02:00
harald42
71f8352876
bugfix pullup key_init
2014-04-15 07:27:28 +02:00
harald42
c265e72b24
add button logic
2014-04-15 07:27:28 +02:00
harald42
8628af93e1
cleanup debug prints
2014-04-15 07:27:28 +02:00
Andreas Reder
19ec02773f
corrected bug when changing panid
2014-04-15 07:27:28 +02:00
harald42
765129fde2
bugfix ->startup led red off
2014-04-15 07:27:28 +02:00
harald42
cdf4da8461
add merkurboard coap client demo
2014-04-15 07:27:28 +02:00
harald42
797c3da239
add isr
2014-04-15 07:27:28 +02:00
harald42
25fb513164
etimer read buttons
2014-04-15 07:27:28 +02:00
harald42
ae3d5e4966
add pcint buttons
2014-04-15 07:27:28 +02:00
Andreas Reder
6184e5715b
corrected border-router resources, added run.sh and flash.sh
2014-04-15 07:27:28 +02:00
harald42
d8d1550400
cleanup er-rest-example-merkurboard
2014-04-15 07:27:28 +02:00
harald42
7383f6708b
timer4 servo pwm from Priesch Markus
2014-04-15 07:27:28 +02:00
harald42
3d10f4d0d1
timer4 servo pwm from Priesch Markus
2014-04-15 07:27:28 +02:00
harald42
0deca185bb
many bugfixes, add cputemp
2014-04-15 07:27:28 +02:00
harald42
6d30a5b66e
add relay
2014-04-15 07:27:28 +02:00
harald42
8cdf981c8f
add debug led code
2014-04-15 07:27:27 +02:00
Andreas Reder
8d5f623b6a
turned off debugging
2014-04-15 07:27:27 +02:00
Andreas Reder
85fb0b1e48
added info resource
2014-04-15 07:27:27 +02:00
Andreas Reder
3783d5f059
created osd native border router with coap server to get rpl table and change panid
2014-04-15 07:27:27 +02:00
AndreasReder
20e8eba08b
changed slip-radio to be able to change panid over slip command
2014-04-15 07:27:27 +02:00
harald42
057a3c3345
add light-actor
2014-04-15 07:27:27 +02:00
harald42
bba7b84a15
add servo example
2014-04-15 07:27:27 +02:00
harald42
36e0dcf22f
bugfix compile and flash
2014-04-15 07:27:27 +02:00
harald42
c8604b5a70
add merkur board example
2014-04-15 07:27:27 +02:00
harald42
2a495ace3b
change plattform to osd-merkur
2014-04-15 07:27:27 +02:00
