Update URLs and general tidy

JeremyWong0715 · Nov 23, 2015 · 6b54762 · 6b54762
1 parent dd51a05
commit 6b54762
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 17 deletions.
diff --git a/include/ola/rdm/OpenLightingEnums.h b/include/ola/rdm/OpenLightingEnums.h
@@ -35,8 +35,11 @@ namespace rdm {
 
 /**
  * Please discuss on [email protected] before claiming additional
- * manufacturer PIDs and update http://opendmx.net/index.php/Open_Lighting_PIDs
- * ANSI E1.20 section 6.2.10.2 Parameter ID (PID) for info on assigning
+ * manufacturer PIDs and update
+ * https://wiki.openlighting.org/index.php/Open_Lighting_PIDs
+ * N.B. This list may only include PIDs relevant to OLA, not other Open
+ * Lighting Project products.
+ * See ANSI E1.20 section 6.2.10.2 Parameter ID (PID) for info on assigning
  * manufacturer PIDs, although we're not currently sticking entirely to the
  * specification, like a number of other companies
  */
@@ -49,7 +52,7 @@ typedef enum {
 
 /**
  * Also see the list here
- * http://www.opendmx.net/index.php/Open_Lighting_Allocations#RDM_Model_Numbers
+ * https://wiki.openlighting.org/index.php/Open_Lighting_Allocations#RDM_Model_Numbers
  */
 typedef enum {
   // OLA Dummy RDM Responder

diff --git a/include/olad/PortConstants.h b/include/olad/PortConstants.h
@@ -25,8 +25,9 @@
  * @{
  * @file PortConstants.h
  * @brief Different priority modes and priority capabilities. Please make sure
- * and visit [Merging Algorithms]
- * (http://opendmx.net/index.php/OLA_Merging_Algorithms) for more information.
+ * to visit [Merging Algorithms]
+ * (https://wiki.openlighting.org/index.php/OLA_Merging_Algorithms) for more
+ * information.
  * @}
  */
 

diff --git a/olad/plugin_api/Universe.cpp b/olad/plugin_api/Universe.cpp
@@ -690,7 +690,7 @@ void Universe::HTPMergeSources(const vector<DmxSource> &sources) {
 /*
  * Merge all port/client sources.
  * This does a priority based merge as documented at:
- * http://opendmx.net/index.php/OLA_Merging_Algorithms
+ * https://wiki.openlighting.org/index.php/OLA_Merging_Algorithms
  * @param port the input port that changed or NULL
  * @param client the client that changed or NULL
  * @returns true if the data for this universe changed, false otherwise

diff --git a/plugins/dummy/DummyPort.h b/plugins/dummy/DummyPort.h
@@ -102,7 +102,7 @@ class DummyPort: public BasicOutputPort {
   void HandleBroadcastAck(broadcast_request_tracker *tracker,
                           ola::rdm::RDMReply *reply);
 
-  // See http://www.opendmx.net/index.php/Open_Lighting_Allocations
+  // See https://wiki.openlighting.org/index.php/Open_Lighting_Allocations
   // Do not change.
   static const unsigned int kStartAddress = 0xffffff00;
 };

diff --git a/plugins/osc/README b/plugins/osc/README
@@ -9,8 +9,8 @@ classes. Most of the documentation is inline with the code so please keep it up
 to date if you change anything.
 
 Before we begin you should do the following:
- * Read http://www.opendmx.net/index.php/OLA_developer_info which provides an
-   overview of some of the classes we'll use.
+ * Read https://wiki.openlighting.org/index.php/OLA_developer_info which
+   provides an overview of some of the classes we'll use.
  * Have an understanding of the map & vector classes from the STL -
    http://www.sgi.com/tech/stl/ or http://www.cplusplus.com/reference/stl/ .
  * Know something about the OSC specification:

diff --git a/plugins/usbdmx/VellemanK8062.cpp b/plugins/usbdmx/VellemanK8062.cpp
@@ -94,7 +94,7 @@ libusb_device_handle *OpenVellemenWidget(LibUsbAdaptor *adaptor,
   }
 
   // determine the max packet size, see
-  // http://opendmx.net/index.php/Velleman_K8062_Upgrade
+  // https://wiki.openlighting.org/index.php/Velleman_K8062_Upgrade
   // The standard size is 8.
   *chunk_size = DEFAULT_CHUNK_SIZE;
   if (config &&

diff --git a/plugins/usbpro/UsbProWidgetDetector.cpp b/plugins/usbpro/UsbProWidgetDetector.cpp
@@ -30,8 +30,8 @@
  * Requests are sent at an interval specified by message_interval in the
  * constructor. Of these, the only message a widget must respond to is
  * SERIAL_LABEL. The other two messages are part of the Usb Pro Extensions
- * (http://www.opendmx.net/index.php/USB_Protocol_Extensions) and allow us to
- * determine more specfically what type of device this is.
+ * (https://wiki.openlighting.org/index.php/USB_Protocol_Extensions) and allow
+ * us to determine more specfically what type of device this is.
  *
  * If the widget responds to SERIAL_LABEL the on_success callback is run.
  * Otherwise on_failure is run. It's important you register callbacks for each

diff --git a/plugins/usbpro/UsbSerialPlugin.cpp b/plugins/usbpro/UsbSerialPlugin.cpp
@@ -88,7 +88,8 @@ string UsbSerialPlugin::Description() const {
 " - Enttec DMX USB Pro & USB Pro Mk II\n"
 " - Robe Universe Interface\n"
 "\n"
-"See http://opendmx.net/index.php/USB_Protocol_Extensions for more info.\n"
+"See https://wiki.openlighting.org/index.php/USB_Protocol_Extensions for \n"
+"more info.\n"
 "\n"
 "--- Config file : ola-usbserial.conf ---\n"
 "\n"

diff --git a/plugins/usbpro/WidgetDetectorThread.h b/plugins/usbpro/WidgetDetectorThread.h
@@ -152,7 +152,7 @@ class WidgetDetectorThread: public ola::thread::Thread {
     static const unsigned int SCAN_INTERVAL_MS = 20000;
 
     // This is how device identification is done, see
-    // http://opendmx.net/index.php/USB_Protocol_Extensions
+    // https://wiki.openlighting.org/index.php/USB_Protocol_Extensions
     // OPEN_LIGHTING_ESTA_CODE is in Constants.h
 
     // DmxKing Device Models

diff --git a/tools/ola_trigger/contrib/mac_itunes.conf b/tools/ola_trigger/contrib/mac_itunes.conf
@@ -1,5 +1,5 @@
 # OLA Trigger Config to control itunes
-# See http://www.opendmx.net/index.php/OLA_DMX_Trigger
+# See https://wiki.openlighting.org/index.php/OLA_DMX_Trigger
 # Copyright (C) 2011 Simon Newton
 
 # Variable definitions

diff --git a/tools/ola_trigger/contrib/mac_volume.conf b/tools/ola_trigger/contrib/mac_volume.conf
@@ -1,5 +1,5 @@
 # OLA Trigger Config to adjust the volume on Mac OS X
-# See http://www.opendmx.net/index.php/OLA_DMX_Trigger
+# See https://wiki.openlighting.org/index.php/OLA_DMX_Trigger
 # Copyright (C) 2011 Simon Newton
 
 # Triggers

diff --git a/tools/rdm/static/rdmtests.html b/tools/rdm/static/rdmtests.html
@@ -295,7 +295,7 @@
         <img src='/static/images/logo.png' width='111' height='48' alt='Logo'>
         <span id='main-title'>RDM Responder Tests &amp; Publisher</span>
         <span id='top-right'>
-          <a href='http://www.opendmx.net/index.php/Using_the_RDM_Test_UI' class='external' target='_blank'>Help</a>
+          <a href='https://wiki.openlighting.org/index.php/Using_the_RDM_Test_UI' class='external' target='_blank'>Help</a>
         </span>
       </div>
     </div>