Skip to content

Commit ddedf2a

Browse files
committed
updated Shifter conditions
1 parent 10036e7 commit ddedf2a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

index.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ <h2 style="color: var(--bs-alert-color)">Advanced configurations</h2>
13991399
<label class="form-check-label" for="SHIFT_REGISTER_USE_HW_SPI">Use the board SPI to send data to the shit
14001400
register</label>
14011401
</div>
1402-
<div ng-if-init ng-if="!DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_USE_HW_SPI']">
1402+
<div ng-if-init ng-if="!DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_USE_HW_SPI'] && !DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_CUSTOM_CALLBACK']">
14031403
<label for="SHIFT_REGISTER_CLK" class="form-label">Shift registers clock pin</label>
14041404
<select class="form-select form-select-md" name="SHIFT_REGISTER_CLK" id="SHIFT_REGISTER_CLK"
14051405
ng-model="DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_CLK']"
@@ -1418,13 +1418,14 @@ <h2 style="color: var(--bs-alert-color)">Advanced configurations</h2>
14181418
model-scope-name="DYNAMIC.SHIFT_REGISTER.SHIFT_REGISTER_DELAY_CYCLES" var-type="int"
14191419
config-file="boardmap" ng-init="DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_DELAY_CYCLES']=0">
14201420
</div>
1421+
</div>
14211422
<label for="IC74HC595_COUNT" class="form-label">Number of chained IC74HC595's: <span
14221423
ng-bind="IC74HC595_COUNT"></label>
14231424
<input type="range" class="form-range" min="0" max="7" name="IC74HC595_COUNT" id="IC74HC595_COUNT"
14241425
ng-model="IC74HC595_COUNT" model-scope-name="IC74HC595_COUNT" var-type="int" config-file="boardmap"
14251426
ng-init="IC74HC595_COUNT=0">
14261427
<div ng-if-init ng-if="IC74HC595_COUNT!=0">
1427-
<div ng-if-init ng-if="!DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_USE_HW_SPI']">
1428+
<div ng-if-init ng-if="!DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_USE_HW_SPI'] && !DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_CUSTOM_CALLBACK']">
14281429
<label for="SHIFT_REGISTER_SDO" class="form-label">IC74HC595's data pin</label>
14291430
<select class="form-select form-select-md" name="SHIFT_REGISTER_SDO" id="SHIFT_REGISTER_SDO"
14301431
ng-model="DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_SDO']"
@@ -1455,7 +1456,7 @@ <h2 style="color: var(--bs-alert-color)">Advanced configurations</h2>
14551456
ng-model="IC74HC165_COUNT" model-scope-name="IC74HC165_COUNT" var-type="int" config-file="boardmap"
14561457
ng-init="IC74HC165_COUNT=0">
14571458
<div ng-if-init ng-if="IC74HC165_COUNT!=0">
1458-
<div ng-if-init ng-if="!DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_USE_HW_SPI']">
1459+
<div ng-if-init ng-if="!DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_USE_HW_SPI'] && !DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_CUSTOM_CALLBACK']">
14591460
<label for="SHIFT_REGISTER_SDI" class="form-label">IC74HC165's data pin</label>
14601461
<select class="form-select form-select-md" name="SHIFT_REGISTER_SDI" id="SHIFT_REGISTER_SDI"
14611462
ng-model="DYNAMIC['SHIFT_REGISTER']['SHIFT_REGISTER_SDI']"
@@ -1480,7 +1481,7 @@ <h2 style="color: var(--bs-alert-color)">Advanced configurations</h2>
14801481
{{DYNAMIC['SHIFT_REGISTER']['IC74HC165_LOAD']}} pin is not defined for your board!
14811482
</div>
14821483
</div>
1483-
</div>
1484+
14841485
</fieldset>
14851486
<fieldset ng-if="VERSION<11103">
14861487
<legend>74HC595 IO extender</legend>

0 commit comments

Comments
 (0)