Merge branch 'KevinBoergens-master' into testing

open-ephys · Sep 17, 2018 · 294aa10 · 294aa10
2 parents 1b780c5 + b803e3d
commit 294aa10
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/Plugins/RhythmNode/RHD2000Editor.cpp b/Source/Plugins/RhythmNode/RHD2000Editor.cpp
@@ -386,7 +386,7 @@ void FPGAchannelComponent::setImpedanceValues(float mag, float phase)
     if (impedance != nullptr)
     {
         if (mag > 10000)
-            impedance->setText(String(mag/1e6,2)+" mOhm, "+String((int)phase) + " deg",juce::NotificationType::dontSendNotification);
+            impedance->setText(String(mag/1e6,2)+" MOhm, "+String((int)phase) + " deg",juce::NotificationType::dontSendNotification);
         else if (mag > 1000)
             impedance->setText(String(mag/1e3,0)+" kOhm, "+String((int)phase) + " deg" ,juce::NotificationType::dontSendNotification);
         else