Rebase fix

dev/analog/ETOTH-TRI-SQR-VCO_OTA_SS/.gitignore

@@ -1 +0,0 @@
-History/

dev/analog/ETOTH-TRI-SQR-VCO_OTA_SS/Project Outputs for TRI-SQR-VCO_OTA_SS/Status Report.Txt

@@ -7,4 +7,4 @@ From  : Project [TRI-SQR-VCO_OTA_SS.PrjPcb]
 Files Generated   : 1
 Documents Printed : 0
 
-Finished Output Generation At 19:05:35 On 06.12.2025
+Finished Output Generation At 17:11:02 On 03.12.2025

dev/analog/ETOTH-TRI-SQR-VCO_OTA_SS/Project Outputs for TRI-SQR-VCO_OTA_SS/TRI-SQR-VCO_OTA_SS.nsx

@@ -1,9 +1,5 @@
 TRI-SQR-VCO_OTA_SS
-<<<<<<< HEAD
-*SPICE Netlist generated by Advanced Sim server on 06.12.2025 19:09:34
-=======
 *SPICE Netlist generated by Advanced Sim server on 06.12.2025 16:22:50
->>>>>>> 798ab9fdd93c377385607d6a81ba49ba74eb7bb3
 .options MixedSimGenerated
 
 *Schematic Netlist:
@@ -29,13 +25,6 @@ XICSB R.VMID NetICS_2 VAP 0 NetICS_2 LF411
 RPTC NetPTC_1 U_C 1k
 RR2 0 U_TRI 22k
 RR3 VAP NetIC1_1 15k
-<<<<<<< HEAD
-RR4a_p1 NetR4a_p1_1 U_TRI 20k
-RR4a_p2 NetIC3_2 NetR4a_p1_1 20k
-RR4b U_in NetIC3_2 20k
-RR_A VCM U_SQR_OTA 3.63k
-RR_CV U_CV NetIC3_9 55k
-=======
 RR4a NetIC3_2 U_TRI 100k
 RR4b U_in NetIC3_2 50k
 RR_Aa NetR_Aa_1 U_SQR_OTA 3.3k
@@ -43,7 +32,6 @@ RR_Ab VCM NetR_Aa_1 330R
 RR_CV_a NetR_CV_a_1 U_CV 120k
 RR_CV_b NetR_CV_b_1 NetR_CV_a_1 6.8k
 RR_CV_c NetR_CV_b_1 NetIC3_9 820R
->>>>>>> 798ab9fdd93c377385607d6a81ba49ba74eb7bb3
 RR_E NetC_an_2 NetR_E_2 10k
 RR_lambda_T_a NetIC3_9 NetR_lambda_T_a_2 1.2k
 RR_lambda_T_b NetR_lambda_T_a_2 NetPTC_1 100R
@@ -68,13 +56,9 @@ RR_SAW_b NetIC2_12 U_in 10k
 RR_SAW_c U_SAW NetIC2_13 10k
 RR_SAW_e U_SQR fet_gate 33k
 RR_SAW_f 0 fet_gate 100k
-<<<<<<< HEAD
-RRoff NetIC3_2 0 100k
-=======
 RR_uC_comp_GND 0 NetR_POT_uC_comp_1 330k
 RR_uC_comp_VAP NetR_POT_uC_comp_3 VAP 330k
 RRoff NetIC3_2 0 250k
->>>>>>> 798ab9fdd93c377385607d6a81ba49ba74eb7bb3
 QT1 NetC_an_1 VCM NetC_an_2 2N2907
 QT2 NetT2_3 U_C NetC_an_2 2N2907
 JT_SAW VCM fet_gate NetIC2_12 BF256B
@@ -84,24 +68,11 @@ VU_messref NetR_E_2 NetIC2_7 0
 VU_single VAP 0 +10V
 VU_var NetR_off_d_1 0 1
 
-<<<<<<< HEAD
-.PLOT TRAN {v(U_SQR)} =PLOT(1) =AXIS(1) =NAME(U_SQR) =UNITS(V)
-.PLOT TRAN {v(U_TRI)} =PLOT(2) =AXIS(1) =NAME(U_TRI) =UNITS(V)
-.PLOT TRAN {v(U_SAW)} =PLOT(3) =AXIS(1) =NAME(U_SAW) =UNITS(V)
-.PLOT TRAN {v(U_PWM)} =PLOT(4) =AXIS(1) =NAME(U_PWM) =UNITS(V)
-.PLOT TRAN {i(U_MESSITOGND)} =PLOT(5) =AXIS(1) =NAME(I_GND) =UNITS(A)
-.PLOT TRAN {p(U_single)} =PLOT(6) =AXIS(1) =NAME(P_Supply) =UNITS(W)
-
-.OPTIONS ABSTOL=1e-10 RELTOL=1e-2 VNTOL=1e-4 METHOD=GEAR MAXORD=2
-*Selected Circuit Analyses:
-.TRAN 25u 20m 5m 25u
-=======
 .PLOT TRAN {v(U_CV)} =PLOT(1) =AXIS(1) =NAME(U_CV (OS)) =UNITS(V)
 
 .OPTIONS ABSTOL=1e-10 RELTOL=1e-2 VNTOL=1e-4 METHOD=GEAR MAXORD=2
 *Selected Circuit Analyses:
 .TRAN 100u 20m 5m 100u
->>>>>>> 798ab9fdd93c377385607d6a81ba49ba74eb7bb3
 .CONTROL
 SWEEP R_off_c LIST 600R 750R 1k 1.5k
 .ENDC