projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sparse value store
[svn42.git]
/
rf433rcv
/
teensy
/
example.c
diff --git
a/rf433rcv/teensy/example.c
b/rf433rcv/teensy/example.c
index
ebf77e2
..
df393ab
100644
(file)
--- a/
rf433rcv/teensy/example.c
+++ b/
rf433rcv/teensy/example.c
@@
-28,18
+28,24
@@
#include "usb_rawhid.h"
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
#include "usb_rawhid.h"
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
-#define RF_SEND_BUFFER_LEN_MAX 128
+#define RF_SEND_BUFFER_LEN_MAX 502
+
+union multiint {
+ uint16_t u16;
+ uint8_t u8[2];
+} __attribute__((packed));
+
volatile uint16_t output_count=0;
volatile uint8_t active_buffer=0;
volatile uint16_t send_buffer=0;
volatile uint8_t capture=0;
volatile uint16_t output_count=0;
volatile uint8_t active_buffer=0;
volatile uint16_t send_buffer=0;
volatile uint8_t capture=0;
-volatile uint8_t rf_send=0; //count of bits in rf_send_buffer that should be sent
-volatile uint8_t rf_send_reload=0; //count of bits in rf_send_buffer that should be sent
-volatile uint8_t rf_send_reload_count=0; // number of repetitions (times rf_send gets reloaded;
+volatile uint16_t rf_send_buf_pos=0; //count of bits in rf_send_buffer that should be sent
+volatile union multiint rf_send_buf_len; //count of bits in rf_send_buffer that should be sent
+volatile uint8_t rf_send_count=0; // number of repetitions (times rf_send gets reloaded;
uint8_t read_buffer[64]; // buffer for reading usb signals
uint8_t write_buffer[2][64]; // buffer for writing usb signals
uint8_t rf_send_buffer[RF_SEND_BUFFER_LEN_MAX]; // buffer for sending rf433 signals
uint8_t read_buffer[64]; // buffer for reading usb signals
uint8_t write_buffer[2][64]; // buffer for writing usb signals
uint8_t rf_send_buffer[RF_SEND_BUFFER_LEN_MAX]; // buffer for sending rf433 signals
-uint8_t rf_send_buffer_len=0;
+uint16_t rf_send_buf_offset=0;
void reset()
void reset()
@@
-85,10
+91,10
@@
int main(void)
DDRF|=3;
PORTF&=~1;
// Configure timer 0 to generate a timer overflow interrupt every
DDRF|=3;
PORTF&=~1;
// Configure timer 0 to generate a timer overflow interrupt every
- // 200*8 clock cycles, 100us
+ // 100*8 clock cycles, 50us
TCCR0A = 1<<WGM01;
TCCR0B = 1<<CS01;
TCCR0A = 1<<WGM01;
TCCR0B = 1<<CS01;
- OCR0A = 249;
+ OCR0A = 99;
TCNT0 = 0;
TIMSK0 = (1<<OCIE0A);
TCNT0 = 0;
TIMSK0 = (1<<OCIE0A);
@@
-113,32
+119,37
@@
int main(void)
capture=0;
else if (read_buffer[0]=='f') //fill send buffer
{
capture=0;
else if (read_buffer[0]=='f') //fill send buffer
{
- int8_t byte_rem = r-1;
- while(byte_rem && rf_send_buffer_len<RF_SEND_BUFFER_LEN_MAX)
+ int8_t buffer_pos = 1;
+ if(!rf_send_buf_offset) {
+ rf_send_buf_len.u8[1]=read_buffer[1];
+ rf_send_buf_len.u8[0]=read_buffer[2];
+ buffer_pos+=2;
+ }
+ while(buffer_pos < r && rf_send_buf_offset<RF_SEND_BUFFER_LEN_MAX)
{
{
- rf_send_buffer[rf_send_buffer_len]=read_buffer[r-byte_rem];
- rf_send_buffer_len++;
- byte_rem--;
+ rf_send_buffer[rf_send_buf_offset]=read_buffer[buffer_pos];
+ rf_send_buf_offset++;
+ buffer_pos++;
}
}
else if (read_buffer[0]=='c') // clear send buffer
{
}
}
else if (read_buffer[0]=='c') // clear send buffer
{
- rf_send_buffer_len=0;
+ rf_send_buf_offset=0;
}
else if (read_buffer[0]=='s') //send
{
}
else if (read_buffer[0]=='s') //send
{
+ //write_buffer[0][0]=rf_send_buf_len.u8[1];
+ //write_buffer[0][1]=rf_send_buf_len.u8[0];
+ //usb_rawhid_send(write_buffer, 23);
capture=0;
capture=0;
- if (r>2)
- rf_send_reload=rf_send_buffer_len*8-read_buffer[2]; // substract bit offset
- else
- rf_send_reload=rf_send_buffer_len*8;
- rf_send_reload_count=read_buffer[1];
+ rf_send_buf_pos=0;
+ rf_send_count=read_buffer[1]+1;
}
}
if (send_buffer)
{
send_buffer=0;
}
}
if (send_buffer)
{
send_buffer=0;
- usb_rawhid_send(write_buffer[active_buffer?0:1], 45);
+ usb_rawhid_send(write_buffer[active_buffer?0:1], 23);
}
}
}
}
}
}
@@
-147,23
+158,24
@@
int main(void)
ISR(TIMER0_COMPA_vect)
{
PORTF^=2;
ISR(TIMER0_COMPA_vect)
{
PORTF^=2;
- if (rf_send)
+ if (rf_send_count && rf_send_buf_pos<rf_send_buf_len.u16)
{
{
- if (rf_send_buffer[rf_send/8] & 0x80)
+ if ( rf_send_buffer[rf_send_buf_pos/8] & (1<< (rf_send_buf_pos%8)))
{
PORTF|=1;
} else {
PORTF&=~1;
}
{
PORTF|=1;
} else {
PORTF&=~1;
}
- rf_send_buffer[rf_send/8]<<=1;
- rf_send--;
- } else if (rf_send_reload_count) {
- rf_send=rf_send_reload;
+ //rf_send_buffer[rf_send/8]>>=1;
+ rf_send_buf_pos++;
+ } else if (rf_send_count) {
+ rf_send_buf_pos=0;
+ rf_send_count--;
} else {
} else {
- PORTF&=~1;
+ PORTF&=~1;
if (capture) {
write_buffer[active_buffer][output_count/8]<<=1;
if (capture) {
write_buffer[active_buffer][output_count/8]<<=1;
- write_buffer[active_buffer][output_count++/8]|=PINB&1;
+ write_buffer[active_buffer][output_count++/8]|=PIND&1;
if (output_count>=64*8)
{
output_count=0;
if (output_count>=64*8)
{
output_count=0;