Skip to content

Commit 639a22b

Browse files
zfizfi
authored
Merge pull request #936 from MatzElectronics/demo
Activate Fingerprint blocks
2 parents 9a7ba48 + 91f7928 commit 639a22b

File tree

1 file changed

+68
-72
lines changed

1 file changed

+68
-72
lines changed

‎src/main/webapp/frame/framec.jsp‎

Lines changed: 68 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -610,77 +610,77 @@
610610
</value>
611611
</block>
612612
</category>
613-
<c:choose>
614-
<c:when test="${experimental == true}">
615-
<category name="WX Module">
616-
<category name="Simple">
617-
<block type="wx_init"></block>
618-
<block type="wx_config_page"></block>
619-
<block type="wx_set_widget"></block>
620-
<block type="wx_send_widget">
621-
<value name="NUM">
622-
<block type="math_number">
623-
<field name="NUM">10</field>
613+
<c:choose>
614+
<c:when test="${experimental == true}">
615+
<category name="WX Module">
616+
<category name="Simple">
617+
<block type="wx_init"></block>
618+
<block type="wx_config_page"></block>
619+
<block type="wx_set_widget"></block>
620+
<block type="wx_send_widget">
621+
<value name="NUM">
622+
<block type="math_number">
623+
<field name="NUM">10</field>
624+
</block>
625+
</value>
624626
</block>
625-
</value>
626-
</block>
627-
<block type="wx_read_widgets"></block>
628-
<block type="wx_get_widget"></block>
629-
<block type="wx_evt_connected"></block>
630-
</category>
631-
<category name="Advanced">
632-
<block type="wx_init_adv"></block>
633-
<block type="wx_listen">
634-
<field name="ID">wxConnId1</field>
635-
<value name="PATH">
636-
<block type="string_type_block">
637-
<field name="TEXT">path</field>
627+
<block type="wx_read_widgets"></block>
628+
<block type="wx_get_widget"></block>
629+
<block type="wx_evt_connected"></block>
630+
</category>
631+
<category name="Advanced">
632+
<block type="wx_init_adv"></block>
633+
<block type="wx_listen">
634+
<field name="ID">wxConnId1</field>
635+
<value name="PATH">
636+
<block type="string_type_block">
637+
<field name="TEXT">path</field>
638+
</block>
639+
</value>
638640
</block>
639-
</value>
640-
</block>
641-
<block type="wx_poll">
642-
<field name="EVENT">wxEvent</field>
643-
<field name="ID">wxId</field>
644-
<field name="HANDLE">wxHandle</field>
645-
</block>
646-
<block type="wx_print_multiple">
647-
<field name="HANDLE">wxHandle</field>
648-
</block>
649-
<block type="wx_send_string">
650-
<field name="HANDLE">wxHandle</field>
651-
<value name="DATA">
652-
<block type="string_type_block"></block>
653-
</value>
654-
</block>
655-
<block type="wx_scan_multiple">
656-
<field name="HANDLE">wxHandle</field>
657-
</block>
658-
<block type="wx_scan_string">
659-
<field name="HANDLE">wxHandle</field>
660-
</block>
661-
<block type="wx_receive_string">
662-
<field name="HANDLE">wxHandle</field>
663-
<value name="MAX">
664-
<block type="math_number">
665-
<field name="NUM">64</field>
641+
<block type="wx_poll">
642+
<field name="EVENT">wxEvent</field>
643+
<field name="ID">wxId</field>
644+
<field name="HANDLE">wxHandle</field>
666645
</block>
667-
</value>
668-
</block>
669-
<block type="wx_mode"></block>
670-
<block type="wx_code"></block>
671-
<block type="wx_buffer">
672-
<value name="SIZE">
673-
<block type="math_number">
674-
<field name="NUM">64</field>
646+
<block type="wx_print_multiple">
647+
<field name="HANDLE">wxHandle</field>
675648
</block>
676-
</value>
677-
</block>
678-
<block type="wx_disconnect"></block>
679-
<block type="wx_ip"></block>
680-
</category>
681-
</category>
682-
</c:when>
683-
</c:choose>
649+
<block type="wx_send_string">
650+
<field name="HANDLE">wxHandle</field>
651+
<value name="DATA">
652+
<block type="string_type_block"></block>
653+
</value>
654+
</block>
655+
<block type="wx_scan_multiple">
656+
<field name="HANDLE">wxHandle</field>
657+
</block>
658+
<block type="wx_scan_string">
659+
<field name="HANDLE">wxHandle</field>
660+
</block>
661+
<block type="wx_receive_string">
662+
<field name="HANDLE">wxHandle</field>
663+
<value name="MAX">
664+
<block type="math_number">
665+
<field name="NUM">64</field>
666+
</block>
667+
</value>
668+
</block>
669+
<block type="wx_mode"></block>
670+
<block type="wx_code"></block>
671+
<block type="wx_buffer">
672+
<value name="SIZE">
673+
<block type="math_number">
674+
<field name="NUM">64</field>
675+
</block>
676+
</value>
677+
</block>
678+
<block type="wx_disconnect"></block>
679+
<block type="wx_ip"></block>
680+
</category>
681+
</category>
682+
</c:when>
683+
</c:choose>
684684

685685
<category name="<fmt:message key="category.communicate.xbee" />">
686686
<block type="xbee_setup"></block>
@@ -957,8 +957,6 @@
957957
<block type="sensor_ping"></block>
958958
</category>
959959

960-
<c:choose>
961-
<c:when test="${experimental == true}">
962960
<category name="<fmt:message key="category.sensor-input.fingerprint" />">
963961
<block type="fp_scanner_init"></block>
964962
<block type="fp_scanner_add">
@@ -970,9 +968,7 @@
970968
</block>
971969
<block type="fp_scanner_scan"></block>
972970
</category>
973-
</c:when>
974-
</c:choose>
975-
971+
976972
<category name="<fmt:message key="category.sensor-input.hmc5883l" />">
977973
<block type="HMC5883L_init"></block>
978974
<block type="HMC5883L_read"></block>

0 commit comments

Comments
 (0)