summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--cc3200/boards/LAUNCHXL/mpconfigboard.h5
-rw-r--r--cc3200/boards/WIPY-SD/mpconfigboard.h5
-rw-r--r--cc3200/boards/WIPY/mpconfigboard.h5
-rw-r--r--cc3200/mptask.c6
-rw-r--r--cc3200/serverstask.h5
5 files changed, 18 insertions, 8 deletions
diff --git a/cc3200/boards/LAUNCHXL/mpconfigboard.h b/cc3200/boards/LAUNCHXL/mpconfigboard.h
index e1dbac29b0..fb274e0a97 100644
--- a/cc3200/boards/LAUNCHXL/mpconfigboard.h
+++ b/cc3200/boards/LAUNCHXL/mpconfigboard.h
@@ -33,6 +33,11 @@
#define MICROPY_HW_BOARD_NAME VERSION_E(BOARD_NAME, VERSION_NUMBER)
#define MICROPY_HW_MCU_NAME "CC3200"
+#define MICROPY_PORT_WLAN_AP_SSID "launchpad-wlan"
+#define MICROPY_PORT_WLAN_AP_KEY "micropython"
+#define MICROPY_PORT_WLAN_AP_SECURITY SL_SEC_TYPE_WPA_WPA2
+#define MICROPY_PORT_WLAN_AP_CHANNEL 5
+
#define MICROPY_HW_HAS_SDCARD (0)
#define MICROPY_HW_ENABLE_RNG (1)
#define MICROPY_HW_ENABLE_RTC (1)
diff --git a/cc3200/boards/WIPY-SD/mpconfigboard.h b/cc3200/boards/WIPY-SD/mpconfigboard.h
index 74435858f7..8e67693133 100644
--- a/cc3200/boards/WIPY-SD/mpconfigboard.h
+++ b/cc3200/boards/WIPY-SD/mpconfigboard.h
@@ -33,6 +33,11 @@
#define MICROPY_HW_BOARD_NAME VERSION_E(BOARD_NAME, VERSION_NUMBER)
#define MICROPY_HW_MCU_NAME "CC3200"
+#define MICROPY_PORT_WLAN_AP_SSID "wipy-wlan"
+#define MICROPY_PORT_WLAN_AP_KEY "www.wipy.io"
+#define MICROPY_PORT_WLAN_AP_SECURITY SL_SEC_TYPE_WPA_WPA2
+#define MICROPY_PORT_WLAN_AP_CHANNEL 5
+
#define MICROPY_HW_HAS_SDCARD (1)
#define MICROPY_HW_ENABLE_RNG (1)
#define MICROPY_HW_ENABLE_RTC (1)
diff --git a/cc3200/boards/WIPY/mpconfigboard.h b/cc3200/boards/WIPY/mpconfigboard.h
index edbb8a4b36..b263f9e8dc 100644
--- a/cc3200/boards/WIPY/mpconfigboard.h
+++ b/cc3200/boards/WIPY/mpconfigboard.h
@@ -33,6 +33,11 @@
#define MICROPY_HW_BOARD_NAME VERSION_E(BOARD_NAME, VERSION_NUMBER)
#define MICROPY_HW_MCU_NAME "CC3200"
+#define MICROPY_PORT_WLAN_AP_SSID "wipy-wlan"
+#define MICROPY_PORT_WLAN_AP_KEY "www.wipy.io"
+#define MICROPY_PORT_WLAN_AP_SECURITY SL_SEC_TYPE_WPA_WPA2
+#define MICROPY_PORT_WLAN_AP_CHANNEL 5
+
#define MICROPY_HW_HAS_SDCARD (0)
#define MICROPY_HW_ENABLE_RNG (1)
#define MICROPY_HW_ENABLE_RTC (1)
diff --git a/cc3200/mptask.c b/cc3200/mptask.c
index 5bb10dd8a8..66bacf7f13 100644
--- a/cc3200/mptask.c
+++ b/cc3200/mptask.c
@@ -338,9 +338,9 @@ STATIC void mptask_init_sflash_filesystem (void) {
}
STATIC void mptask_enter_ap_mode (void) {
- // Enable simplelink in low power mode
- wlan_sl_enable (ROLE_AP, SERVERS_DEF_AP_SSID, strlen(SERVERS_DEF_AP_SSID), SERVERS_DEF_AP_SECURITY,
- SERVERS_DEF_AP_KEY, strlen(SERVERS_DEF_AP_KEY), SERVERS_DEF_AP_CHANNEL);
+ // enable simplelink in low power mode
+ wlan_sl_enable (ROLE_AP, MICROPY_PORT_WLAN_AP_SSID, strlen(MICROPY_PORT_WLAN_AP_SSID), MICROPY_PORT_WLAN_AP_SECURITY,
+ MICROPY_PORT_WLAN_AP_KEY, strlen(MICROPY_PORT_WLAN_AP_KEY), MICROPY_PORT_WLAN_AP_CHANNEL);
}
STATIC void mptask_create_main_py (void) {
diff --git a/cc3200/serverstask.h b/cc3200/serverstask.h
index d51c88e6f4..7f0c9d6cec 100644
--- a/cc3200/serverstask.h
+++ b/cc3200/serverstask.h
@@ -39,11 +39,6 @@
#define SERVERS_USER_LEN_MAX 16
#define SERVERS_PASS_LEN_MAX 16
-#define SERVERS_DEF_AP_SSID "micropy-wlan"
-#define SERVERS_DEF_AP_SECURITY SL_SEC_TYPE_WPA_WPA2
-#define SERVERS_DEF_AP_KEY "micropython"
-#define SERVERS_DEF_AP_CHANNEL 6
-
#define SERVERS_CYCLE_TIME_MS 5
/******************************************************************************