david.tahir/QuadMeUp_Crossbow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct way of encoding RC_DATA frame

Browse Source
This commit is contained in:
Pawel Spychalski (DzikuVx)
2017-09-27 22:16:15 +02:00
parent 66a88259f9
commit 458ee9233a
6 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
.gitignore vendored Normal file
View File

7
.vscode/arduino.json vendored
View File

@@ -1,6 +1,7 @@
{ {
"board": "arduino:avr:pro", "board": "sparkfun:avr:promicro",
"configuration": "cpu=16MHzatmega328", "configuration": "cpu=16MHzatmega32U4",
"sketch": "crossbow.ino", "sketch": "crossbow.ino",
"port": "COM5" "port": "COM23",
"output": "./build"
} }

0
build/.gitkeep Normal file
View File

5
common.h
View File

@@ -4,8 +4,7 @@
#define PPM_CHANNEL_COUNT 10 #define PPM_CHANNEL_COUNT 10
#define TX_RC_FRAME_RATE 100 //ms #define TX_RC_FRAME_RATE 5000 //ms
#define CHANNEL_ID 0x01 #define CHANNEL_ID 0x01
#define QSP_PREAMBLE 0x51 #define QSP_PREAMBLE 0x51
@@ -16,8 +15,6 @@
#define PIN_LED 13 #define PIN_LED 13
enum dataStates { enum dataStates {
IDLE, IDLE,
PREAMBLE_RECEIVED, PREAMBLE_RECEIVED,

15
crossbow.ino
View File

@@ -166,7 +166,7 @@ void setup(void) {
#ifdef DEVICE_MODE_TX #ifdef DEVICE_MODE_TX
uint8_t get10bitHighShift(uint8_t channel) { uint8_t get10bitHighShift(uint8_t channel) {
return (2 + (channel * 2)) % 8; return ((channel % 4) * 2) + 2;
} }
uint8_t get10bitLowShift(uint8_t channel) { uint8_t get10bitLowShift(uint8_t channel) {
@@ -197,12 +197,21 @@ void loop(void) {
uint8_t channelValue4 = map(ppmReader.get(i), 1000, 2000, 0, 15) & 0x0f; uint8_t channelValue4 = map(ppmReader.get(i), 1000, 2000, 0, 15) & 0x0f;
if (i < 4) { if (i < 4) {
/*
* First 4 channels encoded with 10 bits
*/
uint8_t bitIndex = i + (i / 4); uint8_t bitIndex = i + (i / 4);
qspPayload[bitIndex] |= (channelValue10 >> get10bitHighShift(i)) & (0x03ff >> get10bitHighShift(i)); //255 | shift right 2 bits qspPayload[bitIndex] |= (channelValue10 >> get10bitHighShift(i)) & (0x3ff >> get10bitHighShift(i));
qspPayload[bitIndex + 1] |= (channelValue10 << get10bitLowShift(i)) & 0xff << (8 - get10bitHighShift(i)); //192 | shift left 6 bits qspPayload[bitIndex + 1] |= (channelValue10 << get10bitLowShift(i)) & 0xff << (8 - get10bitHighShift(i));
} else if (i == 4 || i == 5) { } else if (i == 4 || i == 5) {
/*
* Next 2 with 8 bits
*/
qspPayload[i + 1] |= channelValue8; qspPayload[i + 1] |= channelValue8;
} else if (i == 6) { } else if (i == 6) {
/*
* And last 4 with 4 bits per channel
*/
qspPayload[7] |= (channelValue4 << 4) & B11110000; qspPayload[7] |= (channelValue4 << 4) & B11110000;
} else if (i == 7) { } else if (i == 7) {
qspPayload[7] |= channelValue4 & B00001111; qspPayload[7] |= channelValue4 & B00001111;

30
scratch.txt Normal file
View File

@@ -0,0 +1,30 @@
/*
FIXME this should work, but does not...
channel get10bitHighShift get10bitLowShift
0 2 6
1 4 4
2 6 2
3 8 0
if (i < 4) {
uint8_t bitIndex = i + (i / 4);
qspPayload[bitIndex] |= (channelValue10 >> get10bitHighShift(i)) & (0xff >> get10bitHighShift(i));
qspPayload[bitIndex + 1] |= (channelValue10 << get10bitLowShift(i)) & (0xff << (8 - get10bitHighShift(i)));
}
if (i == 0) {
qspPayload[0] |= (channelValue10 >> 2) & B11111111; //255
qspPayload[1] |= (channelValue10 << 6) & B11000000; //192
} else if (i == 1) {
qspPayload[1] |= (channelValue10 >> 4) & B00111111; //63
qspPayload[2] |= (channelValue10 << 4) & B11110000; //240
} else if (i == 2) {
qspPayload[2] |= (channelValue10 >> 6) & B00001111; //15
qspPayload[3] |= (channelValue10 << 2) & B11111100; //252
} else if (i == 3) {
qspPayload[3] |= (channelValue10 >> 8) & B00000011; //3
qspPayload[4] |= channelValue10 & B11111111; //255
}
*/