|
191 | 191 | var logical_defined = [] ;
|
192 | 192 | for (var index=0; index < sim_eltos.BR.length; index++)
|
193 | 193 | {
|
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 | + } |
198 | 198 | }
|
199 | 199 |
|
200 | 200 | // make menu
|
|
257 | 257 | }
|
258 | 258 | }
|
259 | 259 |
|
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 ) |
261 | 261 | {
|
262 | 262 | var br_value = "" ;
|
263 | 263 |
|
264 | 264 | // 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") ) { |
266 | 266 | br_value = "R" + index ;
|
267 | 267 | br_value = br_value.padEnd(3,' ') ;
|
268 | 268 | return br_value ;
|
269 | 269 | }
|
270 | 270 |
|
271 | 271 | // all logical name
|
272 | 272 | if (logical_index == 0) {
|
273 |
| - br_value = SIMWARE.registers[index].join('|') ; |
| 273 | + br_value = SIMWARE.registers[rf_index].registers[index].join('|') ; |
274 | 274 | br_value = br_value.padEnd(6,' ') ;
|
275 | 275 | return br_value ;
|
276 | 276 | }
|
277 | 277 |
|
278 | 278 | // get logical name
|
279 |
| - br_value = SIMWARE.registers[index][logical_index - 1] ; |
| 279 | + br_value = SIMWARE.registers[rf_index].registers[index][logical_index - 1] ; |
280 | 280 | if (typeof br_value == "undefined") {
|
281 | 281 | br_value = "R" + index ;
|
282 | 282 | }
|
|
295 | 295 | // display name
|
296 | 296 | var obj = document.getElementById("name_RF" + index) ;
|
297 | 297 | 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 |
299 | 300 | }
|
300 | 301 | }
|
301 | 302 | }
|
|
357 | 358 |
|
358 | 359 | var disp_name = get_cfg('RF_display_name') ;
|
359 | 360 | 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, |
361 | 363 |
|
362 | 364 | return '<span class="text-body font-monospace col"><strong>' + rname + '</strong></span>' +
|
363 | 365 | '<button type="button" id="close" ' +
|
|
0 commit comments