Skip to content

Commit

Permalink
fixed resource colors in func gen select channels page
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Jun 14, 2021
1 parent 66cb31c commit 6d3c238
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/eez/function_generator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,9 @@ class FunctionGeneratorPage : public SetPage {
static const int PAGE_SIZE = 4;

void pageAlloc() {
hmi::selectSlot(-1);
selectChannel(nullptr);

for (int i = 0; i < g_selectedResources.m_numResources; i++) {
int slotIndex;
int subchannelIndex;
Expand Down Expand Up @@ -679,6 +682,8 @@ class FunctionGeneratorSelectChannelsPage : public SetPage {
static const int PAGE_SIZE = 7;

void pageAlloc() {
AllResources::reset();

m_selectedChannelsOrig = 0;
for (int i = 0; i < g_functionGeneratorPage.m_selectedResources.m_numResources; i++) {
m_selectedChannelsOrig |= ((uint64_t)1 << g_functionGeneratorPage.m_selectedResources.m_waveformParameters[i].absoluteResourceIndex);
Expand Down

0 comments on commit 6d3c238

Please sign in to comment.