Skip to content

Commit 51e3ce5

Browse files
committed
2.3.6: minor update
1 parent 6c19bf3 commit 51e3ce5

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

wepsim_web/wepsim_uielto_registers.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@
191191
var logical_defined = [] ;
192192
for (var index=0; index < sim_eltos.BR.length; index++)
193193
{
194-
if (typeof SIMWARE.registers[index] !== "undefined") {
195-
logical_defined = SIMWARE.registers[index] ;
196-
break;
197-
}
194+
if (typeof SIMWARE.registers[0].registers[index] !== "undefined") { // TODO: 0 -> rf_index
195+
logical_defined = SIMWARE.registers[0].registers[index] ;
196+
break;
197+
}
198198
}
199199

200200
// make menu
@@ -257,26 +257,26 @@
257257
}
258258
}
259259

260-
function wepsim_refresh_rf_names_mkname ( disp_name, SIMWARE, index, logical_index )
260+
function wepsim_refresh_rf_names_mkname ( disp_name, SIMWARE, rf_index, index, logical_index )
261261
{
262262
var br_value = "" ;
263263

264264
// numerical name
265-
if ( ('logical' != disp_name) || (typeof SIMWARE.registers[index] == "undefined") ) {
265+
if ( ('logical' != disp_name) || (typeof SIMWARE.registers[rf_index].registers[index] == "undefined") ) {
266266
br_value = "R" + index ;
267267
br_value = br_value.padEnd(3,' ') ;
268268
return br_value ;
269269
}
270270

271271
// all logical name
272272
if (logical_index == 0) {
273-
br_value = SIMWARE.registers[index].join('|') ;
273+
br_value = SIMWARE.registers[rf_index].registers[index].join('|') ;
274274
br_value = br_value.padEnd(6,' ') ;
275275
return br_value ;
276276
}
277277

278278
// get logical name
279-
br_value = SIMWARE.registers[index][logical_index - 1] ;
279+
br_value = SIMWARE.registers[rf_index].registers[index][logical_index - 1] ;
280280
if (typeof br_value == "undefined") {
281281
br_value = "R" + index ;
282282
}
@@ -295,7 +295,8 @@
295295
// display name
296296
var obj = document.getElementById("name_RF" + index) ;
297297
if (obj != null) {
298-
obj.innerHTML = wepsim_refresh_rf_names_mkname(disp_name, SIMWARE, index, logical_index) ;
298+
obj.innerHTML = wepsim_refresh_rf_names_mkname(disp_name, SIMWARE,
299+
0, index, logical_index) ; // TODO: 0 -> rf_index
299300
}
300301
}
301302
}
@@ -357,7 +358,8 @@
357358

358359
var disp_name = get_cfg('RF_display_name') ;
359360
var SIMWARE = get_simware() ;
360-
var rname = wepsim_refresh_rf_names_mkname(disp_name, SIMWARE, index, 0) ;
361+
var rname = wepsim_refresh_rf_names_mkname(disp_name, SIMWARE,
362+
0, index, 0) ; // TODO: 0, -> rf_index,
361363

362364
return '<span class="text-body font-monospace col"><strong>' + rname + '</strong></span>' +
363365
'<button type="button" id="close" ' +

ws_dist/min.wepsim_node.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ws_dist/min.wepsim_web.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)