deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Factored to support configurable amount of pwm's, fixes

Browse source
This commit is contained in:
Marcus Priesch 2014-03-12 12:34:23 +01:00 • committed by harald
parent bf6f388691
commit 992e54fe25
8 changed files with 363 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/osd/dual-rgbw-actor/Makefile
View file

@ -3,7 +3,7 @@ all: er-example-server
# variable for this Makefile
# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
WITH_COAP=13
WITH_COAP=7
# for some platforms
UIP_CONF_IPV6=1

2
examples/osd/dual-rgbw-actor/flash.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash
avrdude -V -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a

16
examples/osd/dual-rgbw-actor/t4-servo-hardware.h
View file

@ -35,14 +35,14 @@
static servo_channel_type servo_channels [] =
{ /* PORTx, DDRx, PINxn, PWM */
{0x05, 0x04, PINB7, 0} // r
, {0x0E, 0x0D, PINE2, 0} // g
, {0x05, 0x04, PINB6, 0} // b
, {0x05, 0x04, PINB5, 0} // w
, {0x05, 0x04, PINB1, 0} // r
, {0x05, 0x04, PINB0, 0} // g
, {0x05, 0x04, PINB2, 0} // b
, {0x05, 0x04, PINB3, 0} // w
{0x05, 0x04, 1 << PINB7, 0} // r1
, {0x0E, 0x0D, 1 << PINE2, 0} // g1
, {0x05, 0x04, 1 << PINB6, 0} // b1
, {0x05, 0x04, 1 << PINB5, 0} // w1
, {0x05, 0x04, 1 << PINB1, 0} // r2
, {0x05, 0x04, 1 << PINB0, 0} // g2
, {0x05, 0x04, 1 << PINB2, 0} // b2
, {0x05, 0x04, 1 << PINB3, 0} // w2
};
#endif

78
examples/osd/dual-rgbw-actor/t4-servo-sensors.h
View file

@ -1,78 +0,0 @@
//os_fname_map// t4-servo-config:h:h
// Copyright (C) 2014 Marcus Priesch, All rights reserved
// In Prandnern 31, A--2122 Riedenthal, Austria. office@priesch.co.at
// ****************************************************************************
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// ****************************************************************************
//
//++
// Name
// t4-servo-config
//
// Purpose
// configuration for t4-servo
//
// Revision Dates
// 10-Mar-2014 (MPR) Creation
// ««revision-date»»···
//--
#include <avr/io.h>
#ifndef __T4_SERVO_CONFIG_H__
#define __T4_SERVO_CONFIG_H__ 1
// timing: (X:pwm, _:zero)
//
// X_______________XXXXXXXXXXXXX_______________XXXXXXXXXXXXX
//
// |<------------->|<--------->|<------------->|<--------->| ...
// SERVO_OFFSET SERVO_MAX SERVO_OFFSET SERVO_MAX
//
// within SERVO_MAX you get the PWM set with servo_set (id, pwm)
// if you set SERVO_OFFSET to zero, you get a pwm from 0 to 100% duty cycle
//
// the period of the smallest tick is derived from the timer4 prescaler
// plus the ISR overhead. however, the latter one should be constant
// regardless of the pwm signal generated
#define SERVO_OFFSET 0
#define SERVO_MIN 0
#define SERVO_MAX 255
// Counter value for timer 4 without any prescaler for a single tick
#define PWMFREQ 500
#define T4_VALUE F_CPU/SERVO_MAX/PWMFREQ
#define SERVO_COUNT 8
#define T4_SENSOR_NAME "Dual RGBW Led"
#ifndef servo_channels_defined
#define servo_channels_defined
static servo_channel_type servo_channels [SERVO_COUNT] =
{ {0x0E, 0x0D, PINE2, 0}
, {0x0B, 0x0D, PINB7, 0}
, {0x0B, 0x0D, PINB6, 0}
, {0x0B, 0x0D, PINB5, 0}
, {0x0B, 0x0D, PINB0, 0}
, {0x0B, 0x0D, PINB1, 0}
, {0x0B, 0x0D, PINB2, 0}
, {0x0B, 0x0D, PINB3, 0}
};
#endif
#endif