From f83a4343ff4903d700fcdcebe51383a9bbaf9286 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Fri, 12 Apr 2013 16:50:03 +0000 Subject: [PATCH] 20130412-185001 --- Laminator-GUI/Laminator-GUI/Form1.Designer.cs | 116 +++++++++++------- Laminator-GUI/Laminator-GUI/Form1.cs | 16 +-- .../Laminator-GUI/bin/Debug/Laminator-GUI.exe | Bin 14848 -> 15360 bytes .../Laminator-GUI/bin/Debug/Laminator-GUI.pdb | Bin 32256 -> 32256 bytes ...aminator-GUI.csproj.GenerateResource.Cache | Bin 975 -> 975 bytes .../Laminator-GUI/obj/Debug/Laminator-GUI.exe | Bin 14848 -> 15360 bytes .../Laminator-GUI/obj/Debug/Laminator-GUI.pdb | Bin 32256 -> 32256 bytes Laminator/Laminator/Debug/Laminator.elf | Bin 32082 -> 32082 bytes Laminator/Laminator/Debug/Laminator.hex | 6 +- Laminator/Laminator/Debug/Laminator.lss | 22 ++-- Laminator/Laminator/Debug/Laminator.srec | 6 +- Laminator/Laminator/Laminator.c | 4 +- 12 files changed, 102 insertions(+), 68 deletions(-) diff --git a/Laminator-GUI/Laminator-GUI/Form1.Designer.cs b/Laminator-GUI/Laminator-GUI/Form1.Designer.cs index 7900bf9..044920c 100644 --- a/Laminator-GUI/Laminator-GUI/Form1.Designer.cs +++ b/Laminator-GUI/Laminator-GUI/Form1.Designer.cs @@ -28,20 +28,22 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Series series7 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series8 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series9 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.label1 = new System.Windows.Forms.Label(); this.Temp = new System.Windows.Forms.Label(); this.chart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.debug = new System.Windows.Forms.Label(); this.heater = new System.Windows.Forms.Label(); this.motor = new System.Windows.Forms.Label(); - this.tempbox = new System.Windows.Forms.TextBox(); - this.motorbox = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); + this.tempbox = new System.Windows.Forms.NumericUpDown(); + this.motorbox = new System.Windows.Forms.NumericUpDown(); ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.tempbox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.motorbox)).BeginInit(); this.SuspendLayout(); // // label1 @@ -66,26 +68,26 @@ // // chart // - chartArea1.Name = "ChartArea1"; - this.chart.ChartAreas.Add(chartArea1); + chartArea3.Name = "ChartArea1"; + this.chart.ChartAreas.Add(chartArea3); this.chart.Location = new System.Drawing.Point(13, 134); this.chart.Name = "chart"; - series1.ChartArea = "ChartArea1"; - series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; - series1.Color = System.Drawing.Color.Red; - series1.IsVisibleInLegend = false; - series1.Name = "Temp"; - series2.ChartArea = "ChartArea1"; - series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; - series2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - series2.Name = "Motor"; - series3.ChartArea = "ChartArea1"; - series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; - series3.Color = System.Drawing.Color.Blue; - series3.Name = "Heizung"; - this.chart.Series.Add(series1); - this.chart.Series.Add(series2); - this.chart.Series.Add(series3); + series7.ChartArea = "ChartArea1"; + series7.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; + series7.Color = System.Drawing.Color.Red; + series7.IsVisibleInLegend = false; + series7.Name = "Temp"; + series8.ChartArea = "ChartArea1"; + series8.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; + series8.Color = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + series8.Name = "Motor"; + series9.ChartArea = "ChartArea1"; + series9.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.FastLine; + series9.Color = System.Drawing.Color.Blue; + series9.Name = "Heizung"; + this.chart.Series.Add(series7); + this.chart.Series.Add(series8); + this.chart.Series.Add(series9); this.chart.Size = new System.Drawing.Size(359, 122); this.chart.TabIndex = 2; this.chart.Text = "chart1"; @@ -121,20 +123,6 @@ this.motor.TabIndex = 5; this.motor.Text = "Motor"; // - // tempbox - // - this.tempbox.Location = new System.Drawing.Point(261, 76); - this.tempbox.Name = "tempbox"; - this.tempbox.Size = new System.Drawing.Size(55, 20); - this.tempbox.TabIndex = 6; - // - // motorbox - // - this.motorbox.Location = new System.Drawing.Point(261, 103); - this.motorbox.Name = "motorbox"; - this.motorbox.Size = new System.Drawing.Size(55, 20); - this.motorbox.TabIndex = 7; - // // button1 // this.button1.Location = new System.Drawing.Point(322, 76); @@ -145,14 +133,58 @@ this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // + // tempbox + // + this.tempbox.Location = new System.Drawing.Point(261, 77); + this.tempbox.Maximum = new decimal(new int[] { + 250, + 0, + 0, + 0}); + this.tempbox.Minimum = new decimal(new int[] { + 1, + 0, + 0, + -2147483648}); + this.tempbox.Name = "tempbox"; + this.tempbox.Size = new System.Drawing.Size(55, 20); + this.tempbox.TabIndex = 9; + this.tempbox.Value = new decimal(new int[] { + 1, + 0, + 0, + -2147483648}); + // + // motorbox + // + this.motorbox.Location = new System.Drawing.Point(261, 104); + this.motorbox.Maximum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.motorbox.Minimum = new decimal(new int[] { + 1, + 0, + 0, + -2147483648}); + this.motorbox.Name = "motorbox"; + this.motorbox.Size = new System.Drawing.Size(55, 20); + this.motorbox.TabIndex = 10; + this.motorbox.Value = new decimal(new int[] { + 1, + 0, + 0, + -2147483648}); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(384, 261); - this.Controls.Add(this.button1); this.Controls.Add(this.motorbox); this.Controls.Add(this.tempbox); + this.Controls.Add(this.button1); this.Controls.Add(this.motor); this.Controls.Add(this.heater); this.Controls.Add(this.debug); @@ -166,6 +198,8 @@ this.Text = "Laminator GUI"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.close); ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.tempbox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.motorbox)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -179,9 +213,9 @@ private System.Windows.Forms.Label debug; private System.Windows.Forms.Label heater; private System.Windows.Forms.Label motor; - private System.Windows.Forms.TextBox tempbox; - private System.Windows.Forms.TextBox motorbox; private System.Windows.Forms.Button button1; + private System.Windows.Forms.NumericUpDown tempbox; + private System.Windows.Forms.NumericUpDown motorbox; } } diff --git a/Laminator-GUI/Laminator-GUI/Form1.cs b/Laminator-GUI/Laminator-GUI/Form1.cs index 469ac02..e46da02 100644 --- a/Laminator-GUI/Laminator-GUI/Form1.cs +++ b/Laminator-GUI/Laminator-GUI/Form1.cs @@ -24,8 +24,8 @@ namespace Laminator_GUI private string tempText = ""; private bool heaterBool = false; private bool motorBool = false; - private string solltempText = "0"; - private string motorText = "0"; + private string solltempText = "-1"; + private string motorText = "-1"; private Thread t; public delegate void InvokeDelegate(); @@ -93,13 +93,13 @@ namespace Laminator_GUI private void InvokeMotorBox() { - if (this.motorbox.Text == "" || this.motorbox.Text == "0") + if (this.motorbox.Text == "" || this.motorbox.Text == "-1") this.motorbox.Text = this.motorText; } private void InvokeTempBox() { - if (this.tempbox.Text == "" || this.tempbox.Text == "0") + if (this.tempbox.Text == "" || this.tempbox.Text == "-1") this.tempbox.Text = this.solltempText; } @@ -163,10 +163,10 @@ namespace Laminator_GUI { this.serialPort.Write("m" + this.motorbox.Text.PadLeft(2, '0') + "\n"); this.serialPort.Write("t" + this.tempbox.Text.PadLeft(3, '0') + "\n"); - this.motorbox.Text = ""; - this.motorText = "0"; - this.tempbox.Text = ""; - this.solltempText = "0"; + this.motorbox.Text = "-1"; + this.motorText = "-1"; + this.tempbox.Text = "-1"; + this.solltempText = "-1"; } private void close(object sender, FormClosedEventArgs e) diff --git a/Laminator-GUI/Laminator-GUI/bin/Debug/Laminator-GUI.exe b/Laminator-GUI/Laminator-GUI/bin/Debug/Laminator-GUI.exe index 2bebfeef7699cc17a8c37975afa5e70683d81e2e..3f67bb71e890b88756606703c40c099f9bdf0ff7 100644 GIT binary patch delta 3524 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 B#B~4w delta 1802 zcmZYA3s6*57{Kv!?k>wicZFn;hb3-_D7c1#fUv-ViXxA77uHqA(adH<1Su8m0c<(F zOhG*pz6ujdEgVa)Q`R)im{TD`)YtmyAncYhK&E)+~!vS7EiBtA`eCGFvAJt8fsH5R=qv#TVlOA@}bs z^xi;}s;2o{TH46cgb2QYGw=k?#LqDu`!NHr<1G9GXQL*C$iYO+#WZx`Jj}zz zn2+nQ0G~rQZpXQ}7v~Al66_)=rf?SLl z;v&pPFD^tM`mhq0V-?n-U$lr|6Ukx$n03@iDZTgjk6V zd>p6aDlEX&ScWxNi)(NT*5ZC#+d^`Tqz=zuJ@(-`{2ABdE!=<+W+67B0~>KRZo-AQ z8CT%bSclJGGd5#88vPu>Am2~%c|2#-UnIFo@)F*~mobzX^9n}eHcZ9s=)zX?BJ(D= z9Cu&??!+eCg|A~fcHwT+aSxuuy?6=t;q4H{wVz~&0uwM8#Vhb8K8zihfd{Y{-@+w$ z5Noj$*W)3472n1K_zrgAVf+Y>U=JR}AMsthjPKzM3y=1gDl1L1=JUQ35P5`GSEVND zT0lCDC?t}JVj_ib6O)M~BAcinO74eo&bY>@el5#U&hn1%KuJrrsmtZ*u{B~e&EkZxXu=}ylJlMk+SFIYt2q_PM!Wh& zA8OrJmE@fx&#GGQH0``q?ejVfdc1z^npHV`9%D`0;7iqPHr44%GU)MnSdS7ar)hCE zRZ^LIzc2fL`r^(Vm4(L5u2pU|uB)#q43A?0mVCn0i8*8S-l~A69cKjohYaTVPjllT zznud;X35=1*4*$l)$zBCU(D7!MhKpTh>hzTJ{CeXulAd=V)|77>Sd;*_CA$aQ)9{+ zXXwzss68T0tc_}@+CK5PRj?M0Y^(wQY)0PAxd?TpZk#dL&+6hsY>aZ0Q3x@{8#bIx z9ImC+kF^+=@bsMZQ#H3uUs~_dq*LG1&>&@k9{$ullbo((W2Q`3*^OKD-o|v}A6(~V F%U@A@rdR*~ diff --git a/Laminator-GUI/Laminator-GUI/obj/Debug/Laminator-GUI.csproj.GenerateResource.Cache b/Laminator-GUI/Laminator-GUI/obj/Debug/Laminator-GUI.csproj.GenerateResource.Cache index 4168e4ee00fb5d869cf04fa58198529cd31790be..029237bbddca16f6bd248e65628301c42b461a95 100644 GIT binary patch delta 24 gcmX@lex7|p0u!U$=0qklM%JwpuT&qHJcrpB0Bgwz>Hq)$ delta 24 gcmX@lex7|p0u!Ue=0qklM%H!L)%EvGp2KVm0A|AoCIA2c diff --git a/Laminator-GUI/Laminator-GUI/obj/Debug/Laminator-GUI.exe b/Laminator-GUI/Laminator-GUI/obj/Debug/Laminator-GUI.exe index 2bebfeef7699cc17a8c37975afa5e70683d81e2e..3f67bb71e890b88756606703c40c099f9bdf0ff7 100644 GIT binary patch delta 3524 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 B#B~4w delta 1802 zcmZYA3s6*57{Kv!?k>wicZFn;hb3-_D7c1#fUv-ViXxA77uHqA(adH<1Su8m0c<(F zOhG*pz6ujdEgVa)Q`R)im{TD`)YtmyAncYhK&E)+~!vS7EiBtA`eCGFvAJt8fsH5R=qv#TVlOA@}bs z^xi;}s;2o{TH46cgb2QYGw=k?#LqDu`!NHr<1G9GXQL*C$iYO+#WZx`Jj}zz zn2+nQ0G~rQZpXQ}7v~Al66_)=rf?SLl z;v&pPFD^tM`mhq0V-?n-U$lr|6Ukx$n03@iDZTgjk6V zd>p6aDlEX&ScWxNi)(NT*5ZC#+d^`Tqz=zuJ@(-`{2ABdE!=<+W+67B0~>KRZo-AQ z8CT%bSclJGGd5#88vPu>Am2~%c|2#-UnIFo@)F*~mobzX^9n}eHcZ9s=)zX?BJ(D= z9Cu&??!+eCg|A~fcHwT+aSxuuy?6=t;q4H{wVz~&0uwM8#Vhb8K8zihfd{Y{-@+w$ z5Noj$*W)3472n1K_zrgAVf+Y>U=JR}AMsthjPKzM3y=1gDl1L1=JUQ35P5`GSEVND zT0lCDC?t}JVj_ib6O)M~BAcinO74eo&bY>@el5#U&hn1%KuJrrsmtZ*u{B~e&EkZxXu=}ylJlMk+SFIYt2q_PM!Wh& zA8OrJmE@fx&#GGQH0``q?ejVfdc1z^npHV`9%D`0;7iqPHr44%GU)MnSdS7ar)hCE zRZ^LIzc2fL`r^(Vm4(L5u2pU|uB)#q43A?0mVCn0i8*8S-l~A69cKjohYaTVPjllT zznud;X35=1*4*$l)$zBCU(D7!MhKpTh>hzTJ{CeXulAd=V)|77>Sd;*_CA$aQ)9{+ zXXwzss68T0tc_}@+CK5PRj?M0Y^(wQY)0PAxd?TpZk#dL&+6hsY>aZ0Q3x@{8#bIx z9ImC+kF^+=@bsMZQ#H3uUs~_dq*LG1&>&@k9{$ullbo((W2Q`3*^OKD-o|v}A6(~V F%U@A@rdR*~ diff --git a/Laminator/Laminator/Debug/Laminator.elf b/Laminator/Laminator/Debug/Laminator.elf index 533330337675df9299fe5c72e5ed2be151fb6cd8..628166ae845053a360b79ccfe6cb3b380b14cccb 100644 GIT binary patch delta 60 zcmV-C0K@;%`T^4V0kAv*5i8&{>ph{tLLhAb S0cTGG000CFv_P{sIvPV=As7Sz delta 60 zcmV-C0K@;%`T^4V0kAv*5ia06=1=KR?9tI6=Q!m<<5ZJP0+Rxj<+I`fM>h|$LLhAb S0cTGG000CIYoD_?IvPV`gcxf8 diff --git a/Laminator/Laminator/Debug/Laminator.hex b/Laminator/Laminator/Debug/Laminator.hex index f66b448..907e159 100644 --- a/Laminator/Laminator/Debug/Laminator.hex +++ b/Laminator/Laminator/Debug/Laminator.hex @@ -24,8 +24,8 @@ :10017000B500089580E487B987E886B910BE089570 :10018000806487B98AE18A95F1F700C0369A349B7A :10019000FECF349A84B195B108959C01B9018827A6 -:1001A00077FD8095982F4AD12EE03BE64FE950EC41 -:1001B000D1D120E738E543E354E4A9D020E030E092 +:1001A00077FD8095982F4AD12BE034EB40E450EC5A +:1001B000D1D12CE83AEC48ED53E4A9D020E030E06E :1001C00040ED51E4A4D007D1862F972F08955F9B6F :1001D000FECF8CB10895C0DFCDDF789480E690E04B :1001E0002ED2BA9A80E0CCDFE82EF92EC09197008B @@ -34,7 +34,7 @@ :100210000F2EFDE76F2EF0E07F2EF02D01C0840140 :10022000DD230CF4E4018BE0C816D10424F4089417 :10023000C11CD11C01C064018091960090E00A9716 -:10024000BC016C0D7D1D0C171D0764F495E5E916C6 +:10024000BC016C0D7D1D0C171D0764F49EE1E916C1 :10025000F10454F02A2DA9EEEA16A3E0FA062CF0D8 :100260002B2D03C02B2D01C02B2D80919700909139 :10027000980030919600EDB7FEB772970FB6F894DC diff --git a/Laminator/Laminator/Debug/Laminator.lss b/Laminator/Laminator/Debug/Laminator.lss index dbaa4f7..997967b 100644 --- a/Laminator/Laminator/Debug/Laminator.lss +++ b/Laminator/Laminator/Debug/Laminator.lss @@ -324,7 +324,7 @@ unsigned int read_adc(unsigned char adc_input) 0000019a : static const float c2=300; - static const float v2=89; //ADC-Wert=165 @ 202°C + static const float v2=53; //ADC-Wert=165 @ 202°C float m=((c1-c2)/(v1-v2)); @@ -336,15 +336,15 @@ unsigned int read_adc(unsigned char adc_input) 1a2: 80 95 com r24 1a4: 98 2f mov r25, r24 1a6: 4a d1 rcall .+660 ; 0x43c <__floatsisf> - 1a8: 2e e0 ldi r18, 0x0E ; 14 - 1aa: 3b e6 ldi r19, 0x6B ; 107 - 1ac: 4f e9 ldi r20, 0x9F ; 159 + 1a8: 2b e0 ldi r18, 0x0B ; 11 + 1aa: 34 eb ldi r19, 0xB4 ; 180 + 1ac: 40 e4 ldi r20, 0x40 ; 64 1ae: 50 ec ldi r21, 0xC0 ; 192 1b0: d1 d1 rcall .+930 ; 0x554 <__mulsf3> - 1b2: 20 e7 ldi r18, 0x70 ; 112 - 1b4: 38 e5 ldi r19, 0x58 ; 88 - 1b6: 43 e3 ldi r20, 0x33 ; 51 - 1b8: 54 e4 ldi r21, 0x44 ; 68 + 1b2: 2c e8 ldi r18, 0x8C ; 140 + 1b4: 3a ec ldi r19, 0xCA ; 202 + 1b6: 48 ed ldi r20, 0xD8 ; 216 + 1b8: 53 e4 ldi r21, 0x43 ; 67 1ba: a9 d0 rcall .+338 ; 0x30e <__addsf3> 1bc: 20 e0 ldi r18, 0x00 ; 0 1be: 30 e0 ldi r19, 0x00 ; 0 @@ -432,7 +432,7 @@ int main(void) } else { mon = 0; } - if (pwm<=pwm_ctr || val<85 || val>1000) { //pwm, detect Sensor contakt break/short + if (pwm<=pwm_ctr || val<30 || val>1000) { //pwm, detect Sensor contakt break/short hon = 0; 20a: bb 24 eor r11, r11 20c: aa 24 eor r10, r10 @@ -492,11 +492,11 @@ int main(void) } else { mon = 0; } - if (pwm<=pwm_ctr || val<85 || val>1000) { //pwm, detect Sensor contakt break/short + if (pwm<=pwm_ctr || val<30 || val>1000) { //pwm, detect Sensor contakt break/short 246: 0c 17 cp r16, r28 248: 1d 07 cpc r17, r29 24a: 64 f4 brge .+24 ; 0x264 - 24c: 95 e5 ldi r25, 0x55 ; 85 + 24c: 9e e1 ldi r25, 0x1E ; 30 24e: e9 16 cp r14, r25 250: f1 04 cpc r15, r1 252: 54 f0 brlt .+20 ; 0x268 diff --git a/Laminator/Laminator/Debug/Laminator.srec b/Laminator/Laminator/Debug/Laminator.srec index 3a0d6a9..43f1393 100644 --- a/Laminator/Laminator/Debug/Laminator.srec +++ b/Laminator/Laminator/Debug/Laminator.srec @@ -25,8 +25,8 @@ S11301608AB983E389B989E990E09093B6008093D2 S1130170B500089580E487B987E886B910BE08956C S1130180806487B98AE18A95F1F700C0369A349B76 S1130190FECF349A84B195B108959C01B9018827A2 -S11301A077FD8095982F4AD12EE03BE64FE950EC3D -S11301B0D1D120E738E543E354E4A9D020E030E08E +S11301A077FD8095982F4AD12BE034EB40E450EC56 +S11301B0D1D12CE83AEC48ED53E4A9D020E030E06A S11301C040ED51E4A4D007D1862F972F08955F9B6B S11301D0FECF8CB10895C0DFCDDF789480E690E047 S11301E02ED2BA9A80E0CCDFE82EF92EC091970087 @@ -35,7 +35,7 @@ S1130200DD2401E010E088249924BB24AA24A394CB S11302100F2EFDE76F2EF0E07F2EF02D01C084013C S1130220DD230CF4E4018BE0C816D10424F4089413 S1130230C11CD11C01C064018091960090E00A9712 -S1130240BC016C0D7D1D0C171D0764F495E5E916C2 +S1130240BC016C0D7D1D0C171D0764F49EE1E916BD S1130250F10454F02A2DA9EEEA16A3E0FA062CF0D4 S11302602B2D03C02B2D01C02B2D80919700909135 S1130270980030919600EDB7FEB772970FB6F894D8 diff --git a/Laminator/Laminator/Laminator.c b/Laminator/Laminator/Laminator.c index cb1116e..a0d9df4 100644 --- a/Laminator/Laminator/Laminator.c +++ b/Laminator/Laminator/Laminator.c @@ -97,7 +97,7 @@ int convert2degree(int value) { static const float v1=144; //ADC-Wert=264 @ 20°C static const float c2=300; - static const float v2=89; //ADC-Wert=165 @ 202°C + static const float v2=53; //ADC-Wert=165 @ 202°C float m=((c1-c2)/(v1-v2)); @@ -143,7 +143,7 @@ int main(void) } else { mon = 0; } - if (pwm<=pwm_ctr || val<85 || val>1000) { //pwm, detect Sensor contakt break/short + if (pwm<=pwm_ctr || val<30 || val>1000) { //pwm, detect Sensor contakt break/short hon = 0; } else { hon = 1;