Skip to content

GitLab

Commit fec70ad3 authored by Damien George's avatar Damien George
Browse files

stmhal: Remove long-obsolete pybwlan.[ch] files from old CC3k driver.

parent 9336ee32
Hide whitespace changes
Inline Side-by-side
stmhal/Makefile
View file @ fec70ad3
......@@ -123,7 +123,6 @@ SRC_C = \
servo.c \
dac.c \
adc.c \
pybwlan.c \
SRC_S = \
startup_stm32f40xx.s \
......
stmhal/main.c
View file @ fec70ad3
......@@ -62,7 +62,6 @@
#include "accel.h"
#include "servo.h"
#include "dac.h"
#include "pybwlan.h"
#include "pybstdio.h"
#include "modnetwork.h"
......@@ -503,12 +502,6 @@ soft_reset:
dac_init();
#endif
#if MICROPY_HW_ENABLE_CC3K
// wifi using the CC3000 driver
pyb_wlan_init();
pyb_wlan_start();
#endif
mod_network_init();
// At this point everything is fully configured and initialised.
......
stmhal/pybwlan.c deleted 100644 → 0
View file @ 9336ee32
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2013, 2014 Damien P. George
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include "stm32f4xx_hal.h"
#include "mpconfig.h"
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#if MICROPY_HW_ENABLE_CC3K
#include "cc3k/ccspi.h"
#include "cc3k/hci.h"
#include "cc3k/socket.h"
#include "cc3k/netapp.h"
#include "cc3k/wlan.h"
#include "cc3k/nvmem.h"
STATIC mp_obj_t pyb_wlan_connect(uint n_args, const mp_obj_t *args) {
const char *ap;
const char *key;
if (n_args == 2) {
ap = mp_obj_str_get_str(args[0]);
key = mp_obj_str_get_str(args[1]);
} else {
ap = "your-ssid";
key = "your-password";
}
// might want to set wlan_ioctl_set_connection_policy
int ret = wlan_connect(WLAN_SEC_WPA2, ap, strlen(ap), NULL, (byte*)key, strlen(key));
return mp_obj_new_int(ret);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_wlan_connect_obj, 0, 2, pyb_wlan_connect);
STATIC mp_obj_t pyb_wlan_disconnect(void) {
int ret = wlan_disconnect();
return mp_obj_new_int(ret);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_wlan_disconnect_obj, pyb_wlan_disconnect);
mp_obj_t decode_addr(unsigned char *ip, int n_bytes) {
char data[64] = "";
if (n_bytes == 4) {
snprintf(data, 64, "%u.%u.%u.%u", ip[3], ip[2], ip[1], ip[0]);
} else if (n_bytes == 6) {
snprintf(data, 64, "%02x:%02x:%02x:%02x:%02x:%02x", ip[5], ip[4], ip[3], ip[2], ip[1], ip[0]);
} else if (n_bytes == 32) {
snprintf(data, 64, "%s", ip);
}
return mp_obj_new_str(data, strlen(data), false);
}
void decode_addr_and_store(mp_obj_t object, qstr q_attr, unsigned char *ip, int n_bytes) {
mp_store_attr(object, q_attr, decode_addr(ip, n_bytes));
}
static mp_obj_t net_address_type = MP_OBJ_NULL;
STATIC mp_obj_t pyb_wlan_get_ip(void) {
tNetappIpconfigRetArgs ipconfig;
netapp_ipconfig(&ipconfig);
// If byte 1 is 0 we don't have a valid address
if (ipconfig.aucIP[3] == 0) {
return mp_const_none;
}
// if it doesn't already exist, make a new empty class for NetAddress objects
if (net_address_type == MP_OBJ_NULL) {
net_address_type = mp_obj_new_type(QSTR_FROM_STR_STATIC("NetAddress"), mp_const_empty_tuple, mp_obj_new_dict(0));
}
// make a new NetAddress object
mp_obj_t net_addr = mp_call_function_0(net_address_type);
// fill the NetAddress object with data
decode_addr_and_store(net_addr, QSTR_FROM_STR_STATIC("ip"), &ipconfig.aucIP[0], 4);
decode_addr_and_store(net_addr, QSTR_FROM_STR_STATIC("subnet"), &ipconfig.aucSubnetMask[0], 4);
decode_addr_and_store(net_addr, QSTR_FROM_STR_STATIC("gateway"), &ipconfig.aucDefaultGateway[0], 4);
decode_addr_and_store(net_addr, QSTR_FROM_STR_STATIC("dhcp"), &ipconfig.aucDHCPServer[0], 4);
decode_addr_and_store(net_addr, QSTR_FROM_STR_STATIC("dns"), &ipconfig.aucDNSServer[0], 4);
decode_addr_and_store(net_addr, QSTR_FROM_STR_STATIC("mac"), &ipconfig.uaMacAddr[0], 6);
decode_addr_and_store(net_addr, QSTR_FROM_STR_STATIC("ssid"), &ipconfig.uaSSID[0], 32);
return net_addr;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_wlan_get_ip_obj, pyb_wlan_get_ip);
uint32_t last_ip = 0; // XXX such a hack!
STATIC mp_obj_t pyb_wlan_get_host(mp_obj_t host_name) {
const char *host = mp_obj_str_get_str(host_name);
uint32_t ip;
if (gethostbyname(host, strlen(host), &ip) < 0) {
printf("gethostbyname failed\n");
return mp_const_none;
}
if (ip == 0) {
// unknown host
return mp_const_none;
}
last_ip = ip;
byte ip_data[4];
ip_data[0] = ((ip >> 0) & 0xff);
ip_data[1] = ((ip >> 8) & 0xff);
ip_data[2] = ((ip >> 16) & 0xff);
ip_data[3] = ((ip >> 24) & 0xff);
return decode_addr(ip_data, 4);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_wlan_get_host_obj, pyb_wlan_get_host);
STATIC mp_obj_t pyb_wlan_http_get(mp_obj_t host_name, mp_obj_t host_path) {
int port;
if (mp_obj_is_integer(host_name)) {
last_ip = (192 << 24) | (168 << 16) | (0 << 8) | (mp_obj_get_int(host_name));
port = 8080;
} else {
if (pyb_wlan_get_host(host_name) == mp_const_none) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unknown host"));
}
port = 80;
}
int sd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (sd < 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "socket failed: %d", sd));
}
printf("socket seemed to work\n");
sockaddr_in remote;
memset(&remote, 0, sizeof(sockaddr_in));
remote.sin_family = AF_INET;
remote.sin_port = htons(port);
remote.sin_addr.s_addr = htonl(last_ip);
int ret = connect(sd, (sockaddr*)&remote, sizeof(sockaddr));
if (ret != 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "connect failed: %d", ret));
}
printf("connect seemed to work\n");
vstr_t *vstr = vstr_new();
//vstr_printf(vstr, "GET %s HTTP/1.1\r\nHost: %s\r\nUser-Agent: PYBv2\r\n\r\n", mp_obj_str_get_str(host_path), mp_obj_str_get_str(host_name));
if (mp_obj_is_integer(host_name)) {
vstr_printf(vstr, "GET %s HTTP/1.1\r\nHost: localhost\r\n\r\n", mp_obj_str_get_str(host_path));
} else {
vstr_printf(vstr, "GET %s HTTP/1.1\r\nHost: %s\r\n\r\n", mp_obj_str_get_str(host_path), mp_obj_str_get_str(host_name));
}
const char *query = vstr_str(vstr);
// send query
{
int sent = 0;
while (sent < strlen(query)) {
/*
extern void SpiIntGPIOHandler(void);
SpiIntGPIOHandler();
*/
// do a select() call on this socket
timeval timeout;
fd_set fd_write;
FD_ZERO(&fd_write);
FD_SET(sd, &fd_write);
timeout.tv_sec = 1;
timeout.tv_usec = 0;
printf("send select\n");
int s = select(sd + 1, NULL, &fd_write, NULL, &timeout);
printf("send select returned %d\n", s);
if (s < 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "select failed %d", s));
} else if (s == 0) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "send not ready"));
}
printf("sending %d bytes\n", strlen(query + sent));
int ret = send(sd, query + sent, strlen(query + sent), 0);
printf("sent %d bytes\n", ret);
if (ret < 0) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "send failed"));
}
if (ret > strlen(query + sent)) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "send sent too much"));
}
sent += ret;
//HAL_Delay(200);
}
}
printf("send seemed to work!\n");
//HAL_Delay(5000);
// receive reply
mp_obj_t mp_ret = mp_const_none;
{
printf("doing receive\n");
char buf[64];
vstr_reset(vstr);
for (;;) {
// do a select() call on this socket
timeval timeout;
fd_set fd_read;
memset(&fd_read, 0, sizeof(fd_read));
FD_SET(sd, &fd_read);
timeout.tv_sec = 1;
timeout.tv_usec = 0;
printf("recv select\n");
int s = select(sd + 1, &fd_read, NULL, NULL, &timeout);
printf("recv select done %d\n", s);
if (s < 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "select failed %d", s));
} else if (s == 0) {
// no data available
printf("no data!\n");
break;
}
// read data
ret = recv(sd, buf, 64, 0);
if (ret <= 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "recv failed %d", ret));
}
printf("recv data: %.*s\n", ret, buf);
vstr_add_strn(vstr, buf, ret);
}
mp_ret = mp_obj_new_str(vstr->buf, vstr->len, false);
}
closesocket(sd);
vstr_free(vstr);
return mp_ret;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_wlan_http_get_obj, pyb_wlan_http_get);
STATIC mp_obj_t pyb_wlan_serve(void) {
printf("serve socket\n");
int sd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
printf("serve socket got %d\n", sd);
HAL_Delay(500);
if (sd < 0) {
printf("socket fail\n");
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "socket failed: %d", sd));
}
/*
if (setsockopt(sd, SOL_SOCKET, SOCKOPT_ACCEPT_NONBLOCK, SOCK_ON, sizeof(SOCK_ON)) < 0) {
printf("couldn't set socket as non-blocking\n");
return mp_const_none;
}
*/
sockaddr_in remote;
memset(&remote, 0, sizeof(sockaddr_in));
remote.sin_family = AF_INET;
remote.sin_port = htons(8080);
remote.sin_addr.s_addr = htonl(0);
printf("serve bind\n");
int ret = bind(sd, (sockaddr*)&remote, sizeof(sockaddr));
printf("serve bind got %d\n", ret);
HAL_Delay(100);
if (ret != 0) {
printf("bind fail\n");
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "bind failed: %d", ret));
}
printf("bind seemed to work\n");
// listen
ret = listen(sd, 0);
printf("listen = %d\n", ret);
HAL_Delay(100);
// accept connections
int fd = -1;
for (;;) {
sockaddr accept_addr;
socklen_t accept_len;
fd = accept(sd, &accept_addr, &accept_len);
printf("accept = %d\n", fd);
HAL_Delay(500);
if (fd >= 0) {
break;
}
}
// receive some data
{
printf("receiving on sd=%d fd=%d\n", sd, fd);
char buf[64];
ret = recv(fd, buf, 64, 0);
printf("recv = %d\n", ret);
if (ret > 0) {
printf("****%.*s****\n", ret, buf);
}
HAL_Delay(100);
}
// send some data
ret = send(fd, "test data!", 10, 0);
printf("send = %d\n", ret);
HAL_Delay(100);
closesocket(fd);
closesocket(sd);
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_wlan_serve_obj, pyb_wlan_serve);
//*****************************************************************************
//
//! CC3000_UsynchCallback
//!
//! @param lEventType Event type
//! @param data
//! @param length
//!
//! @return none
//!
//! @brief The function handles asynchronous events that come from CC3000
//! device and operates a led for indicate
//
//*****************************************************************************
void CC3000_UsynchCallback(long lEventType, char * data, unsigned char length)
{
if (lEventType == HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE)
{
//ulSmartConfigFinished = 1;
//ucStopSmartConfig = 1;
printf("WLAN: simple config done\n");
}
if (lEventType == HCI_EVNT_WLAN_UNSOL_CONNECT)
{
//ulCC3000Connected = 1;
printf("WLAN unsol connect\n");
}
if (lEventType == HCI_EVNT_WLAN_UNSOL_DISCONNECT)
{
//ulCC3000Connected = 0;
//ulCC3000DHCP = 0;
//ulCC3000DHCP_configured = 0;
printf("WLAN unsol disconnect\n");
}
if (lEventType == HCI_EVNT_WLAN_UNSOL_DHCP)
{
//ulCC3000DHCP = 1;
printf("WLAN unsol DHCP\n");
}
if (lEventType == HCI_EVENT_CC3000_CAN_SHUT_DOWN)
{
//OkToDoShutDown = 1;
printf("WLAN can shut down\n");
}
if (lEventType == HCI_EVNT_WLAN_ASYNC_PING_REPORT)
{
printf("WLAN async ping report\n");
//PRINT_F("CC3000: Ping report\n\r");
//pingReportnum++;
//memcpy(&pingReport, data, length);
}
if (lEventType == HCI_EVNT_BSD_TCP_CLOSE_WAIT) {
printf("WLAN bsd tcp close wait\n");
/*
uint8_t socketnum;
socketnum = data[0];
//PRINT_F("TCP Close wait #"); printDec(socketnum);
if (socketnum < MAX_SOCKETS)
closed_sockets[socketnum] = true;
*/
}
}
void pyb_wlan_init(void) {
SpiInit();
wlan_init(CC3000_UsynchCallback, sendWLFWPatch, sendDriverPatch, sendBootLoaderPatch, ReadWlanInterruptPin, WlanInterruptEnable, WlanInterruptDisable, WriteWlanPin);
mp_obj_t m = mp_obj_new_module(QSTR_FROM_STR_STATIC("wlan"));
mp_store_attr(m, QSTR_FROM_STR_STATIC("connect"), (mp_obj_t)&pyb_wlan_connect_obj);
mp_store_attr(m, QSTR_FROM_STR_STATIC("disconnect"), (mp_obj_t)&pyb_wlan_disconnect_obj);
mp_store_attr(m, QSTR_FROM_STR_STATIC("ip"), (mp_obj_t)&pyb_wlan_get_ip_obj);
mp_store_attr(m, QSTR_FROM_STR_STATIC("get_host"), (mp_obj_t)&pyb_wlan_get_host_obj);
mp_store_attr(m, QSTR_FROM_STR_STATIC("http_get"), (mp_obj_t)&pyb_wlan_http_get_obj);
mp_store_attr(m, QSTR_FROM_STR_STATIC("serve"), (mp_obj_t)&pyb_wlan_serve_obj);
mp_store_name(QSTR_FROM_STR_STATIC("wlan"), m);
}
void pyb_wlan_start(void) {
wlan_start(0);
// TODO: check return value !=0
wlan_ioctl_set_connection_policy(0, 0, 0); // don't auto-connect
wlan_ioctl_del_profile(255); // delete stored eeprom data
// Mask out all non-required events from CC3000
wlan_set_event_mask(HCI_EVNT_WLAN_UNSOL_INIT |
//HCI_EVNT_WLAN_ASYNC_PING_REPORT |// we want ping reports
//HCI_EVNT_BSD_TCP_CLOSE_WAIT |
//HCI_EVNT_WLAN_TX_COMPLETE |
HCI_EVNT_WLAN_KEEPALIVE);
/*
byte ver[2];
int ret = nvmem_read_sp_version(ver);
printf("nvmem_read_sp_version=%d; %02x %02x\n", ret, ver[0], ver[1]);
*/
}
#endif // MICROPY_HW_ENABLE_CC3K
stmhal/pybwlan.h deleted 100644 → 0
View file @ 9336ee32
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2013, 2014 Damien P. George
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
void pyb_wlan_init(void);
void pyb_wlan_start(void);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment