Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LED RSSI - turns white if disconnected (1 sec timeout) #466

Merged
merged 2 commits into from Sep 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 20 additions & 6 deletions src/deck/drivers/src/ledring12.c
Expand Up @@ -683,16 +683,30 @@ static float badRssi = 85, goodRssi = 35;
static void rssiEffect(uint8_t buffer[][3], bool reset)
{
int i;
static int rssiid;
static int isConnectedId, rssiId;
float rssi;
bool isConnected;

rssiid = logGetVarId("radio", "rssi");
rssi = logGetFloat(rssiid);
isConnectedId = logGetVarId("radio", "isConnected");
isConnected = logGetUint(isConnectedId);

rssiId = logGetVarId("radio", "rssi");
rssi = logGetFloat(rssiId);

for (i = 0; i < NBR_LEDS; i++) {
buffer[i][0] = LIMIT(LINSCALE(badRssi, goodRssi, 255, 0, rssi)); // Red (bad)
buffer[i][1] = LIMIT(LINSCALE(badRssi, goodRssi, 0, 255, rssi)); // Green (good)
buffer[i][2] = 0; // Blue
if(isConnected){
buffer[i][0] = LIMIT(LINSCALE(badRssi, goodRssi, 255, 0, rssi)); // Red (bad)
buffer[i][1] = LIMIT(LINSCALE(badRssi, goodRssi, 0, 255, rssi)); // Green (good)
buffer[i][2] = 0; // Blue
}else{
// buffer[i][0] = 255; // Red
// buffer[i][1] = 0; // Green
// buffer[i][2] = 0; // Blue

buffer[i][0] = 100; // Red
buffer[i][1] = 100; // Green
buffer[i][2] = 100; // Blue
}
}
}

Expand Down
12 changes: 8 additions & 4 deletions src/hal/src/radiolink.c
Expand Up @@ -57,6 +57,7 @@ static int radiolinkReceiveCRTPPacket(CRTPPacket *p);

//Local RSSI variable used to enable logging of RSSI values from Radio
static uint8_t rssi;
static bool isConnected;
static uint32_t lastPacketTick;


Expand Down Expand Up @@ -166,10 +167,12 @@ void radiolinkSyslinkDispatch(SyslinkPacket *slp)
ledseqRun(LINK_LED, seq_linkup);
// no ack for broadcasts
} else if (slp->type == SYSLINK_RADIO_RSSI)
{
//Extract RSSI sample sent from radio
memcpy(&rssi, slp->data, sizeof(uint8_t));
}
{
//Extract RSSI sample sent from radio
memcpy(&rssi, slp->data, sizeof(uint8_t)); //rssi will not change on disconnect
}

isConnected = radiolinkIsConnected();
}

static int radiolinkReceiveCRTPPacket(CRTPPacket *p)
Expand Down Expand Up @@ -212,4 +215,5 @@ static int radiolinkSetEnable(bool enable)

LOG_GROUP_START(radio)
LOG_ADD(LOG_UINT8, rssi, &rssi)
LOG_ADD(LOG_UINT8, isConnected, &isConnected)
LOG_GROUP_STOP(radio)