Commit: b94d89b4c5f12dcc6ce9f72d1b8d300276e66eb1 - SolderStation (hg)

Прошивка для паяльной станции http://forum.easyelectronics.ru/viewtopic.php?f=16&t=4644

Commit MetaInfo

• Révision: b94d89b4c5f12dcc6ce9f72d1b8d300276e66eb1 (tree)
• l'heure: 2014-02-15 23:15:00
• Auteur: Константин Кошкин <catsoft1940@gmai...>
• Commiter: Константин Кошкин

Message de Log

В режиме 1 скорость фена 3; Исправлены ошибки

Change Summary

• modified: ss.c

Modification

diff -r 7ac9b1eec8ff -r b94d89b4c5f1 ss.c
--- a/ss.c	Sat Feb 15 15:20:18 2014 +0300
+++ b/ss.c	Sat Feb 15 17:15:00 2014 +0300
@@ -326,9 +326,12 @@
 
 		case 12:	//12-fan active
 		{
-			if (FanPowerState==1) FanPowerState = 2;
+			if (FanPowerState==1)
+			{
+				FanPowerState = 2;
+				FanPowerTimer=FAN_TIMEOUT;
+			}	
 			else FanPowerState = 1;
-			FanPowerTimer=FAN_TIMEOUT;
 			CurrentDev=1;
 		break;
 		};
@@ -401,7 +404,7 @@
 
 	else {
 		//if ((FanTemp>CurrentFanTemp)&&(FanPowerState>0)) PWM_FAN(1); //âêëþ÷àåì íàãðåâàòåëü åñëè õîëîäíåå íóæíîãî
-		if ((FanTemp>CurrentFanTemp)&&(FanPowerState = 2)) PWM_FAN(1); //âêëþ÷àåì íàãðåâàòåëü åñëè õîëîäíåå íóæíîãî (â ðåæèìå 2)
+		if ((FanTemp>CurrentFanTemp)&&(FanPowerState == 2)) PWM_FAN(1); //âêëþ÷àåì íàãðåâàòåëü åñëè õîëîäíåå íóæíîãî (â ðåæèìå 2)
 		else PWM_FAN(0);
 
 		switch (FanPowerState){ //âêëþ÷àåì ìîòîð ôåíà íà íóæíîå íàïðÿæåíèå ïî ðåæèìó
@@ -412,7 +415,8 @@
 			};
 			case 1:
 			{
-				OCR1B=0x1B0;
+				//OCR1B=0x1B0;
+				OCR1B=(3*80)+0x1B0;
 				break;
 			};
 			case 2: