Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b504dd68362a
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a8cb3691c36
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 20, 2020

  1. UartTrigger: undefine PARITY_* from windows.h to avoid namespace conf… 

    …licts. Fixes #255.
    @azonenberg
    azonenberg committed Sep 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1a8cb36 View commit details
Showing with 9 additions and 1 deletion.
  1. +8 −0 scopehal/UartTrigger.h
  2. +1 −1 xptools
8 changes: 8 additions & 0 deletions scopehal/UartTrigger.h
View file
Original file line number Diff line number Diff line change
@@ -37,6 +37,14 @@

#include "SerialTrigger.h"

#ifdef _WIN32
//Our parity type definitions are also found in windows.h!
//Undefine those so we can use ours instead.
#undef PARITY_NONE
#undef PARITY_ODD
#undef PARITY_EVEN
#endif

/**
@brief Trigger when a UART sees a certain data pattern
*/
2 changes: 1 addition & 1 deletion xptools
Submodule xptools updated from 289b8b to 210126