Style

Author: TAiGA

libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp

@@ -303,7 +303,7 @@ bool ESP8266WiFiGenericClass::setSleepMode(WiFiSleepType_t type, uint8_t listenI
 
  */
 
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
 
 #ifdef DEBUG_ESP_WIFI
  if (listenInterval && type == WIFI_NONE_SLEEP)
@@ -334,9 +334,9 @@ bool ESP8266WiFiGenericClass::setSleepMode(WiFiSleepType_t type, uint8_t listenI
  }
  }
  }
-#else // (NONOSDK >= (0x30000-1))
+#else // (NONOSDK >= (0x30000 - 1))
  (void)listenInterval;
-#endif // (NONOSDK >= (0x30000-1))
+#endif // (NONOSDK >= (0x30000 - 1))
 
  bool ret = wifi_set_sleep_type((sleep_type_t) type);
  if (!ret) {
@@ -571,7 +571,7 @@ bool ESP8266WiFiGenericClass::forceSleepWake() {
  * @return interval
  */
 uint8_t ESP8266WiFiGenericClass::getListenInterval () {
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
  return wifi_get_listen_interval();
 #else
  return 0;
@@ -583,7 +583,7 @@ uint8_t ESP8266WiFiGenericClass::getListenInterval () {
  * @return true if max level
  */
 bool ESP8266WiFiGenericClass::isSleepLevelMax () {
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
  return wifi_get_sleep_level() == MAX_SLEEP_T;
 #else
  return false;

libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp

@@ -61,7 +61,7 @@ static bool sta_config_equal(const station_config& lhs, const station_config& rh
  */
 static bool sta_config_equal(const station_config& lhs, const station_config& rhs) {
 
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
  static_assert(sizeof(station_config) == 116, "struct station_config has changed, please update comparison function");
 #else
  static_assert(sizeof(station_config) == 112, "struct station_config has changed, please update comparison function");
@@ -94,7 +94,7 @@ static bool sta_config_equal(const station_config& lhs, const station_config& rh
  return false;
  }
 
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
  if(lhs.open_and_wep_mode_disable != rhs.open_and_wep_mode_disable) {
  return false;
  }
@@ -166,7 +166,7 @@ wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase,
  }
 
  conf.threshold.rssi = -127;
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
  conf.open_and_wep_mode_disable = !(_useInsecureWEP || *conf.password == 0);
 #endif
 #if (NONOSDK >= (0x30200))

tests/host/common/user_interface.cpp

@@ -85,11 +85,11 @@ extern "C"
  config->bssid[i] = i;
  config->threshold.rssi = 1;
  config->threshold.authmode = AUTH_WPA_PSK;
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
  config->open_and_wep_mode_disable = true;
 #endif
 #if (NONOSDK >= (0x30200))
- config->channel = 1;
+ config->channel  = 1;
  config->all_channel_scan = true;
 #endif
  return true;
@@ -215,7 +215,7 @@ extern "C"
  return STATION_MODE;
  }
 
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
 
  sleep_level_t wifi_get_sleep_level(void)
  {
@@ -271,7 +271,7 @@ extern "C"
  return true;
  }
 
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
 
  bool wifi_set_sleep_level(sleep_level_t level)
  {

tools/boards.txt.py

@@ -1670,6 +1670,18 @@ def sdk ():
  ('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
  ('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (180626 known issues)'),
  ('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
+ ('.menu.sdk.nonosdk300', 'nonos-sdk 3.0.0'),
+ ('.menu.sdk.nonosdk300.build.sdk', 'NONOSDK300'),
+ ('.menu.sdk.nonosdk301', 'nonos-sdk 3.0.1'),
+ ('.menu.sdk.nonosdk301.build.sdk', 'NONOSDK301'),
+ ('.menu.sdk.nonosdk302', 'nonos-sdk 3.0.2'),
+ ('.menu.sdk.nonosdk302.build.sdk', 'NONOSDK302'),
+ ('.menu.sdk.nonosdk303', 'nonos-sdk 3.0.3'),
+ ('.menu.sdk.nonosdk303.build.sdk', 'NONOSDK303'),
+ ('.menu.sdk.nonosdk304', 'nonos-sdk 3.0.4'),
+ ('.menu.sdk.nonosdk304.build.sdk', 'NONOSDK304'),
+ ('.menu.sdk.nonosdk305', 'nonos-sdk 3.0.5'),
+ ('.menu.sdk.nonosdk305.build.sdk', 'NONOSDK305'),
  ])
  }
 

tools/sdk/include/user_interface.h

@@ -26,7 +26,7 @@
 #define __USER_INTERFACE_H__
 
 #if defined(NONOSDK3V0)
-#define NONOSDK (0x30000-1)
+#define NONOSDK (0x30000 - 1)
 #elif defined(NONOSDK300)
 #define NONOSDK (0x30000)
 #elif defined(NONOSDK301)
@@ -276,7 +276,7 @@ struct station_config {
  // with both ssid[] and bssid[] matched. Please check about this.
  uint8 bssid[6];
  wifi_fast_scan_threshold_t threshold;
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
  bool open_and_wep_mode_disable; // Can connect to open/wep router by default.
 #endif
 #if (NONOSDK >= (0x30200))
@@ -464,7 +464,7 @@ typedef enum {
  MODEM_SLEEP_T
 } sleep_type_t;
 
-#if (NONOSDK >= (0x30000-1))
+#if (NONOSDK >= (0x30000 - 1))
 
 typedef enum {
  MIN_SLEEP_T,