arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Minor code style changes

Browse Source
This commit is contained in:
Ivan Grokhotkov 2015-04-30 18:54:16 +08:00
parent 483533ac4c
commit a4536d5935
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cores/esp8266/Esp.cpp
View File

@ -74,7 +74,7 @@ void EspClass::restart(void)
system_restart(); system_restart();
} }
uint16_t EspClass::getVCC(void) uint16_t EspClass::getVcc(void)
{ {
return system_get_vdd33(); return system_get_vdd33();
} }
@ -89,7 +89,7 @@ uint32_t EspClass::getChipId(void)
return system_get_chip_id(); return system_get_chip_id();
} }
const char * EspClass::getSDKversion(void) const char * EspClass::getSdkVersion(void)
{ {
return system_get_sdk_version(); return system_get_sdk_version();
} }
@ -104,7 +104,7 @@ uint8_t EspClass::getBootMode(void)
return system_get_boot_mode(); return system_get_boot_mode();
} }
uint8_t EspClass::getCPUfreqMHz(void) uint8_t EspClass::getCpuFreqMHz(void)
{ {
return system_get_cpu_freq(); return system_get_cpu_freq();
} }
@ -121,7 +121,7 @@ uint32_t EspClass::getFlashChipSize(void)
uint8_t * bytes = (uint8_t *) &data; uint8_t * bytes = (uint8_t *) &data;
// read first 4 byte (magic byte + flash config) // read first 4 byte (magic byte + flash config)
if(spi_flash_read(0x0000, &data, 4) == SPI_FLASH_RESULT_OK) { if(spi_flash_read(0x0000, &data, 4) == SPI_FLASH_RESULT_OK) {
switch((bytes[3] & 0xF0) >> 4) { switch((bytes[3] & 0xf0) >> 4) {
case 0x0: // 4 Mbit (512KB) case 0x0: // 4 Mbit (512KB)
return (512 * kB); return (512 * kB);
case 0x1: // 2 MBit (256KB) case 0x1: // 2 MBit (256KB)
@ -152,7 +152,7 @@ uint32_t EspClass::getFlashChipSpeed(void)
return (26 * MHz); return (26 * MHz);
case 0x2: // 20 MHz case 0x2: // 20 MHz
return (20 * MHz); return (20 * MHz);
case 0xF: // 80 MHz case 0xf: // 80 MHz
return (80 * MHz); return (80 * MHz);
default: // fail? default: // fail?
return 0; return 0;
@ -163,14 +163,14 @@ uint32_t EspClass::getFlashChipSpeed(void)
FlashMode_t EspClass::getFlashChipMode(void) FlashMode_t EspClass::getFlashChipMode(void)
{ {
FlashMode_t mode = FM_FAILD; FlashMode_t mode = FM_UNKNOWN;
uint32_t data; uint32_t data;
uint8_t * bytes = (uint8_t *) &data; uint8_t * bytes = (uint8_t *) &data;
// read first 4 byte (magic byte + flash config) // read first 4 byte (magic byte + flash config)
if(spi_flash_read(0x0000, &data, 4) == SPI_FLASH_RESULT_OK) { if(spi_flash_read(0x0000, &data, 4) == SPI_FLASH_RESULT_OK) {
mode = (FlashMode_t) bytes[2]; mode = (FlashMode_t) bytes[2];
if(mode > FM_DOUT) { if(mode > FM_DOUT) {
mode = FM_FAILD; mode = FM_UNKNOWN;
} }
} }
return mode; return mode;

12
cores/esp8266/Esp.h
View File

@ -54,7 +54,7 @@ typedef enum {
FM_QOUT = 0x01, FM_QOUT = 0x01,
FM_DIO = 0x02, FM_DIO = 0x02,
FM_DOUT = 0x03, FM_DOUT = 0x03,
FM_FAILD = 0xFF FM_UNKNOWN = 0xff
} FlashMode_t; } FlashMode_t;
class EspClass { class EspClass {
@ -63,6 +63,7 @@ class EspClass {
// TODO: figure out how to set WDT timeout // TODO: figure out how to set WDT timeout
void wdtEnable(uint32_t timeout_ms = 0); void wdtEnable(uint32_t timeout_ms = 0);
// note: setting the timeout value is not implemented at the moment
void wdtEnable(WDTO_t timeout_ms = WDTO_0MS); void wdtEnable(WDTO_t timeout_ms = WDTO_0MS);
void wdtDisable(void); void wdtDisable(void);
@ -70,21 +71,20 @@ class EspClass {
void deepSleep(uint32_t time_us, WakeMode mode = WAKE_RF_DEFAULT); void deepSleep(uint32_t time_us, WakeMode mode = WAKE_RF_DEFAULT);
void reset(void); void reset(void);
void restart(void); void restart(void);
uint16_t getVCC(void);
uint16_t getVcc(void);
uint32_t getFreeHeap(void); uint32_t getFreeHeap(void);
uint32_t getChipId(void); uint32_t getChipId(void);
const char * getSdkVersion(void);
const char * getSDKversion(void);
uint8_t getBootVersion(void); uint8_t getBootVersion(void);
uint8_t getBootMode(void); uint8_t getBootMode(void);
uint8_t getCPUfreqMHz(void); uint8_t getCpuFreqMHz(void);
uint32_t getFlashChipId(void); uint32_t getFlashChipId(void);
uint32_t getFlashChipSize(void); uint32_t getFlashChipSize(void);

4
libraries/ESP8266WiFi/src/ESP8266WiFi.h
View File

@ -223,6 +223,10 @@ public:
*/ */
bool smartConfigDone(); bool smartConfigDone();
/*
* Stop SmartConfig
*
*/
void stopSmartConfig(); void stopSmartConfig();
friend class WiFiClient; friend class WiFiClient;