Scale and unify frequency measurement results

Author: tekka007

libraries/MySensors/core/MyHw.h

@@ -45,7 +45,6 @@ uint8_t hwReadConfig(int adr);
 int8_t hwSleep(unsigned long ms);
 int8_t hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms);
 int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms);
-
 #ifdef MY_DEBUG
 	void hwDebugPrint(const char *fmt, ... );
 #endif

libraries/MySensors/core/MyHwATMega328.cpp

@@ -148,7 +148,7 @@ uint16_t hwCPUVoltage() {
 	// Do conversion
 	ADCSRA |= _BV(ADSC);
 	while (bit_is_set(ADCSRA,ADSC));
-	// return value in mV
+	// return Vcc in mV
 	return (1125300UL) / ADC;
 }
 
@@ -176,8 +176,8 @@ uint8_t hwCPUFrequency() {
 	WDTCSR |= (1 << WDCE) | (1 << WDE);
 	WDTCSR = WDTsave;
 	interrupts();	
-	// return frequency in MHz (accuracy +- 10%)
-	return TCNT1 * 2048UL / 1000000UL;
+	// return frequency in 1/10MHz (accuracy +- 10%)
+	return TCNT1 * 2048UL / 100000UL;
 }
 
 

libraries/MySensors/core/MyHwESP8266.cpp

@@ -110,11 +110,13 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mo
 ADC_MODE(ADC_VCC);
 
 uint16_t hwCPUVoltage() {
+	// in mV
 	return ESP.getVcc();
 }
 
-uint8_t hwCPUFrequency() {
-	return ESP.getCpuFreqMHz();
+uint16_t hwCPUFrequency() {
+	// in 1/10Mhz
+	return ESP.getCpuFreqMHz()*10;
 }
 
 #ifdef MY_DEBUG