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

Use RNG for randomSeed(), ADC_MODE() switch (#696)

Browse Source
This commit is contained in:
Olivier
2016-12-19 23:27:10 +01:00
committed by Henrik Ekblad
parent 38013ce5ac
commit d204929937
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/MyHwESP8266.cpp
+14 -2
View File
@@ -90,13 +90,25 @@ int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mo
return MY_SLEEP_NOT_POSSIBLE; return MY_SLEEP_NOT_POSSIBLE;
} }
#if defined(MY_DEBUG) || defined(MY_SPECIAL_DEBUG) #if defined(MY_SPECIAL_DEBUG)
// settings for getVcc()
ADC_MODE(ADC_VCC); ADC_MODE(ADC_VCC);
#else
// [default] settings for analogRead(A0)
ADC_MODE(ADC_TOUT);
#endif
#if defined(MY_DEBUG) || defined(MY_SPECIAL_DEBUG)
uint16_t hwCPUVoltage() uint16_t hwCPUVoltage()
{ {
// in mV #if defined(MY_SPECIAL_DEBUG)
// in mV, requires ADC_VCC set
return ESP.getVcc(); return ESP.getVcc();
#else
// not possible
return 0;
#endif
} }
uint16_t hwCPUFrequency() uint16_t hwCPUFrequency()
core/MyHwESP8266.h
+1 -2
View File
@@ -32,7 +32,6 @@
#define EEPROM_size (1024) #define EEPROM_size (1024)
// Define these as macros to save valuable space // Define these as macros to save valuable space
#define hwDigitalWrite(__pin, __value) digitalWrite(__pin, __value) #define hwDigitalWrite(__pin, __value) digitalWrite(__pin, __value)
#define hwDigitalRead(__pin) digitalRead(__pin) #define hwDigitalRead(__pin) digitalRead(__pin)
@@ -40,7 +39,7 @@
#define hwWatchdogReset() wdt_reset() #define hwWatchdogReset() wdt_reset()
#define hwReboot() ESP.restart() #define hwReboot() ESP.restart()
#define hwMillis() millis() #define hwMillis() millis()
#define hwRandomNumberInit() randomSeed(analogRead(MY_SIGNING_SOFT_RANDOMSEED_PIN)) #define hwRandomNumberInit() randomSeed(RANDOM_REG32)
void hwInit(void); void hwInit(void);
void hwReadConfigBlock(void* buf, void* adr, size_t length); void hwReadConfigBlock(void* buf, void* adr, size_t length);