Skip to content

Commit

Permalink
Merge branch 'bug-fix_embedded_links' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
jdbrant3 committed Sep 4, 2024
2 parents 7a4e42f + a22d845 commit 74dfaae
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ Then, to deploy to production, log into the Heroku Dashboard, verify that stagin
Check the deployment succeeded on:

- The production deployed website
- <http://ljsimpleregisterlookup-staging.herokuapp.com/>
- <http://ljsimpleregisterlookup.herokuapp.com/>
- The embedded Modbus Map on our webite which pulls from prod (link may have changed)
- <https://labjack.com/pages/support?doc=%2Fdatasheets%2Ft-series-datasheet%2F31-modbus-map-t-series-datasheet%2F>

Expand Down
2 changes: 1 addition & 1 deletion ljm_constants
4 changes: 2 additions & 2 deletions static/js/simple_register_lookup_core.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,10 @@ function fnFormatDetails( oTable, nTr, detailIndices)
<li>This register may be streamed</li>
{{/streamable}}
{{#usesRAM}}
<li>This register uses system RAM. The maximum RAM is 64KB. For more information, see <a href="https://labjack.com/support/datasheets/t-series/hardware-overview/ram" target="_top">4.4 RAM</a></li>
<li>This register uses system RAM. The maximum RAM is 64KB. For more information, see <a href="https://support.labjack.com/docs/4-0-hardware-overview-t-series-datasheet#id-4.0HardwareOverview%5BT-SeriesDatasheet%5D-RAM" target="_top">4.4 RAM</a></li>
{{/usesRAM}}
{{#isBuffer}}
<li>This register is a <em><a href="https://labjack.com/support/datasheets/t7/communication/modbus-map/buffer-registers" target="_top">buffer register</a></em></li>
<li>This register is a <em><a href="https://support.labjack.com/docs/3-1-modbus-map-t-series-datasheet#id-3.1ModbusMap%5BT-SeriesDatasheet%5D-BufferRegisters" target="_top">buffer register</a></em></li>
{{/isBuffer}}
{{#devices}}
<li>{{device}}-specific:
Expand Down
4 changes: 2 additions & 2 deletions templates/tag_summary_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ <h6>{{ get_full_name(orig_subtag) }}</h6>
<li>This register may be streamed</li>
{% endif %}
{% if subtag.unresolved.isBuffer %}
<li>This register is a <a href="https://labjack.com/support/datasheets/t7/communication/modbus-map/buffer-registers">Buffer Register</a></li>
<li>This register is a <a href="https://support.labjack.com/docs/3-1-modbus-map-t-series-datasheet#id-3.1ModbusMap%5BT-SeriesDatasheet%5D-BufferRegisters">Buffer Register</a></li>
{% endif %}
{% if subtag.unresolved.usesRAM %}
<li>This register uses system RAM. The maximum RAM is 64KB. For more information, see <a href="/support/datasheets/t-series/hardware-overview/ram">4.4 RAM</a></li>
<li>This register uses system RAM. The maximum RAM is 64KB. For more information, see <a href="https://support.labjack.com/docs/4-0-hardware-overview-t-series-datasheet#id-4.0HardwareOverview%5BT-SeriesDatasheet%5D-RAM">4.4 RAM</a></li>
{% endif %}
{% for unres_device in subtag.unresolved.devices %}
{% if unres_device.description or unres_device.default or unres_device.fwmin %}
Expand Down

0 comments on commit 74dfaae

Please sign in to comment.