move second vout output to io_out[25]
diff --git a/comparator/user_analog_project_wrapper.spice b/comparator/user_analog_project_wrapper.spice index ee08c05..3bc1796 100644 --- a/comparator/user_analog_project_wrapper.spice +++ b/comparator/user_analog_project_wrapper.spice
@@ -106,10 +106,12 @@ + wbs_dat_o[30] wbs_dat_o[31] wbs_dat_o[3] wbs_dat_o[4] wbs_dat_o[5] wbs_dat_o[6] + wbs_dat_o[7] wbs_dat_o[8] wbs_dat_o[9] wbs_sel_i[0] wbs_sel_i[1] wbs_sel_i[2] wbs_sel_i[3] + wbs_stb_i wbs_we_i -R0 io_out[24] gpio_analog[17] sky130_fd_pr__res_generic_m2 w=6e+06u l=6e+06u -C0 vccd2 vdda2 19.74fF +R0 io_out[25] gpio_analog[17] sky130_fd_pr__res_generic_m2 w=6e+06u l=6e+06u +C0 vdda2 vccd2 19.74fF Xcomparator_0 vssd2 vdda2 vccd2 gpio_analog[17] gpio_analog[16] gpio_analog[15] gpio_analog[14] + comparator C1 vssa1 vssd2 2.35fF C2 vccd2 vssd2 20.99fF +C3 comparator_0/VOPAMP vssd2 2.89fF **FLOATING +C4 comparator_0/VON vssd2 2.03fF **FLOATING .ends
diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds index d259b19..35ca7a7 100644 --- a/gds/user_analog_project_wrapper.gds +++ b/gds/user_analog_project_wrapper.gds Binary files differ
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag index e7a8495..6a163f7 100644 --- a/mag/user_analog_project_wrapper.mag +++ b/mag/user_analog_project_wrapper.mag
@@ -1,6 +1,6 @@ magic tech sky130A -timestamp 1633979100 +timestamp 1634290889 << locali >> rect 3350 53100 3850 53250 rect 3650 53070 3850 53100 @@ -127,10 +127,10 @@ rect 3500 8300 3600 8700 rect 4000 8300 4100 8700 rect 3500 7600 4100 8300 -rect 3500 6300 4100 7000 -rect 3500 5900 3600 6300 -rect 4000 5900 4100 6300 -rect 3500 5800 4100 5900 +rect 3500 4000 4100 7000 +rect 3500 3600 3600 4000 +rect 4000 3600 4100 4000 +rect 3500 3500 4100 3600 rect 262 -400 318 240 rect 853 -400 909 240 rect 1444 -400 1500 240 @@ -635,7 +635,7 @@ rect 1200 40600 1600 41000 rect 2400 19000 2800 19400 rect 3600 8300 4000 8700 -rect 3600 5900 4000 6300 +rect 3600 3600 4000 4000 << metal3 >> rect 8097 351150 10597 352400 rect 34097 351150 36597 352400 @@ -838,23 +838,23 @@ rect 291760 7273 292400 7329 rect -400 6682 240 6738 rect 291760 6682 292400 6738 -rect 1100 6300 4100 6400 -rect 1100 6200 3600 6300 -rect 700 6147 3600 6200 -rect -400 6091 3600 6147 -rect 700 6000 3600 6091 -rect 1100 5900 3600 6000 -rect 4000 5900 4100 6300 +rect -400 6091 240 6147 rect 291760 6091 292400 6147 -rect 1100 5800 4100 5900 rect -400 5500 240 5556 rect 291760 5500 292400 5556 rect -400 4909 240 4965 rect 291760 4909 292400 4965 rect -400 4318 240 4374 rect 291760 4318 292400 4374 -rect -400 3727 240 3783 +rect 1100 4000 4100 4100 +rect 1100 3900 3600 4000 +rect 700 3783 3600 3900 +rect -400 3727 3600 3783 +rect 700 3700 3600 3727 +rect 1100 3600 3600 3700 +rect 4000 3600 4100 4000 rect 291760 3727 292400 3783 +rect 1100 3500 4100 3600 rect -400 3136 240 3192 rect 291760 3136 292400 3192 rect -400 2545 240 2601
diff --git a/netgen/user_analog_project_wrapper.spice b/netgen/user_analog_project_wrapper.spice index de62fdd..3bc1796 100644 --- a/netgen/user_analog_project_wrapper.spice +++ b/netgen/user_analog_project_wrapper.spice
@@ -1,5 +1,5 @@ * SPICE3 file created from user_analog_project_wrapper.ext - technology: sky130A -.include comparator.spice + .subckt user_analog_project_wrapper gpio_analog[0] gpio_analog[10] gpio_analog[11] + gpio_analog[12] gpio_analog[13] gpio_analog[14] gpio_analog[15] gpio_analog[16] + gpio_analog[17] gpio_analog[1] gpio_analog[2] gpio_analog[3] gpio_analog[4] gpio_analog[5] @@ -106,10 +106,12 @@ + wbs_dat_o[30] wbs_dat_o[31] wbs_dat_o[3] wbs_dat_o[4] wbs_dat_o[5] wbs_dat_o[6] + wbs_dat_o[7] wbs_dat_o[8] wbs_dat_o[9] wbs_sel_i[0] wbs_sel_i[1] wbs_sel_i[2] wbs_sel_i[3] + wbs_stb_i wbs_we_i -R0 io_out[24] gpio_analog[17] sky130_fd_pr__res_generic_m2 w=6e+06u l=6e+06u -C0 vccd2 vdda2 19.74fF +R0 io_out[25] gpio_analog[17] sky130_fd_pr__res_generic_m2 w=6e+06u l=6e+06u +C0 vdda2 vccd2 19.74fF Xcomparator_0 vssd2 vdda2 vccd2 gpio_analog[17] gpio_analog[16] gpio_analog[15] gpio_analog[14] + comparator C1 vssa1 vssd2 2.35fF C2 vccd2 vssd2 20.99fF +C3 comparator_0/VOPAMP vssd2 2.89fF **FLOATING +C4 comparator_0/VON vssd2 2.03fF **FLOATING .ends
diff --git a/verilog/rtl/user_analog_project_wrapper.v b/verilog/rtl/user_analog_project_wrapper.v index 698872d..6e9c3ba 100644 --- a/verilog/rtl/user_analog_project_wrapper.v +++ b/verilog/rtl/user_analog_project_wrapper.v
@@ -126,7 +126,7 @@ wire vout; assign gpio_analog[17] = vout; -assign io_out[24] = vout; +assign io_out[25] = vout; comparator comp_0 ( `ifdef USE_POWER_PINS