Skip to content

Commit

Permalink
profile save and recall update
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Jan 28, 2020
1 parent 857e3f8 commit b84dcd5
Show file tree
Hide file tree
Showing 5 changed files with 245 additions and 152 deletions.
2 changes: 1 addition & 1 deletion src/eez/modules/mcu/ethernet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ osThreadDef(g_ethernetTask, mainLoop, osPriorityNormal, 0, 1024);
#pragma GCC diagnostic pop
#endif

osMessageQDef(g_ethernetMessageQueue, 10, uint32_t);
osMessageQDef(g_ethernetMessageQueue, 20, uint32_t);
osMessageQId(g_ethernetMessageQueueId);

static osThreadId g_ethernetTaskHandle;
Expand Down
9 changes: 6 additions & 3 deletions src/eez/modules/psu/list_program.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void resetChannelList(Channel &channel) {
g_channelsLists[i].currentListLength = 0;
g_channelsLists[i].dwellListLength = 0;

g_channelsLists[i].changed = false;
g_channelsLists[i].changed = true;

g_channelsLists[i].count = 1;

Expand Down Expand Up @@ -622,14 +622,17 @@ bool getCurrentDwellTime(Channel &channel, int32_t &remaining, uint32_t &total)
}

void abort() {
bool sync = false;
for (int i = 0; i < CH_NUM; ++i) {
if (g_execution[i].counter >= 0) {
g_execution[i].counter = -1;
channel_dispatcher::outputEnableOnNextSync(Channel::get(i), false);
sync = true;
}
}

channel_dispatcher::syncOutputEnable();
if (sync) {
channel_dispatcher::syncOutputEnable();
}
}

} // namespace list
Expand Down
Loading

0 comments on commit b84dcd5

Please sign in to comment.