More small edits after full review of my code.

pull/289/head
dannybackx 8 years ago
parent 50688ed5d9
commit 149ddef501
  1. 12
      cmd/cmd.h
  2. 6
      cmd/handlers.c
  3. 2
      esp-link/cgioptiboot.c
  4. 1
      esp-link/cgiservices.c
  5. 1
      esp-link/main.c
  6. 1
      esp-link/mqtt_client.c
  7. 1
      esp-link/status.c

@ -61,12 +61,12 @@ typedef enum {
CMD_SOCKET_SETUP = 40, // set-up callbacks CMD_SOCKET_SETUP = 40, // set-up callbacks
CMD_SOCKET_SEND, // send data over UDP socket CMD_SOCKET_SEND, // send data over UDP socket
CMD_WIFI_GET_APCOUNT = 50, /* */ CMD_WIFI_GET_APCOUNT = 50, // Query the number of networks / Access Points known
CMD_WIFI_GET_APNAME, CMD_WIFI_GET_APNAME, // Query the name (SSID) of an Access Point (AP)
CMD_WIFI_SELECT_SSID, CMD_WIFI_SELECT_SSID, // Connect to a specific network
CMD_WIFI_SIGNAL_STRENGTH, // Query RSSI CMD_WIFI_SIGNAL_STRENGTH, // Query RSSI
CMD_WIFI_GET_SSID, // Query SSID currently connected to CMD_WIFI_GET_SSID, // Query SSID currently connected to
CMD_WIFI_START_SCAN, // Trigger a scan (takes a long time) CMD_WIFI_START_SCAN, // Trigger a scan (takes a long time)
} CmdName; } CmdName;

@ -33,7 +33,7 @@ static void cmdSync(CmdPacket *cmd);
static void cmdWifiStatus(CmdPacket *cmd); static void cmdWifiStatus(CmdPacket *cmd);
static void cmdGetTime(CmdPacket *cmd); static void cmdGetTime(CmdPacket *cmd);
static void cmdGetWifiInfo(CmdPacket *cmd); static void cmdGetWifiInfo(CmdPacket *cmd);
static void cmdSetWifiInfo(CmdPacket *cmd); // static void cmdSetWifiInfo(CmdPacket *cmd);
static void cmdAddCallback(CmdPacket *cmd); static void cmdAddCallback(CmdPacket *cmd);
static void cmdWifiGetApCount(CmdPacket *cmd); static void cmdWifiGetApCount(CmdPacket *cmd);
@ -60,7 +60,7 @@ const CmdList commands[] = {
{CMD_CB_ADD, "ADD_CB", cmdAddCallback}, {CMD_CB_ADD, "ADD_CB", cmdAddCallback},
{CMD_GET_TIME, "GET_TIME", cmdGetTime}, {CMD_GET_TIME, "GET_TIME", cmdGetTime},
{CMD_GET_WIFI_INFO, "GET_WIFI_INFO", cmdGetWifiInfo}, {CMD_GET_WIFI_INFO, "GET_WIFI_INFO", cmdGetWifiInfo},
{CMD_SET_WIFI_INFO, "SET_WIFI_INFO", cmdSetWifiInfo}, // {CMD_SET_WIFI_INFO, "SET_WIFI_INFO", cmdSetWifiInfo},
{CMD_WIFI_GET_APCOUNT, "WIFI_GET_APCOUNT", cmdWifiGetApCount}, {CMD_WIFI_GET_APCOUNT, "WIFI_GET_APCOUNT", cmdWifiGetApCount},
{CMD_WIFI_GET_APNAME, "WIFI_GET_APNAME", cmdWifiGetApName}, {CMD_WIFI_GET_APNAME, "WIFI_GET_APNAME", cmdWifiGetApName},
@ -331,6 +331,7 @@ static void ICACHE_FLASH_ATTR cmdWifiSelectSSID(CmdPacket *cmd) {
} }
} }
#if 0
/* /*
* Once we're attached to some wireless network, choose not to pick up address from * Once we're attached to some wireless network, choose not to pick up address from
* DHCP or so but set our own. * DHCP or so but set our own.
@ -338,6 +339,7 @@ static void ICACHE_FLASH_ATTR cmdWifiSelectSSID(CmdPacket *cmd) {
static void ICACHE_FLASH_ATTR cmdSetWifiInfo(CmdPacket *cmd) { static void ICACHE_FLASH_ATTR cmdSetWifiInfo(CmdPacket *cmd) {
DBG("SetWifiInfo()\n"); DBG("SetWifiInfo()\n");
} }
#endif
static void ICACHE_FLASH_ATTR cmdWifiSignalStrength(CmdPacket *cmd) { static void ICACHE_FLASH_ATTR cmdWifiSignalStrength(CmdPacket *cmd) {
CmdRequest req; CmdRequest req;

@ -8,8 +8,8 @@
#include "uart.h" #include "uart.h"
#include "stk500.h" #include "stk500.h"
#include "serbridge.h" #include "serbridge.h"
#include "serled.h"
#include "mqtt_cmd.h" #include "mqtt_cmd.h"
#include "serled.h"
#define INIT_DELAY 150 // wait this many millisecs before sending anything #define INIT_DELAY 150 // wait this many millisecs before sending anything
#define BAUD_INTERVAL 600 // interval after which we change baud rate #define BAUD_INTERVAL 600 // interval after which we change baud rate

@ -1,5 +1,4 @@
#include <esp8266.h> #include <esp8266.h>
#include "cmd.h"
#include "cgiwifi.h" #include "cgiwifi.h"
#include "cgi.h" #include "cgi.h"
#include "config.h" #include "config.h"

@ -13,7 +13,6 @@
#include "httpd.h" #include "httpd.h"
#include "httpdespfs.h" #include "httpdespfs.h"
#include "cgi.h" #include "cgi.h"
#include "cmd.h"
#include "cgiwifi.h" #include "cgiwifi.h"
#include "cgipins.h" #include "cgipins.h"
#include "cgitcp.h" #include "cgitcp.h"

@ -1,6 +1,5 @@
#ifdef MQTT #ifdef MQTT
#include <esp8266.h> #include <esp8266.h>
#include "cmd/cmd.h"
#include "cgiwifi.h" #include "cgiwifi.h"
#include "config.h" #include "config.h"
#include "mqtt.h" #include "mqtt.h"

@ -3,7 +3,6 @@
#include <esp8266.h> #include <esp8266.h>
#include "config.h" #include "config.h"
#include "serled.h" #include "serled.h"
#include "cmd.h"
#include "cgiwifi.h" #include "cgiwifi.h"
#ifdef MQTT #ifdef MQTT

Loading…
Cancel
Save