Skip to content

Fixes so project compiles. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clevertrack1 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes so project compiles. #3

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8960744
mDNS.begin() API changed.
Sep 12, 2019
2465584
Change ESP32Webserver to Webserver library.
Sep 12, 2019
de3bd0b
Fix include path for BufferedAdcSampler
Sep 12, 2019
beb3b81
Fix hpoint initialisation error.
Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions espScope.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@


#include <WiFiClient.h>
#include <ESP32WebServer.h>
#include <WebServer.h>
#include <ESPmDNS.h>
#include <WiFi.h>
#include <Arduino.h>
#include "driver/ledc.h"
#include "BufferedAdcSampler.h"
#include "BufferdAdcSampler/BufferedAdcSampler.h"

//change log:
// v1 - initial version (dma problem?)
Expand Down Expand Up @@ -44,7 +44,7 @@ typedef enum {falling = 0, rising = 1} TRIGGER_EDGE_E;
typedef enum {stopTrig = 0, noneTrig = 1, autoTrig = 2, singleTrig = 3} TRIGGER_MODE_E;
const char * triggerTexts[4] = {"stop\0", "none\0","auto\0","single\0"};
const int triggerEdgeConfig[2] = {FALLING, RISING};
ESP32WebServer server(80);
WebServer server(80);
MDNSResponder mdns;
I2S_AdcSampler adcSampler;
char str[50000] = "stop,0,";
Expand Down Expand Up @@ -74,6 +74,7 @@ bool ClockEnable(int pin, int Hz)
ch_conf.duty = 1;
ch_conf.speed_mode = LEDC_HIGH_SPEED_MODE;
ch_conf.gpio_num = pin;
ch_conf.hpoint = 0;
err = ledc_channel_config(&ch_conf);
if (err != ESP_OK) {
return false;
Expand Down Expand Up @@ -336,7 +337,7 @@ void setup(void){
Serial.println(WiFi.localIP());

//start mDNS service
if (mdns.begin("espscope",TCPIP_ADAPTER_IF_STA, WiFi.localIP())) {
if (mdns.begin("espscope")) {
mdns.addService("http","tcp",80);
Serial.println("Accessible as \"espscope.local/\" over mDMS service");
}
Expand Down