Skip to content

Commit

Permalink
Merge branch '0.10' of https://github.com/openlightingproject/ola int…
Browse files Browse the repository at this point in the history
…o master-resync
  • Loading branch information
peternewman committed Feb 17, 2018
2 parents 9fbd4e4 + 23cff45 commit d3cd197
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
22 changes: 22 additions & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,25 @@ const uint8_t BaseRobeWidget::SOM;
'%s attempted to get %s which wasn\'t declared' %
'%s attempted to set %s which wasn\'t declared' %
'min': numpy.amin(array),
void Syncronize();
SC_E133_NONEXISTANT_ENDPOINT = 0x0005,
saver_thread.Syncronize();
void FilePreferenceSaverThread::Syncronize() {
Mutex syncronize_mutex;
syncronize_mutex.Lock();
&syncronize_mutex));
condition_var.Wait(&syncronize_mutex);
ola::e133::SC_E133_NONEXISTANT_ENDPOINT,
case ola::e133::SC_E133_NONEXISTANT_ENDPOINT:
*status_code = ola::e133::SC_E133_NONEXISTANT_ENDPOINT;
case ola::e133::SC_E133_NONEXISTANT_ENDPOINT:
* @brief A LibUsbAdaptor for use with Syncronous widgets.
* When using syncronous mode, we don't have the requirement of interacting
class SyncronousLibUsbAdaptor : public BaseLibUsbAdaptor {
SyncronousLibUsbAdaptor() {}
DISALLOW_COPY_AND_ASSIGN(SyncronousLibUsbAdaptor);
* @brief A LibUsbAdaptor for use with Asyncronous widgets.
* Asyncronous mode requires notifying the LibUsbThread when handles are opened
class AsyncronousLibUsbAdaptor : public BaseLibUsbAdaptor {
explicit AsyncronousLibUsbAdaptor(class LibUsbThread *thread)
DISALLOW_COPY_AND_ASSIGN(AsyncronousLibUsbAdaptor);
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,6 @@ matrix:
- os: linux
dist: trusty
env: TASK='spellintian-duplicates'
- os: linux
dist: trusty
env: TASK='codespell'

env:
global:
Expand Down
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ x/y/2018 ola-0.10.7
*

Bugs:
* Fix the build on Windows
* Entire codebase now passes codespell testing
*

Internal:
Expand Down

0 comments on commit d3cd197

Please sign in to comment.