Skip to content

Commit 720291d

Browse files
committed
Bandaid for broken PR: disabled R&S trigger classes (see #1049)
1 parent 8385019 commit 720291d

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

scopehal/Trigger.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* libscopehal *
44
* *
5-
* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors *
5+
* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors *
66
* All rights reserved. *
77
* *
88
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
@@ -82,6 +82,9 @@ Trigger::~Trigger()
8282
*/
8383
void Trigger::DoAddTriggerClass(string name, CreateProcType proc)
8484
{
85+
if(m_createprocs.find(name) != m_createprocs.end())
86+
LogFatal("Tried to create a second trigger type called \"%s\"\n", name.c_str());
87+
8588
m_createprocs[name] = proc;
8689
}
8790

scopehal/Trigger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* libscopehal *
44
* *
5-
* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors *
5+
* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors *
66
* All rights reserved. *
77
* *
88
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *

scopehal/scopehal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* libscopehal *
44
* *
5-
* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors *
5+
* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors *
66
* All rights reserved. *
77
* *
88
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
@@ -314,14 +314,14 @@ void DriverStaticInit()
314314
AddTriggerClass(SlewRateTrigger);
315315
AddTriggerClass(UartTrigger);
316316
AddTriggerClass(WindowTrigger);
317-
317+
/*
318318
AddTriggerClass(RSRTB2kEdgeTrigger);
319319
AddTriggerClass(RSRTB2kLineTrigger);
320320
AddTriggerClass(RSRTB2kRiseTimeTrigger);
321321
AddTriggerClass(RSRTB2kRuntTrigger);
322322
AddTriggerClass(RSRTB2kTimeoutTrigger);
323323
AddTriggerClass(RSRTB2kVideoTrigger);
324-
AddTriggerClass(RSRTB2kWidthTrigger);
324+
AddTriggerClass(RSRTB2kWidthTrigger);*/
325325
}
326326

327327
string GetDefaultChannelColor(int i)

0 commit comments

Comments
 (0)