Add b&o to lirc
This commit is contained in:
parent
4af6656ba7
commit
5223cd4e24
13 changed files with 184 additions and 199 deletions
|
@ -211,7 +211,7 @@ void __attribute__ ((section(".text.fastcode"))) soundIRQ (void)
|
|||
}
|
||||
}
|
||||
|
||||
// backlight pwm
|
||||
/* // backlight pwm
|
||||
cmp_val += bl_val;
|
||||
if (cmp_val >= 63)
|
||||
{
|
||||
|
@ -222,5 +222,5 @@ void __attribute__ ((section(".text.fastcode"))) soundIRQ (void)
|
|||
{
|
||||
FIODIR0 &= ~(1<<4); // sck0/P0.4
|
||||
}
|
||||
|
||||
*/
|
||||
}
|
||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
THUMBSRCS := infrared.c codes.c encoders.c ir_capture.c ir_selector.c
|
||||
SRCS := infraredirq.c
|
||||
THUMBSRCS := infrared.c codes.c encoders.c ir_capture.c ir_selector.c
|
||||
SRCS := infraredirq.c pwm.c
|
||||
THUMBSRCSUNOPT := ir_itt.c ir_nrc17.c \
|
||||
ir_raw.c ir_rc5.c ir_rc6.c ir_rca.c ir_rcmm.c ir_rec80.c ir_recs80.c ir_rf.c \
|
||||
ir_sirc.c ir_spaceenc.c ir_lirc.c
|
||||
|
|
|
@ -222,7 +222,7 @@ const struct TABLES_N RAW =
|
|||
|
||||
const struct TABLES_L LIRC =
|
||||
{
|
||||
9,
|
||||
10,
|
||||
{
|
||||
{
|
||||
#include "ir_codes/lirc/ufs922"
|
||||
|
@ -259,6 +259,10 @@ const struct TABLES_L LIRC =
|
|||
{
|
||||
#include "ir_codes/lirc/samsung_ue46b6000"
|
||||
"Samsung TV"
|
||||
}
|
||||
},
|
||||
{
|
||||
#include "ir_codes/lirc/beo4"
|
||||
"bang & olufsen"
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "encoders.h"
|
||||
#include "codes.h"
|
||||
#include "ir_selector.h"
|
||||
#include "pwm.h"
|
||||
|
||||
volatile unsigned char mod_enable;
|
||||
volatile unsigned char hi_border;
|
||||
|
@ -109,45 +110,14 @@ void defStopper(void)
|
|||
void runIR(void)
|
||||
{
|
||||
T1TCR = 0x01;
|
||||
|
||||
/*
|
||||
PWMTC = 0;
|
||||
PWMPR = 7;
|
||||
PWMMR0 = 0x1E6; // pwm rate
|
||||
PWMMR2 = 0x00; // pwm value
|
||||
PWMLER = 0x05;
|
||||
PWMMCR = 0x03;
|
||||
PWMPCR = (1<<10);
|
||||
PWMTCR = 0x03;
|
||||
PWMTCR = 0x09;
|
||||
*/
|
||||
|
||||
PINSEL1 &= ~(3 << (10)); // IO
|
||||
PINSEL1 |= (1 << (10)); // PWM5
|
||||
|
||||
PWMTC = 0; //Timer Counter
|
||||
PWMPR = 0; //Prescale Register
|
||||
PWMPC = 0; //Prescale Counter
|
||||
|
||||
PWMMR0 = 416; // pwm rate
|
||||
PWMMR5 = 0; // pwm value
|
||||
|
||||
PWMLER = 0x21; //Latch Enable
|
||||
PWMMCR = 0x02; //Match Control
|
||||
PWMPCR |= (1<<13);
|
||||
PWMTCR = 0x03;
|
||||
PWMTCR = 0x09;
|
||||
|
||||
//FIOSET0 = (1<<21);
|
||||
|
||||
PWM_set_IR_duty_cycle(0);
|
||||
|
||||
}
|
||||
|
||||
void stopIR(void)
|
||||
{
|
||||
T1TCR = 0x03;
|
||||
PWMMR5 = 0; // pwm value
|
||||
PWMLER = 0x21; //Latch Enable
|
||||
PWM_set_IR_duty_cycle(0);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -63,28 +63,8 @@ struct IR_VARS_ {
|
|||
unsigned long actpre_data;
|
||||
unsigned long post_data; // data which the remote sends after actual keycode
|
||||
unsigned long actpost_data;
|
||||
unsigned short flags; // flags
|
||||
unsigned short phead,shead; // header
|
||||
unsigned short plead; // leading pulse
|
||||
unsigned short ptrail; // trailing pulse
|
||||
unsigned short pfoot,sfoot; // foot
|
||||
unsigned short pre_p,pre_s; // signal between pre_data and keycode
|
||||
unsigned short post_p,post_s; // signal between keycode and post_code
|
||||
unsigned short gap;
|
||||
unsigned short repeat_gap;
|
||||
unsigned short prepeat,srepeat;
|
||||
unsigned short cycles_counter;
|
||||
unsigned char bits; // bits (length of code)
|
||||
unsigned char pre_data_bits; // length of pre_data
|
||||
unsigned char post_data_bits; // length of post_data
|
||||
unsigned char rc6_bit; // doubles signal length of this bit (only used for RC-6)
|
||||
unsigned char pthree,sthree; // 3 (only used for RC-MM)
|
||||
unsigned char ptwo,stwo; // 2 (only used for RC-MM)
|
||||
unsigned char pone,sone; // 1
|
||||
unsigned char pzero,szero; // 0
|
||||
unsigned char min_repeat;
|
||||
unsigned long cycles_counter;
|
||||
unsigned char bit;
|
||||
unsigned char map;
|
||||
unsigned char stop;
|
||||
unsigned char repeats;
|
||||
} lirc;
|
||||
|
@ -93,6 +73,7 @@ struct IR_VARS_ {
|
|||
unsigned int actcmd;
|
||||
unsigned char toggle;
|
||||
unsigned char state;
|
||||
unsigned char duty_cycle;
|
||||
} ir;
|
||||
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "keyboard.h"
|
||||
#include "rf.h"
|
||||
#include "cc1100.h"
|
||||
#include "pwm.h"
|
||||
|
||||
static unsigned int c_cnt = 0;
|
||||
static unsigned int b_len = 0;
|
||||
|
@ -40,16 +41,12 @@ void __attribute__ ((section(".text.fastcode"))) irIRQ(void)
|
|||
irEncoder();
|
||||
|
||||
if(mod_enable) {
|
||||
PWMMR5 = 200; // pwm value
|
||||
PWMLER = 0x20; //Latch Enable
|
||||
PWM_set_IR_duty_cycle(ir.duty_cycle);
|
||||
} else {
|
||||
PWMMR5 = 0; // pwm value
|
||||
PWMLER = 0x20; //Latch Enable
|
||||
PWM_set_IR_duty_cycle(0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
if(c_cnt <= hi_border)
|
||||
{
|
||||
|
@ -77,6 +74,8 @@ void __attribute__ ((section(".text.fastcode"))) irIRQ(void)
|
|||
}
|
||||
}
|
||||
*/
|
||||
//T1TCR = 0x03;
|
||||
|
||||
T1IR = 1;
|
||||
// VICVectAddr = 0;
|
||||
}
|
||||
|
|
1
boop/infrared/ir_codes/lirc/beo4
Normal file
1
boop/infrared/ir_codes/lirc/beo4
Normal file
|
@ -0,0 +1 @@
|
|||
/*
infrared codes for bang & olufsen
Copyright (C) 2017 <kölnsolar>
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 3 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, see <http://www.gnu.org/licenses/>.
*/
/*pre_data*/ 0x00000000, // 2. start bit
/*post_data*/ 0x00000000,
/*toggle_bit_mask*/ 0x00,
/*gap*/ 18000, // final gap to prevent collision
/*repeat_gap*/ 0,
/*bits*/ 17, // last(4.) start bit logical low as first data bit ==> 1+16 data bits = 17
/*pre_data_bits*/ 1, // 2. start bit
/*post_data_bits*/ 0,
/*rc6_bit*/ 0,
/*frequency*/ 455000, // regular freq is 455kHz but to get a valid result 454,5 is used
/*flags*/ LIRC_BO,
/*header*/ 200,3125, // 1. start bit
/*three*/ 0,0,
/*two*/ 0,0,
/*one*/ 200,9375,
/*zero*/ 200,3125,
/*plead*/ 0,
/*ptrail*/ 200, // stop bit
/*foot*/ 0,0,
/*pre*/ 200,15625, //3. start bit
/*post*/ 200,12500, // post bit
/*repeat*/ 0,0,
/*min_repeat*/ 0,
/*duty cycle*/ 50,
{
0x0000, // A ->
0x0000, // B ->
0x0000, // C ->
0x0000, // D ->
0x0000, // Betty ->
0xB44B, // Exit -> Exit
0x06F9, // Up -> UP
0x8679, // Down -> Down
0xA659, // Left -> Left
0x46B9, // Right -> Right
0x16E9, // OK -> OK
0x0160, // Vol+ -> Vol+
0x0164, // Vol- -> Vol-
0xF00F, // Mute -> Mute
0x48B7, // Prog+ -> Prog+
0x48B7, // Prog- -> Prog-
0x0101, // 1 -> 1
0x0102, // 2 -> 2
0x609F, // 3 -> 3
0x10EF, // 4 -> 4
0x906F, // 5 -> 5
0x50AF, // 6 -> 6
0x30CF, // 7 -> 7
0xB04F, // 8 -> 8
0x708F, // 9 -> 9
0x8877, // 0 -> 0
0xF20D, // -/-- -> Guide
0x0181, // AV -> Source
0x0f0c, // Menu -> Menue
0xD22D, // PiP -> Tools
0x1AE5, // A/B -> Return
0x7C83, // 16:9 -> P.Size
0xF807, // Info -> Info
0xD629, // VTX1 -> Ch.List
0x0000, // VTX2 ->
0xC837, // VTX3 -> Pre-CH
0x6897, // Blue -> Blue
0xA857, // Yello -> Yellow
0x28D7, // Green -> Green
0x36C9, // Red -> Red
0xC23D, // TV -> TV/DTV
0x0f0C // Power -> Standby
},
|
|
@ -25,20 +25,16 @@
|
|||
#include "lcd.h"
|
||||
#include "rf.h"
|
||||
#include "cc1100.h"
|
||||
#include "pwm.h"
|
||||
|
||||
#include "global.h"
|
||||
|
||||
extern volatile unsigned char mod_enable;
|
||||
extern volatile unsigned int cycles;
|
||||
extern volatile unsigned long keyMap[42];
|
||||
|
||||
volatile unsigned long act_freq;
|
||||
struct CODE_TABLE_L *lirctable;
|
||||
|
||||
/*
|
||||
#define RAW_IDLE 0x00
|
||||
#define RAW_HI 0x01
|
||||
#define RAW_LO 0x02
|
||||
*/
|
||||
unsigned int prev_cycles; /* needed for handling of b&o specific protocol added MN2017325 */
|
||||
|
||||
#define LIRC_IDLE 0x00
|
||||
#define LIRC_HEAD_P 0x01
|
||||
|
@ -75,7 +71,7 @@ const struct irModule LIRC_Module =
|
|||
|
||||
unsigned char __attribute__ ((section(".text.fastcode"))) send_data (unsigned long data, unsigned char pulse) {
|
||||
|
||||
const unsigned char* bittimes[4] = {&(ir.lirc.pzero), &(ir.lirc.pone), &(ir.lirc.ptwo), &(ir.lirc.pthree)};
|
||||
const unsigned short* bittimes[4] = {&(lirctable->pzero), &(lirctable->pone), &(lirctable->ptwo), &(lirctable->pthree)};
|
||||
unsigned char notpulse = 1;
|
||||
|
||||
if(pulse) {
|
||||
|
@ -114,7 +110,7 @@ unsigned char __attribute__ ((section(".text.fastcode"))) send_data (unsigned lo
|
|||
cycles = bittimes[0][notpulse];
|
||||
mod_enable = pulse;
|
||||
}
|
||||
if((ir.lirc.bit+1 == ir.lirc.rc6_bit))
|
||||
if((ir.lirc.bit+1 == lirctable->rc6_bit))
|
||||
cycles <<= 1;
|
||||
}
|
||||
else {
|
||||
|
@ -134,97 +130,108 @@ unsigned char __attribute__ ((section(".text.fastcode"))) send_data (unsigned lo
|
|||
}
|
||||
|
||||
void __attribute__ ((section(".text.fastcode"))) LIRC_Encode (void) {
|
||||
unsigned short gap;
|
||||
unsigned long gap;
|
||||
|
||||
ir.lirc.cycles_counter += cycles;
|
||||
|
||||
switch(ir.state)
|
||||
{
|
||||
case LIRC_IDLE:
|
||||
cycles = ir.lirc.pone;
|
||||
cycles = lirctable->pone;
|
||||
mod_enable = 0;
|
||||
break;
|
||||
case LIRC_HEAD_P:
|
||||
ir.lirc.cycles_counter = 0;
|
||||
if(has_header && (!ir.lirc.repeats || (!(ir.lirc.flags&LIRC_NO_HEAD_REP) && !has_repeat) || (ir.lirc.flags&LIRC_REPEAT_HEADER))) { //
|
||||
if(has_header && (!ir.lirc.repeats || (!(lirctable->flags&LIRC_NO_HEAD_REP) && !has_repeat) || (lirctable->flags&LIRC_REPEAT_HEADER))) { //
|
||||
mod_enable = 1;
|
||||
cycles = ir.lirc.phead;
|
||||
cycles = lirctable->phead;
|
||||
ir.state++;
|
||||
break;
|
||||
case LIRC_HEAD_S:
|
||||
mod_enable = 0;
|
||||
cycles = ir.lirc.shead;
|
||||
cycles = lirctable->shead;
|
||||
ir.state++;
|
||||
break;
|
||||
}
|
||||
ir.state = LIRC_LEAD_P;
|
||||
case LIRC_LEAD_P:
|
||||
if(ir.lirc.plead) {
|
||||
if(lirctable->plead) {
|
||||
mod_enable = 1;
|
||||
cycles = ir.lirc.plead;
|
||||
cycles = lirctable->plead;
|
||||
ir.state++;
|
||||
break;
|
||||
}
|
||||
ir.state++;
|
||||
case LIRC_PRE_DAT_P:
|
||||
if(!has_repeat || !(ir.lirc.repeats)) {
|
||||
if(ir.lirc.pre_data_bits) {
|
||||
send_data(ir.lirc.pre_data,1);
|
||||
if(lirctable->pre_data_bits) {
|
||||
send_data(lirctable->pre_data,1);
|
||||
ir.state++;
|
||||
break;
|
||||
case LIRC_PRE_DAT_S:
|
||||
ir.lirc.pre_data <<= send_data(ir.lirc.pre_data,0);
|
||||
if(ir.lirc.bit >= ir.lirc.pre_data_bits)
|
||||
ir.lirc.pre_data <<= send_data(lirctable->pre_data,0);
|
||||
if(ir.lirc.bit >= lirctable->pre_data_bits)
|
||||
ir.state++;
|
||||
else
|
||||
ir.state--;
|
||||
break;
|
||||
case LIRC_PRE_P:
|
||||
if(ir.lirc.pre_p && ir.lirc.pre_s) {
|
||||
if(lirctable->pre_p && lirctable->pre_s) {
|
||||
mod_enable = 1;
|
||||
cycles = ir.lirc.pre_p;
|
||||
cycles = lirctable->pre_p;
|
||||
ir.state++;
|
||||
break;
|
||||
case LIRC_PRE_S:
|
||||
mod_enable = 0;
|
||||
cycles = ir.lirc.pre_s;
|
||||
cycles = lirctable->pre_s;
|
||||
ir.state++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
ir.state = LIRC_DATA_P;
|
||||
ir.state = LIRC_DATA_P;
|
||||
prev_cycles = 0;
|
||||
case LIRC_DATA_P:
|
||||
send_data(ir.cmd,1);
|
||||
ir.state++;
|
||||
break;
|
||||
case LIRC_DATA_S:
|
||||
ir.cmd <<= send_data(ir.cmd,0);
|
||||
if(ir.lirc.bit >= ir.lirc.pre_data_bits + ir.lirc.bits)
|
||||
/* handling for b&o specific protocol added MN2017325
|
||||
special r-bit coding, if current bit is equal previous bit */
|
||||
if(is_BO) {
|
||||
if (prev_cycles == cycles) {
|
||||
prev_cycles = cycles;
|
||||
cycles = lirctable->szero * 2 ;
|
||||
} else {
|
||||
prev_cycles = cycles;
|
||||
}
|
||||
}
|
||||
if(ir.lirc.bit >= lirctable->pre_data_bits + lirctable->bits)
|
||||
ir.state++;
|
||||
else
|
||||
ir.state--;
|
||||
break;
|
||||
case LIRC_POST_P:
|
||||
if(ir.lirc.post_data_bits) {
|
||||
if(ir.lirc.post_p && ir.lirc.post_s) {
|
||||
if(lirctable->post_data_bits) {
|
||||
if(lirctable->post_p && lirctable->post_s) {
|
||||
mod_enable = 1;
|
||||
cycles = ir.lirc.post_p;
|
||||
cycles = lirctable->post_p;
|
||||
ir.state++;
|
||||
break;
|
||||
case LIRC_POST_S:
|
||||
mod_enable = 0;
|
||||
cycles = ir.lirc.post_s;
|
||||
cycles = lirctable->post_s;
|
||||
ir.state++;
|
||||
break;
|
||||
}
|
||||
ir.state = LIRC_POST_DAT_P;
|
||||
case LIRC_POST_DAT_P:
|
||||
send_data(ir.lirc.post_data,1);
|
||||
send_data(lirctable->post_data,1);
|
||||
ir.state++;
|
||||
break;
|
||||
case LIRC_POST_DAT_S:
|
||||
ir.lirc.post_data <<= send_data(ir.lirc.post_data,0);
|
||||
if(ir.lirc.bit >= ir.lirc.pre_data_bits + ir.lirc.bits +ir.lirc.post_data_bits)
|
||||
ir.lirc.post_data <<= send_data(lirctable->post_data,0);
|
||||
if(ir.lirc.bit >= lirctable->pre_data_bits + lirctable->bits + lirctable->post_data_bits)
|
||||
ir.state = LIRC_TRAIL_P;
|
||||
else
|
||||
ir.state--;
|
||||
|
@ -235,33 +242,33 @@ void __attribute__ ((section(".text.fastcode"))) LIRC_Encode (void) {
|
|||
case LIRC_REPEAT_P:
|
||||
if(has_repeat && ir.lirc.repeats) {
|
||||
mod_enable = 1;
|
||||
cycles = ir.lirc.prepeat;
|
||||
cycles = lirctable->prepeat;
|
||||
ir.state++;
|
||||
break;
|
||||
case LIRC_REPEAT_S:
|
||||
mod_enable = 0;
|
||||
cycles = ir.lirc.srepeat;
|
||||
cycles = lirctable->srepeat;
|
||||
ir.state++;
|
||||
break;
|
||||
}
|
||||
ir.state = LIRC_TRAIL_P;
|
||||
case LIRC_TRAIL_P:
|
||||
if(ir.lirc.ptrail) {
|
||||
if(lirctable->ptrail) {
|
||||
mod_enable = 1;
|
||||
cycles = ir.lirc.ptrail;
|
||||
cycles = lirctable->ptrail;
|
||||
ir.state++;
|
||||
break;
|
||||
}
|
||||
ir.state++;
|
||||
case LIRC_FOOT_S:
|
||||
if(has_foot && (!ir.lirc.repeats || !(ir.lirc.flags&LIRC_NO_FOOT_REP)) && (!has_repeat || !ir.lirc.repeats)) {
|
||||
if(has_foot && (!ir.lirc.repeats || !(lirctable->flags&LIRC_NO_FOOT_REP)) && (!has_repeat || !ir.lirc.repeats)) {
|
||||
mod_enable = 0;
|
||||
cycles = ir.lirc.sfoot;
|
||||
cycles = lirctable->sfoot;
|
||||
ir.state++;
|
||||
break;
|
||||
case LIRC_FOOT_P:
|
||||
mod_enable = 1;
|
||||
cycles = ir.lirc.pfoot;
|
||||
cycles = lirctable->pfoot;
|
||||
ir.state++;
|
||||
break;
|
||||
}
|
||||
|
@ -273,17 +280,17 @@ void __attribute__ ((section(".text.fastcode"))) LIRC_Encode (void) {
|
|||
ir.lirc.pre_data = ir.lirc.actpre_data;
|
||||
ir.lirc.post_data = ir.lirc.actpost_data;
|
||||
|
||||
if((ir.lirc.repeat_gap && has_repeat && ir.lirc.repeats) | (is_RF && (ir.lirc.repeats >= ir.lirc.min_repeat)))
|
||||
gap = ir.lirc.repeat_gap;
|
||||
if((lirctable->repeat_gap && has_repeat && ir.lirc.repeats) | (is_RF && (ir.lirc.repeats >= lirctable->min_repeat)))
|
||||
gap = lirctable->repeat_gap;
|
||||
else
|
||||
gap = ir.lirc.gap;
|
||||
gap = lirctable->gap;
|
||||
|
||||
if(is_const && (ir.lirc.cycles_counter < gap))
|
||||
cycles = gap - ir.lirc.cycles_counter;
|
||||
else
|
||||
cycles = gap;
|
||||
|
||||
if((ir.lirc.repeats >= ir.lirc.min_repeat) && ir.lirc.stop) {
|
||||
if((ir.lirc.repeats >= lirctable->min_repeat) && ir.lirc.stop) {
|
||||
ir.state = LIRC_IDLE;
|
||||
}
|
||||
else {
|
||||
|
@ -294,14 +301,13 @@ void __attribute__ ((section(".text.fastcode"))) LIRC_Encode (void) {
|
|||
}
|
||||
|
||||
|
||||
T1MR0 = (15000000 / (act_freq)) * cycles;
|
||||
T1MR0 = 15 * cycles;
|
||||
|
||||
}
|
||||
|
||||
void LIRC_Init(unsigned char map)
|
||||
{
|
||||
unsigned long freq;
|
||||
struct CODE_TABLE_L *lirctable;
|
||||
|
||||
if(map < LIRC.num_tables) {
|
||||
|
||||
|
@ -311,92 +317,32 @@ void LIRC_Init(unsigned char map)
|
|||
setIR(LIRC_Module);
|
||||
|
||||
if(lirctable->flags&LIRC_RF) {
|
||||
hi_border = 0;
|
||||
lo_border = 1;
|
||||
ir.duty_cycle = 50;
|
||||
freq = 20000;
|
||||
}
|
||||
else {
|
||||
freq = lirctable->freq;
|
||||
if(!freq)
|
||||
freq = 38000;
|
||||
|
||||
if(lirctable->duty_cycle == 0) { //default 50%
|
||||
hi_border = 1;
|
||||
lo_border = 2;
|
||||
}
|
||||
else if(lirctable->duty_cycle <= 25) {
|
||||
hi_border = 1;
|
||||
lo_border = 4;
|
||||
}
|
||||
else if(lirctable->duty_cycle <= 33) {
|
||||
hi_border = 1;
|
||||
lo_border = 3;
|
||||
}
|
||||
else if(lirctable->duty_cycle <= 50) {
|
||||
hi_border = 1;
|
||||
lo_border = 2;
|
||||
}
|
||||
else if(lirctable->duty_cycle <= 66) {
|
||||
hi_border = 2;
|
||||
lo_border = 3;
|
||||
}
|
||||
else { //75%
|
||||
hi_border = 3;
|
||||
lo_border = 4;
|
||||
|
||||
ir.duty_cycle = lirctable->duty_cycle;
|
||||
if(!lirctable->duty_cycle) { //default 50%
|
||||
ir.duty_cycle = 50;
|
||||
}
|
||||
}
|
||||
|
||||
act_freq = freq;
|
||||
PWM_set_frequency(freq);
|
||||
|
||||
T1MR0 = 15000000 / (freq * lo_border);
|
||||
T1MR0 = 15000000 / (freq);
|
||||
|
||||
|
||||
ir.lirc.phead = (lirctable->phead * freq) / 1000000;
|
||||
ir.lirc.shead = (lirctable->shead * freq) / 1000000;
|
||||
|
||||
ir.lirc.plead = (lirctable->plead * freq) / 1000000;
|
||||
|
||||
ir.lirc.actpre_data = (lirctable->pre_data)<<(32-lirctable->pre_data_bits);
|
||||
ir.lirc.pre_data_bits = lirctable->pre_data_bits;
|
||||
ir.lirc.pre_p = (lirctable->pre_p * freq) / 1000000;
|
||||
ir.lirc.pre_s = (lirctable->pre_s * freq) / 1000000;
|
||||
|
||||
ir.lirc.post_p = (lirctable->post_p * freq) / 1000000;
|
||||
ir.lirc.post_s = (lirctable->post_s * freq) / 1000000;
|
||||
ir.lirc.actpost_data = (lirctable->post_data)<<(32-lirctable->post_data_bits);
|
||||
ir.lirc.post_data_bits = lirctable->post_data_bits;
|
||||
|
||||
ir.lirc.ptrail = (lirctable->ptrail * freq) / 1000000;
|
||||
|
||||
ir.lirc.pfoot = (lirctable->pfoot * freq) / 1000000;
|
||||
ir.lirc.sfoot = (lirctable->sfoot * freq) / 1000000;
|
||||
|
||||
ir.lirc.prepeat = (lirctable->prepeat * freq) / 1000000;
|
||||
ir.lirc.srepeat = (lirctable->srepeat * freq) / 1000000;
|
||||
|
||||
ir.lirc.pzero = (lirctable->pzero * freq) / 1000000;
|
||||
ir.lirc.szero = (lirctable->szero * freq) / 1000000;
|
||||
ir.lirc.pone = (lirctable->pone * freq) / 1000000;
|
||||
ir.lirc.sone = (lirctable->sone * freq) / 1000000;
|
||||
ir.lirc.ptwo = (lirctable->ptwo * freq) / 1000000;
|
||||
ir.lirc.stwo = (lirctable->stwo * freq) / 1000000;
|
||||
ir.lirc.pthree = (lirctable->pthree * freq) / 1000000;
|
||||
ir.lirc.sthree = (lirctable->sthree * freq) / 1000000;
|
||||
|
||||
ir.lirc.gap = (lirctable->gap * freq) / 1000000;
|
||||
ir.lirc.repeat_gap = (lirctable->repeat_gap * freq) / 1000000;
|
||||
|
||||
ir.lirc.rc6_bit = lirctable->rc6_bit;
|
||||
ir.lirc.flags = lirctable->flags;
|
||||
ir.lirc.bits = lirctable->bits;
|
||||
ir.lirc.min_repeat = lirctable->min_repeat;
|
||||
|
||||
|
||||
ir.cmd = 0;
|
||||
ir.actcmd = 0;
|
||||
ir.lirc.stop = 0;
|
||||
ir.state = LIRC_IDLE;
|
||||
ir.lirc.bit = 0;
|
||||
ir.lirc.map = map;
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -407,19 +353,19 @@ void LIRC_Send(unsigned long cmd)
|
|||
if(cmd != 0x0000) {
|
||||
|
||||
ir.lirc.pre_data = ir.lirc.actpre_data;
|
||||
ir.actcmd = cmd<<(32-ir.lirc.bits);
|
||||
ir.actcmd = cmd<<(32-lirctable->bits);
|
||||
ir.lirc.post_data = ir.lirc.actpost_data;
|
||||
ir.lirc.stop = 0;
|
||||
ir.lirc.repeats = 0;
|
||||
|
||||
if(ir.toggle & 0x01) {
|
||||
togglemask = (unsigned long)(LIRC.table[ir.lirc.map].toggle_bit_mask) << (32-ir.lirc.post_data_bits);
|
||||
togglemask = (unsigned long)(lirctable->toggle_bit_mask) << (32-lirctable->post_data_bits);
|
||||
ir.lirc.post_data ^= togglemask;
|
||||
|
||||
togglemask = (unsigned long)(LIRC.table[ir.lirc.map].toggle_bit_mask>>ir.lirc.post_data_bits) << (32-ir.lirc.bits);
|
||||
togglemask = (unsigned long)(lirctable->toggle_bit_mask>>lirctable->post_data_bits) << (32-lirctable->bits);
|
||||
ir.actcmd ^= togglemask;
|
||||
|
||||
togglemask = (unsigned long)(LIRC.table[ir.lirc.map].toggle_bit_mask>>(ir.lirc.post_data_bits + ir.lirc.bits)) << (32-ir.lirc.pre_data_bits);
|
||||
togglemask = (unsigned long)(lirctable->toggle_bit_mask>>(lirctable->post_data_bits + lirctable->bits)) << (32-lirctable->pre_data_bits);
|
||||
ir.lirc.pre_data ^= togglemask;
|
||||
}
|
||||
|
||||
|
@ -429,9 +375,9 @@ void LIRC_Send(unsigned long cmd)
|
|||
ir.state++;
|
||||
if(is_RF) {
|
||||
RFasyncmode(true);
|
||||
cc1100_write1(FREQ2,((LIRC.table[ir.lirc.map].freq)>>16) & 0xFF);
|
||||
cc1100_write1(FREQ1,((LIRC.table[ir.lirc.map].freq)>>8) & 0xFF);
|
||||
cc1100_write1(FREQ0,(LIRC.table[ir.lirc.map].freq) & 0xFF);
|
||||
cc1100_write1(FREQ2,((lirctable->freq)>>16) & 0xFF);
|
||||
cc1100_write1(FREQ1,((lirctable->freq)>>8) & 0xFF);
|
||||
cc1100_write1(FREQ0,(lirctable->freq) & 0xFF);
|
||||
cc1100_strobe(STX);
|
||||
}
|
||||
runIR();
|
||||
|
@ -446,7 +392,7 @@ void LIRC_Repeat(void) {
|
|||
void LIRC_Stop(void)
|
||||
{
|
||||
ir.lirc.stop = 1;
|
||||
if(ir.lirc.bits){
|
||||
if(lirctable->bits){
|
||||
while(ir.state != LIRC_IDLE);
|
||||
}
|
||||
|
||||
|
|
|
@ -28,10 +28,10 @@
|
|||
//#define LIRC_SPACE_FIRST 0x0020 /* bits are encoded as space+pulse */
|
||||
//#define LIRC_GOLDSTAR 0x0040 /* encoding found on Goldstar remote */
|
||||
//#define LIRC_GRUNDIG 0x0080 /* encoding found on Grundig remote */
|
||||
//#define LIRC_BO 0x0100 /* encoding found on Bang & Olufsen remote */
|
||||
#define LIRC_RF 0x0100 /* RF ASK/OOK modulator */
|
||||
//#define LIRC_SERIAL 0x0200 /* serial protocol */
|
||||
//#define LIRC_XMP 0x0400 /* XMP protocol */
|
||||
#define LIRC_BO 0x0100 /* encoding found on Bang & Olufsen remote */
|
||||
#define LIRC_RF 0x0200 /* RF ASK/OOK modulator */
|
||||
//#define LIRC_SERIAL 0x0400 /* serial protocol */
|
||||
//#define LIRC_XMP 0x0800 /* XMP protocol */
|
||||
|
||||
/* additinal flags: can be orred together with protocol flag */
|
||||
//#define REVERSE 0x0800
|
||||
|
@ -40,14 +40,15 @@
|
|||
#define LIRC_CONST_LENGTH 0x4000 /* signal length+gap is always constant */
|
||||
#define LIRC_REPEAT_HEADER 0x8000 /* header is also sent before repeat code */
|
||||
|
||||
#define is_rc6 (ir.lirc.flags & LIRC_RC6)
|
||||
#define is_biphase ((ir.lirc.flags & LIRC_RC5) || is_rc6)
|
||||
#define is_rcmm (ir.lirc.flags & LIRC_RCMM)
|
||||
#define is_const (ir.lirc.flags & LIRC_CONST_LENGTH)
|
||||
#define is_RF (ir.lirc.flags & LIRC_RF)
|
||||
#define has_header (ir.lirc.phead && ir.lirc.shead)
|
||||
#define has_foot (ir.lirc.pfoot && ir.lirc.sfoot)
|
||||
#define has_repeat (ir.lirc.prepeat && ir.lirc.srepeat)
|
||||
#define is_rc6 (lirctable->flags & LIRC_RC6)
|
||||
#define is_biphase ((lirctable->flags & LIRC_RC5) || is_rc6)
|
||||
#define is_rcmm (lirctable->flags & LIRC_RCMM)
|
||||
#define is_const (lirctable->flags & LIRC_CONST_LENGTH)
|
||||
#define is_RF (lirctable->flags & LIRC_RF)
|
||||
#define is_BO (lirctable->flags & LIRC_BO) /* flag for b&o specific protocol MN2017325 */
|
||||
#define has_header (lirctable->phead && lirctable->shead)
|
||||
#define has_foot (lirctable->pfoot && lirctable->sfoot)
|
||||
#define has_repeat (lirctable->prepeat && lirctable->srepeat)
|
||||
|
||||
//FS20 Protocol description see http://fhz4linux.info/tiki-index.php?page=FS20%20Protocol
|
||||
#define calcFS20pre(HC1,par1,HC2,par2) ((1<<18) | (HC1<<10) | (par1<<9) | (HC2<<1) | par2)
|
||||
|
|
54
boop/infrared/pwm.c
Normal file
54
boop/infrared/pwm.c
Normal file
|
@ -0,0 +1,54 @@
|
|||
/*
|
||||
pwm.c - pwm control
|
||||
Copyright (C) 2017 <telekatz@gmx.de>
|
||||
|
||||
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 3 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, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "global.h"
|
||||
#include "lpc2220.h"
|
||||
|
||||
void PWM_init(void)
|
||||
{
|
||||
//Set pin P0.21 IR_OUT as PWM
|
||||
PINSEL1 &= ~(3 << (10)); // IO
|
||||
PINSEL1 |= (1 << (10)); // PWM5
|
||||
|
||||
PWMTC = 0; //Timer Counter
|
||||
PWMPR = 0; //Prescale Register
|
||||
PWMPC = 0; //Prescale Counter
|
||||
|
||||
PWMMR0 = 416; // pwm rate
|
||||
PWMMR5 = 0; // pwm value
|
||||
|
||||
PWMLER = 0x21; //Latch Enable
|
||||
PWMMCR = 0x02; //Match Control
|
||||
PWMPCR |= (1<<13);
|
||||
PWMTCR = 0x03;
|
||||
PWMTCR = 0x09;
|
||||
|
||||
}
|
||||
|
||||
void PWM_set_frequency(unsigned long f)
|
||||
{
|
||||
PWMMR0 = 15000000 / f;
|
||||
PWMLER |= 0x01; //Latch Enable
|
||||
|
||||
}
|
||||
|
||||
void PWM_set_IR_duty_cycle(unsigned char d) {
|
||||
PWMMR5 = (PWMMR0 * d) / 100;
|
||||
PWMLER |= 0x20;
|
||||
}
|
||||
|
26
boop/infrared/pwm.h
Normal file
26
boop/infrared/pwm.h
Normal file
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
pwm.h - pwm control
|
||||
Copyright (C) 2017 <telekatz@gmx.de>
|
||||
|
||||
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 3 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, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
void PWM_init(void);
|
||||
void PWM_set_frequency(unsigned long f);
|
||||
void PWM_set_IR_duty_cycle(unsigned char d);
|
||||
|
||||
|
|
@ -31,6 +31,7 @@
|
|||
//#include "sounds.h"
|
||||
//#include "sound3.h"
|
||||
#include "infrared.h"
|
||||
#include "pwm.h"
|
||||
#include "codes.h"
|
||||
#include "encoders.h"
|
||||
#include "ir_selector.h"
|
||||
|
@ -258,6 +259,8 @@ int main(void)
|
|||
initIR();
|
||||
startIrIRQ();
|
||||
|
||||
PWM_init();
|
||||
|
||||
RF_init();
|
||||
load_RF_setting();
|
||||
startRFIRQ();
|
||||
|
|
Loading…
Reference in a new issue