gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-04 18:48:11 +00:00
Code Issues Projects Releases Wiki Activity

Update end points and map function

Browse Source
This commit is contained in:
pascallanger 2017-01-24 16:55:01 +01:00
parent 26e3119ef3
commit eb164c511f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Multiprotocol/WK2x01_cyrf6936.ino
View File

@ -77,13 +77,9 @@ static void __attribute__((unused)) WK_build_bind_pkt(const uint8_t *init)
WK_add_pkt_crc(init[4]); WK_add_pkt_crc(init[4]);
} }
static int16_t __attribute__((unused)) WK_map_16(int32_t x, int32_t in_min, int32_t in_max, int32_t out_min, int32_t out_max)
{
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
}
static int16_t __attribute__((unused)) WK_get_channel(uint8_t ch, int32_t scale, int16_t center, int16_t range) static int16_t __attribute__((unused)) WK_get_channel(uint8_t ch, int32_t scale, int16_t center, int16_t range)
{ {
int16_t value = WK_map_16(Servo_data[CH_AETR[ch]],servo_min_100,servo_max_100,-scale,scale)+center; int16_t value = map(Servo_data[CH_AETR[ch]],servo_min_100,servo_max_100,-scale,scale)+center;
if (value < center - range) value = center - range; if (value < center - range) value = center - range;
if (value > center + range) value = center + range; if (value > center + range) value = center + range;
return value; return value;
@ -270,7 +266,7 @@ static void __attribute__((unused)) WK_build_data_pkt_2801()
for (uint8_t i = 0; i < 8; i++) for (uint8_t i = 0; i < 8; i++)
{ {
if (i == 4) { offset = 1; } if (i == 4) { offset = 1; }
int16_t value = WK_get_channel(i, 0x190, 0, 0x3FF); int16_t value = WK_get_channel(i, 0x1C2, 0, 0x3FF);
uint16_t mag = value < 0 ? -value : value; uint16_t mag = value < 0 ? -value : value;
packet[i+offset] = mag & 0xff; packet[i+offset] = mag & 0xff;
msb = (msb << 2) | ((mag >> 8) & 0x03); msb = (msb << 2) | ((mag >> 8) & 0x03);