Commit graph

52 commits

Author SHA1 Message Date
Ralf Schlatterbeck 1aa694bba2 Turn off JTAG in adc_init 2014-06-30 14:25: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 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 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
harald d192553309 add i2c driver from Ingo 2014-06-21 21:30:48 +02:00
harald 45dee77092 bugfix read analog 2014-06-02 13:46:54 +02:00
harald b398ab9288 set 0xABCD default panid 2014-06-02 13:44:54 +02:00
Ralf Schlatterbeck e88f60feee Make HW timer for contiki rtimer configurable
... and configure osd platform to use timer 5. With the new
configuration we can use timer 3 for generating hardware PWM.
2014-05-31 16:17:07 +02:00
harald 90ed9d14d2 add Arduino pin definition and commands 2014-05-22 16:25:15 +02:00
harald 2a63d0a972 bugfix define panid 2014-05-15 15:34:05 +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 f40bf6d803 bugfix includes and names 2014-04-15 07:27:33 +02:00
harald 59713f6d3b adapt new names and api 2014-04-15 07:27:33 +02:00
harald 86cd1ec02f remove t4 driver at the moment, config problem 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
harald d8d0a507e1 remove link status and bugfix params.c 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 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 b50f4e2119 remove xmac config 2014-04-15 07:27:32 +02:00
harald42 1464292188 bugfix nbr name xmac 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 337be76b26 bugfix server client demo 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 aea396e542 bugfix blockmode, 8 Hz dutycyle as standard 2014-04-15 07:27:31 +02:00
harald42 0ef2ce8e5c bugfix CS cast to uint8_t 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
harald42 7001e8fa33 bugfix new dresden module 32khz 2014-04-15 07:27:30 +02:00
harald42 b6bea56c27 use batmon in battery_sensor 2014-04-15 07:27:30 +02:00
harald42 ff227b7a04 initial upload 2014-04-15 07:27:30 +02:00
harald42 58504df2c4 bugfix packet loss 2014-04-15 07:27:30 +02:00
harald42 312a88ad39 update for new contiki fetch 2014-04-15 07:27:29 +02:00
harald42 243fd6f11e bugfix binarys 2014-04-15 07:27:29 +02:00
harald42 611e358ad9 add BOOTLOADER_GET_MAC 2014-04-15 07:27:29 +02:00
harald42 ec5210b562 periodic prints configurable 2014-04-15 07:27:29 +02:00
harald42 32d077790f remove debug code 2014-04-15 07:27:28 +02:00
harald42 cdf4da8461 add merkurboard coap client demo 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
andreas@reder.eu 86a6d88799 PARAMS_PANID is now defined in contiki-conf and no longer in params.h to be able
to change framer panid
2014-04-15 07:27:27 +02:00
andreas@reder.eu 46010cbbd6 bugfix: panid is now correctly loaded from eeprom and set in mac framer and radio on startup 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