[#42] Fix Puffs & Time counters recovery

ClockSelect · Sep 21, 2016 · 3415d39 · 3415d39
1 parent 2b9c914
commit 3415d39
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/bin/myevic.bin b/bin/myevic.bin
diff --git a/bin/myevic_enc.bin b/bin/myevic_enc.bin
diff --git a/src/dataflash.c b/src/dataflash.c
@@ -117,6 +117,9 @@ __myevic__ void FMCReadCounters()
 	uint32_t pc, v;
 	uint32_t idx;
 
+	SYS_UnlockReg();
+	FMC_ENABLE_ISP();
+
 	for ( idx = 0 ; idx < FMC_FLASH_PAGE_SIZE ; idx += 4 )
 	{
 		v = FMC_Read( DATAFLASH_PUFFCNTR_BASE + idx );
@@ -136,6 +139,9 @@ __myevic__ void FMCReadCounters()
 		dfPuffCount = 0;
 		dfTimeCount = 0;
 	}
+
+	FMC_DISABLE_ISP();
+	SYS_LockReg();
 }
 
 
@@ -638,11 +644,11 @@ __myevic__ void InitDataFlash()
 		}
 	}
 
-	FMCReadCounters();
-
 	FMC_DISABLE_ISP();
 	SYS_LockReg();
 
+	FMCReadCounters();
+
 	SetProductID();
 
 	if ( ISVTWO || ISEVICAIO || ISCUBOMINI || ISEVICBASIC )

diff --git a/src/eh.c b/src/eh.c
@@ -485,16 +485,17 @@ __myevic__ void EventHandler()
 					if ( dfStatus.phpct )
 					{
 						PreheatPower = dfPower * dfPreheatPwr / 100;
-						if ( PreheatPower > MaxPower )
-						{
-							PreheatPower = MaxPower;
-						}
 					}
 					else
 					{
 						PreheatPower = dfPreheatPwr;
 					}
 
+					if ( PreheatPower > AtoMaxPower )
+					{
+						PreheatPower = AtoMaxPower;
+					}
+
 					TargetVolts = GetVoltsForPower( PreheatPower );
 				}
 				else if ( pwr <= 300 )