From 4a403f624619b70f73f3b027fc9f108eeb7050b6 Mon Sep 17 00:00:00 2001 From: tekka007 Date: Fri, 18 Dec 2015 12:14:02 +0100 Subject: [PATCH] Adjustment hwCPUFrequency() type --- libraries/MySensors/core/MyHw.h | 3 +-- libraries/MySensors/core/MyHwATMega328.cpp | 2 +- libraries/MySensors/core/MyHwESP8266.cpp | 2 +- libraries/MySensors/core/MyHwSAMD.cpp | 10 ---------- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/libraries/MySensors/core/MyHw.h b/libraries/MySensors/core/MyHw.h index 6d8571c..5185b79 100644 --- a/libraries/MySensors/core/MyHw.h +++ b/libraries/MySensors/core/MyHw.h @@ -45,8 +45,7 @@ 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); -uint16_t hwCPUVoltage(); -uint16_t hwCPUFrequency(); + #ifdef MY_DEBUG void hwDebugPrint(const char *fmt, ... ); #endif diff --git a/libraries/MySensors/core/MyHwATMega328.cpp b/libraries/MySensors/core/MyHwATMega328.cpp index f4a1585..10e03ec 100644 --- a/libraries/MySensors/core/MyHwATMega328.cpp +++ b/libraries/MySensors/core/MyHwATMega328.cpp @@ -152,7 +152,7 @@ uint16_t hwCPUVoltage() { return (1125300UL) / ADC; } -uint16_t hwCPUFrequency() { +uint8_t hwCPUFrequency() { noInterrupts(); // setup timer1 TIFR1 = 0xFF; diff --git a/libraries/MySensors/core/MyHwESP8266.cpp b/libraries/MySensors/core/MyHwESP8266.cpp index 9134612..c9568a1 100644 --- a/libraries/MySensors/core/MyHwESP8266.cpp +++ b/libraries/MySensors/core/MyHwESP8266.cpp @@ -113,7 +113,7 @@ uint16_t hwCPUVoltage() { return ESP.getVcc(); } -uint16_t hwCPUFrequency() { +uint8_t hwCPUFrequency() { return ESP.getCpuFreqMHz(); } diff --git a/libraries/MySensors/core/MyHwSAMD.cpp b/libraries/MySensors/core/MyHwSAMD.cpp index effc00b..8fda54f 100644 --- a/libraries/MySensors/core/MyHwSAMD.cpp +++ b/libraries/MySensors/core/MyHwSAMD.cpp @@ -135,16 +135,6 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mo return -2; } -uint16_t hwCPUVoltage() { - // TODO: not supported - return 0; -} - -uint16_t hwCPUFrequency() { - // TODO: not supported - return 0; -} - #ifdef MY_DEBUG void hwDebugPrint(const char *fmt, ... ) { char fmtBuffer[300];