MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Scale and unify frequency measurement results

Browse Source
This commit is contained in:
tekka007
2015-12-19 10:35:05 +01:00
parent 4a403f6246
commit b209534ca0
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/core/MyHw.h
-1
View File
@@ -45,7 +45,6 @@ uint8_t hwReadConfig(int adr);
int8_t hwSleep(unsigned long ms); int8_t hwSleep(unsigned long ms);
int8_t hwSleep(uint8_t interrupt, uint8_t mode, 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); int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms);
#ifdef MY_DEBUG #ifdef MY_DEBUG
void hwDebugPrint(const char *fmt, ... ); void hwDebugPrint(const char *fmt, ... );
#endif #endif
libraries/MySensors/core/MyHwATMega328.cpp
+3 -3
View File
@@ -148,7 +148,7 @@ uint16_t hwCPUVoltage() {
// Do conversion // Do conversion
ADCSRA |= _BV(ADSC); ADCSRA |= _BV(ADSC);
while (bit_is_set(ADCSRA,ADSC)); while (bit_is_set(ADCSRA,ADSC));
// return value in mV // return Vcc in mV
return (1125300UL) / ADC; return (1125300UL) / ADC;
} }
@@ -176,8 +176,8 @@ uint8_t hwCPUFrequency() {
WDTCSR |= (1 << WDCE) | (1 << WDE); WDTCSR |= (1 << WDCE) | (1 << WDE);
WDTCSR = WDTsave; WDTCSR = WDTsave;
interrupts(); interrupts();
// return frequency in MHz (accuracy +- 10%) // return frequency in 1/10MHz (accuracy +- 10%)
return TCNT1 * 2048UL / 1000000UL; return TCNT1 * 2048UL / 100000UL;
} }
libraries/MySensors/core/MyHwESP8266.cpp
+4 -2
View File
@@ -110,11 +110,13 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mo
ADC_MODE(ADC_VCC); ADC_MODE(ADC_VCC);
uint16_t hwCPUVoltage() { uint16_t hwCPUVoltage() {
// in mV
return ESP.getVcc(); return ESP.getVcc();
} }
uint8_t hwCPUFrequency() { uint16_t hwCPUFrequency() {
return ESP.getCpuFreqMHz(); // in 1/10Mhz
return ESP.getCpuFreqMHz()*10;
} }
#ifdef MY_DEBUG #ifdef MY_DEBUG