Skip to content

Commit

Permalink
Merge pull request #581 from sstidl/dev
Browse files Browse the repository at this point in the history 
switch units to Mbit/s
  • Loading branch information
@sstidl
sstidl authored Nov 5, 2023
2 parents 32f6e65 + 63583cb commit 74eab59
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions doc.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,8 @@ You can think of this as a finite state machine. These are the states (use getSt
While in state 1, you can only add test points, you cannot change the test settings. When you're done, use selectServer(callback) to select the test point with the lowest ping. This is asynchronous, when it's done, it will call your callback function and move to state 2. Calling setSelectedServer(server) will manually select a server and move to state 2.
* __2__: test point selected, ready to start the test. Use `start()` to begin, this will move to state 3
* __3__: test running. Here, your `onupdate` event callback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your `onupdate` function, with the following items:
- `dlStatus`: download speed in mbps
- `ulStatus`: upload speed in mbps
- `dlStatus`: download speed in Mbit/s
- `ulStatus`: upload speed in Mbit/s
- `pingStatus`: ping in ms
- `jitterStatus`: jitter in ms
- `dlProgress`: progress of the download test as a float 0-1
Expand Down
4 changes: 2 additions & 2 deletions docker/frontend.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,13 +409,13 @@ function initUI(){
<div class="testName">Download</div>
<canvas id="dlMeter" class="meter"></canvas>
<div id="dlText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
<div class="testArea">
<div class="testName">Upload</div>
<canvas id="ulMeter" class="meter"></canvas>
<div id="ulText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
</div>
<div id="ipArea">
Expand Down
4 changes: 2 additions & 2 deletions docker/standalone.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,13 @@ function initUI(){
<div class="testName">Download</div>
<canvas id="dlMeter" class="meter"></canvas>
<div id="dlText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
<div class="testArea">
<div class="testName">Upload</div>
<canvas id="ulMeter" class="meter"></canvas>
<div id="ulText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
</div>
<div id="ipArea">
Expand Down
4 changes: 2 additions & 2 deletions example-multipleServers-full.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,13 +424,13 @@ <h1>LibreSpeed Example</h1>
<div class="testName">Download</div>
<canvas id="dlMeter" class="meter"></canvas>
<div id="dlText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
<div class="testArea">
<div class="testName">Upload</div>
<canvas id="ulMeter" class="meter"></canvas>
<div id="ulText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
</div>
<div id="ipArea">
Expand Down
4 changes: 2 additions & 2 deletions example-multipleServers-pretty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,12 @@ <h1>LibreSpeed Example</h1>
<div class="testArea">
<div class="testName">Download</div>
<div id="dlText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
<div class="testArea">
<div class="testName">Upload</div>
<div id="ulText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
</div>
<div class="testGroup">
Expand Down
4 changes: 2 additions & 2 deletions example-singleServer-customSettings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,12 @@ <h1>LibreSpeed Example</h1>
<div class="testArea">
<div class="testName">Download</div>
<div id="dlText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
<div class="testArea">
<div class="testName">Upload</div>
<div id="ulText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions example-singleServer-full.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,13 @@ <h1>LibreSpeed Example</h1>
<div class="testName">Download</div>
<canvas id="dlMeter" class="meter"></canvas>
<div id="dlText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
<div class="testArea">
<div class="testName">Upload</div>
<canvas id="ulMeter" class="meter"></canvas>
<div id="ulText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
</div>
<div id="ipArea">
Expand Down
4 changes: 2 additions & 2 deletions example-singleServer-gauges.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,13 @@ <h1>LibreSpeed Example</h1>
<div class="testName">Download</div>
<canvas id="dlMeter" class="meter"></canvas>
<div id="dlText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
<div class="testArea">
<div class="testName">Upload</div>
<canvas id="ulMeter" class="meter"></canvas>
<div id="ulText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
</div>
<div id="ipArea">
Expand Down
4 changes: 2 additions & 2 deletions example-singleServer-pretty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ <h1>LibreSpeed Example</h1>
<div class="testArea">
<div class="testName">Download</div>
<div id="dlText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
<div class="testArea">
<div class="testName">Upload</div>
<div id="ulText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
</div>
<div class="testGroup">
Expand Down
4 changes: 2 additions & 2 deletions example-singleServer-progressBar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,12 @@ <h1>LibreSpeed Example</h1>
<div class="testArea">
<div class="testName">Download</div>
<div id="dlText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
<div class="testArea">
<div class="testName">Upload</div>
<div id="ulText" class="meterText"></div>
<div class="unit">Mbps</div>
<div class="unit">Mbit/s</div>
</div>
</div>
<div class="testGroup">
Expand Down
2 changes: 1 addition & 1 deletion results/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function drawImage($speedtest)
$POSITION_Y_WATERMARK = 223 * $SCALE;

// configure labels
$MBPS_TEXT = 'Mbps';
$MBPS_TEXT = 'Mbit/s';
$MS_TEXT = 'ms';
$PING_TEXT = 'Ping';
$JIT_TEXT = 'Jitter';
Expand Down
4 changes: 2 additions & 2 deletions speedtest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
While in state 1, you can only add test points, you cannot change the test settings. When you're done, use selectServer(callback) to select the test point with the lowest ping. This is asynchronous, when it's done, it will call your callback function and move to state 2. Calling setSelectedServer(server) will manually select a server and move to state 2.
- 2: test point selected, ready to start the test. Use start() to begin, this will move to state 3
- 3: test running. Here, your onupdate event callback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your onupdate function, with the following items:
- dlStatus: download speed in mbps
- ulStatus: upload speed in mbps
- dlStatus: download speed in Mbit/s
- ulStatus: upload speed in Mbit/s
- pingStatus: ping in ms
- jitterStatus: jitter in ms
- dlProgress: progress of the download test as a float 0-1
Expand Down

0 comments on commit 74eab59

Please sign in to comment.