',
-
- PLUGINS = {
- -- 'dht_reader',
- -- 'wsledtest',
- 'dht_test',
- },
-
- PIN_REED_SWITCH = gpio[4],
- PIN_GREEN_LED = nil,
- PIN_RED_LED = nil,
- PIN_RGB_LED = gpio[5],
- PIN_DHT = gpio[14],
-}
diff --git a/esp8266-lua/plugin_framework/flash_initial.sh b/esp8266-lua/plugin_framework/flash_initial.sh
deleted file mode 100755
index 998d07083..000000000
--- a/esp8266-lua/plugin_framework/flash_initial.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./luatool.py -f init.lua
-./luatool.py -f pluginloader.lua
-./luatool.py -f wificonnect.lua
-./luatool.py -f config.lua
-# ./luatool.py -f wsledtest.lua
-# ./luatool.py -c -f drf_api.lua
-# ./luatool.py -f dht_reader.lua
diff --git a/esp8266-lua/plugin_framework/init.lua b/esp8266-lua/plugin_framework/init.lua
deleted file mode 100644
index 6a2b037e5..000000000
--- a/esp8266-lua/plugin_framework/init.lua
+++ /dev/null
@@ -1,35 +0,0 @@
-print('init.lua ver 1.2')
-print('chip: ',node.chipid())
-print('heap: ',node.heap())
-
-local config = require('config')
-
-function go()
- gpio.mode(3, gpio.OUTPUT)
- ws2812.write(config.PIN_RGB_LED, string.char(0, 0, 0))
- if config.SKIP_WIFI_CONNECT then
- local plugin_loader = require('pluginloader')
- plugin_loader.start_plugins()
- else
- dofile('wificonnect.lua')
- end
- if config.PIN_REED_SWITCH then
- dofile('reedswitch.lua')
- end
-end
-
-print('Waiting 3 seconds before continuing... Press GPIO 0 to interrupt')
-if config.PIN_RGB_LED then
- ws2812.write(config.PIN_RGB_LED, string.char(50, 0, 50))
-end
-tmr.alarm(0, 3000, 0, go)
-
-gpio.mode(3, gpio.INT, gpio.PULLUP)
-gpio.trig(3, "down", function(level)
- print("Stopping timer. Not starting wificonnect")
- if config.PIN_RGB_LED then
- ws2812.write(config.PIN_RGB_LED, string.char(50, 50, 0))
- end
- tmr.stop(0)
- gpio.mode(3, gpio.OUTPUT)
-end)
diff --git a/esp8266-lua/plugin_framework/luatool.py b/esp8266-lua/plugin_framework/luatool.py
deleted file mode 100755
index 31cb2c5be..000000000
--- a/esp8266-lua/plugin_framework/luatool.py
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env python2
-#
-# ESP8266 luatool
-# Author e-mail: 4ref0nt@gmail.com
-# Site: http://esp8266.ru
-# Contributions from: https://github.com/sej7278
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-# Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import sys
-import serial
-from time import sleep
-import argparse
-from os.path import basename
-
-version="0.6.3"
-
-def writeln(data, check = 1):
- if s.inWaiting() > 0:
- s.flushInput()
- if len( data ) > 0:
- sys.stdout.write("\r\n->")
- sys.stdout.write(data.split("\r")[0])
- s.write(data)
- sleep(0.3)
- if check > 0 :
- line = ''
- char = ''
- while char != chr(62) : # '>'
- char = s.read(1)
- if char == '' :
- raise Exception('No proper answer from MCU')
- if char == chr(13) or char == chr(10) : # LF or CR
- if line != '':
- line = line.strip()
- if line+'\r' == data :
- sys.stdout.write(" -> ok")
- else :
- if line[:4] == "lua:" :
- sys.stdout.write("\r\n\r\nLua ERROR: %s" % line)
- raise Exception('ERROR from Lua interpreter\r\n\r\n')
- else :
- data = data.split("\r")[0]
- sys.stdout.write("\r\n\r\nERROR")
- sys.stdout.write("\r\n send string : '%s'" % data)
- sys.stdout.write("\r\n expected echo : '%s'" % data)
- sys.stdout.write("\r\n but got answer : '%s'" % line)
- sys.stdout.write("\r\n\r\n")
- raise Exception('Error sending data to MCU\r\n\r\n')
- line = ''
- else :
- line += char
- else:
- sys.stdout.write(" -> send without check")
-
-def writer(data):
- writeln("file.writeline([==[" + data + "]==])\r")
-
-def openserial(args):
- # Open the selected serial port
- try:
- s = serial.Serial(args.port, args.baud)
- except:
- sys.stderr.write("Could not open port %s\n" % (args.port))
- sys.exit(1)
- if args.verbose: sys.stderr.write("Set timeout %s\r\n" % s.timeout)
- s.timeout = 3
- if args.verbose: sys.stderr.write("Set interCharTimeout %s\r\n" % s.interCharTimeout)
- s.interCharTimeout = 3
- return s
-
-if __name__ == '__main__':
- # parse arguments or use defaults
- parser = argparse.ArgumentParser(description='ESP8266 Lua script uploader.')
- parser.add_argument('-p', '--port', default='/dev/ttyUSB0', help='Device name, default /dev/ttyUSB0')
- parser.add_argument('-b', '--baud', default=9600, help='Baudrate, default 9600')
- parser.add_argument('-f', '--src', default='main.lua', help='Source file on computer, default main.lua')
- parser.add_argument('-t', '--dest', default=None, help='Destination file on MCU, default to source file name')
- parser.add_argument('-c', '--compile', action='store_true', help='Compile lua to lc after upload')
- parser.add_argument('-r', '--restart', action='store_true', help='Restart MCU after upload')
- parser.add_argument('-d', '--dofile', action='store_true', help='Run the Lua script after upload')
- parser.add_argument('-v', '--verbose', action='store_true', help="Show progress messages.")
- parser.add_argument('-l', '--list', action='store_true', help='List files on device')
- args = parser.parse_args()
-
- if args.list:
- s = openserial(args)
- writeln("local l = file.list();for k,v in pairs(l) do print('name:'..k..', size:'..v)end\r", 0)
- while True :
- char = s.read(1)
- if char == '' or char == chr(62): break
- sys.stdout.write(char)
- sys.exit(0)
-
- if args.dest is None:
- args.dest = basename(args.src)
-
- # open source file for reading
- try:
- f = open(args.src,"rt")
- except:
- sys.stderr.write("Could not open input file \"%s\"\n" % args.src)
- sys.exit(1)
-
- # Verify the selected file will not exceed the size of the serial buffer.
- # The size of the buffer is 256. This script does not accept files with
- # lines longer than 230 characters to have some room for command overhead.
- for Ln in f:
- if len(Ln) > 230:
- sys.stderr.write("File \"%s\" contains a line with more than 240 "\
- "characters. This exceeds the size of the serial buffer.\n"
- % args.src)
- f.close()
- sys.exit(1)
-
- # Go back to the beginning of the file after verifying it has the correct
- # line length
- f.seek(0)
-
- # Open the selected serial port
- s = openserial(args)
-
- # set serial timeout
- if args.verbose: sys.stderr.write("Upload starting\r\n")
-
- # remove existing file on device
- if args.verbose: sys.stderr.write("Stage 1. Deleting old file from flash memory")
- writeln("file.open(\""+args.dest+"\", \"w\")\r")
- writeln("file.close()\r")
- writeln("file.remove(\""+args.dest+"\")\r")
-
- # read source file line by line and write to device
- if args.verbose: sys.stderr.write("\r\nStage 2. Creating file in flash memory and write first line")
- writeln("file.open(\""+args.dest+"\", \"w+\")\r")
- line = f.readline()
- if args.verbose: sys.stderr.write("\r\nStage 3. Start writing data to flash memory...")
- while line != '':
- writer(line.strip())
- line = f.readline()
-
- # close both files
- f.close()
- if args.verbose: sys.stderr.write("\r\nStage 4. Flush data and closing file")
- writeln("file.flush()\r")
- writeln("file.close()\r")
-
- # compile?
- if args.compile:
- if args.verbose: sys.stderr.write("\r\nStage 5. Compiling")
- writeln("node.compile(\""+args.dest+"\")\r")
- writeln("file.remove(\""+args.dest+"\")\r")
-
- # restart or dofile
- if args.restart:
- writeln("node.restart()\r")
- if args.dofile: # never exec if restart=1
- writeln("dofile(\""+args.dest+"\")\r",0)
-
- # close serial port
- s.flush()
- s.close()
-
- # flush screen
- sys.stdout.flush()
- sys.stderr.flush()
- sys.stderr.write("\r\n--->>> All done <<<---\r\n")
diff --git a/esp8266-lua/plugin_framework/pluginloader.lua b/esp8266-lua/plugin_framework/pluginloader.lua
deleted file mode 100644
index 0d7107f0e..000000000
--- a/esp8266-lua/plugin_framework/pluginloader.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-local config = require('config')
-
-local function start_plugins()
- for i, plugin in ipairs(config.PLUGINS) do
- print("Starting plugin: "..plugin)
- dofile(plugin..".lua")
- local plugin_lib = require(plugin)
- if plugin_lib == nil then
- print("error loading plugin")
- else
- plugin_lib.start()
- end
- end
-end
-
-return {start_plugins = start_plugins}
diff --git a/esp8266-lua/plugin_framework/reedswitch.lua b/esp8266-lua/plugin_framework/reedswitch.lua
deleted file mode 100644
index 9cf48c0f0..000000000
--- a/esp8266-lua/plugin_framework/reedswitch.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local config = require('config')
-
-local last_level = -1
-
-local function tmrCb()
- local level = gpio.read(config.PIN_REED_SWITCH)
- if last_level ~= level then
- last_level = level
- if level == 0 then
- ws2812.write(config.PIN_RGB_LED, string.char(0, 255, 0))
- else
- ws2812.write(config.PIN_RGB_LED, string.char(255, 0, 0))
- end
- tmr.alarm(3, 1000, 0, function ()
- ws2812.write(config.PIN_RGB_LED, string.char(0, 0, 0))
- end)
- end
-end
-
-local function start()
- print('Configuring reedswitch...')
- gpio.mode(config.PIN_REED_SWITCH, gpio.INPUT, gpio.PULLUP)
- tmr.alarm(2, 1000, 1, tmrCb)
-end
-
-start()
-
--- return {start = start}
diff --git a/esp8266-lua/plugin_framework/wificonnect.lua b/esp8266-lua/plugin_framework/wificonnect.lua
deleted file mode 100644
index d6a6fd27c..000000000
--- a/esp8266-lua/plugin_framework/wificonnect.lua
+++ /dev/null
@@ -1,61 +0,0 @@
-local config = require('config')
-
--- setup
-wifi.setmode(wifi.STATION)
-wifi.sta.autoconnect(1)
-wifi.sta.config(config.WIFI_SSID, config.WIFI_KEY)
-
-print('MAC: ',wifi.sta.getmac())
-
-if config.PIN_RED_LED and config.PIN_GREEN_LED then
- gpio.mode(config.PIN_GREEN_LED, gpio.OUTPUT)
- gpio.mode(config.PIN_RED_LED, gpio.OUTPUT)
- c = gpio.HIGH
-end
-
--- watch wifi connect state
-
-tmr.alarm(0, 1000, 1, function()
- if wifi.sta.getip() == nil then
- local status = wifi.sta.status()
- if config.PIN_RGB_LED then
- if status == 1 then -- connecting
- ws2812.write(config.PIN_RGB_LED, string.char(0, 0, 255))
- elseif status <= 4 then
- ws2812.write(config.PIN_RGB_LED, string.char(255, 0, 0))
- elseif status == 5 then
- ws2812.write(config.PIN_RGB_LED, string.char(0, 50, 0))
- end
- end
- if config.PIN_RED_LED and config.PIN_GREEN_LED then
- if status == 1 then -- connecting
- gpio.write(config.PIN_GREEN_LED, c)
- if c == gpio.HIGH then
- c = gpio.LOW
- else
- c = gpio.HIGH
- end
- gpio.write(config.PIN_RED_LED, c)
- elseif status <= 4 then
- gpio.write(config.PIN_GREEN_LED, gpio.LOW)
- gpio.write(config.PIN_RED_LED, gpio.HIGH)
- elseif status == 5 then
- gpio.write(config.PIN_GREEN_LED, gpio.HIGH)
- gpio.write(config.PIN_RED_LED, gpio.LOW)
- end
- end
- -- print("Connecting to AP...")
- else
- print('IP: ',wifi.sta.getip())
- if config.PIN_RED_LED and config.PIN_GREEN_LED then
- gpio.write(config.PIN_RED_LED, gpio.LOW)
- gpio.write(config.PIN_GREEN_LED, gpio.LOW)
- end
- if config.PIN_RGB_LED then
- ws2812.write(config.PIN_RGB_LED, string.char(0, 0, 0))
- end
- tmr.stop(0)
- local plugin_loader = require('pluginloader')
- plugin_loader.start_plugins()
- end
-end)
diff --git a/esp8266-lua/plugin_framework/wsledtest.lua b/esp8266-lua/plugin_framework/wsledtest.lua
deleted file mode 100644
index b3e6f531b..000000000
--- a/esp8266-lua/plugin_framework/wsledtest.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-local config = require('config')
-
-local function setRandomColor()
- ws2812.write(config.PIN_RGB_LED, string.char(math.random(255), math.random(255), math.random(255)))
-end
-
-local function start()
- tmr.alarm(2, 500, 1, setRandomColor)
-end
-
-return {start = start}
diff --git a/esp8266-lua/ppd42ns+dht22/Makefile b/esp8266-lua/ppd42ns+dht22/Makefile
deleted file mode 100644
index 0311040b0..000000000
--- a/esp8266-lua/ppd42ns+dht22/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# for using makefile add luatool.py to your path
-
-upload: upload_main upload_init
- luatool.py -l
-
-upload_main:
- luatool.py -f main.lua
- luatool.py -f http.lua
- luatool.py -f config.lua
-
-upload_init:
- luatool.py -f init.lua
-
diff --git a/esp8266-lua/ppd42ns+dht22/config.template b/esp8266-lua/ppd42ns+dht22/config.template
deleted file mode 100644
index 5ecbab86f..000000000
--- a/esp8266-lua/ppd42ns+dht22/config.template
+++ /dev/null
@@ -1,11 +0,0 @@
--- esp8266-12
-pin_P1=6 -- gpio12 black
-pin_P2=5 -- gpio14 white
--- pin_P2=nil -- to disable sensor
-sampletime=30000 -- 30 seconds
-filter_time=10000 -- in us
--- set to nil (false) to disable DHT
-PIN_DHT22=3
-PIN_GREEN_LED = 2 -- GPIO4
-PIN_RED_LED = 1
-
diff --git a/esp8266-lua/ppd42ns+dht22/devsnippets.lua b/esp8266-lua/ppd42ns+dht22/devsnippets.lua
deleted file mode 100644
index f4fe6aed6..000000000
--- a/esp8266-lua/ppd42ns+dht22/devsnippets.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-
-status,temp,humi,temp_decimial,humi_decimial=dht.readxx(PIN_DHT22)
-if( status == dht.OK ) then
- print("DHT Temperature: "..temp.." ".."Humidity: "..humi)
- print("DHT Temperature_decimial: "..temp_decimial.." ".."Humidity_decimial: "..humi_decimial)
- send_to_api_dht22(status,temp,humi,temp_decimial,humi_decimial)
-else
- --elseif( status ~= dht.OK ) then
- print ("DHT error, status="..status.." PIN_DHT22="..PIN_DHT22)
-end
-
- -- from pluginframework: send_data_to_api('{"sensordatavalues":[{"value_type":"temperature","value":"'..temperature..'"},{"value_type":"humidity","value":"'..humidity..'"}]}')
-
--- =dht.readxx(3)
diff --git a/esp8266-lua/ppd42ns+dht22/http.lua b/esp8266-lua/ppd42ns+dht22/http.lua
deleted file mode 100644
index a90929910..000000000
--- a/esp8266-lua/ppd42ns+dht22/http.lua
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-function build_post_request(host, uri, data)
-
- request = "POST "..uri.." HTTP/1.1\r\n"..
- "Host: "..host.."\r\n"..
- "Connection: close\r\n"..
- "Content-Type: application/json\r\n"..
- "User-Agent: esp8266\r\n"..
- "Sensor: esp8266-"..node.chipid().."\r\n"..
- "Content-Length: "..string.len(data).."\r\n"..
- "\r\n"..
- data
-
- print(request)
-
- return request
-end
-
-function send_to_api(lowpulseoccupancyP1, lowpulseoccupancyP2, sampletime)
-
- local ratioP1 = lowpulseoccupancyP1 / (sampletime*10.0)
- local P1 = 1.1*ratioP1*ratioP1*ratioP1-3.8*ratioP1*ratioP1+520*ratioP1+0.62
- local ratioP2 = lowpulseoccupancyP2 / (sampletime*10.0)
- local P2 = 1.1*ratioP2*ratioP2*ratioP2-3.8*ratioP2*ratioP2+520*ratioP2+0.62
- local data = '{"sensordatavalues":[{"value_type":"durP1","value":"'..lowpulseoccupancyP1..'"},{"value_type":"ratioP1","value":"'..ratioP1..'"},{"value_type":"P1","value":"'..P1..'"}'
- data = data .. ',{"value_type":"durP2","value":"'..lowpulseoccupancyP2..'"},{"value_type":"ratioP2","value":"'..ratioP2..'"},{"value_type":"P2","value":"'..P2..'"}]}'
-
- print("start api connect")
- api=net.createConnection(net.TCP, 0)
- print("connect")
- api:on("receive", function(sck, c) print(c) end )
- api:connect(80, "api.dusti.xyz")
- api:on("connection", function(sck)
- local post_request = build_post_request("api.dusti.xyz", "/v1/push-sensor-data/", data)
- sck:send(post_request)
- print("sent")
- end)
-end
-
-function send_to_api_dht(temperature,humidity)
- local data='{"sensordatavalues":[{"value_type":"temperature","value":"'..temperature..'"},{"value_type":"humidity","value":"'..humidity..'"}]}'
-
- print("start api connect (dht22)")
- api=net.createConnection(net.TCP, 0)
- print("connect (dht22)")
- api:on("receive", function(sck, c) print(c) end )
- api:connect(80, "api.dusti.xyz")
- api:on("connection", function(sck)
- local post_request = build_post_request("api.dusti.xyz", "/v1/push-sensor-data/", data)
- sck:send(post_request)
- print("sent (dht22)")
- end)
-end
diff --git a/esp8266-lua/ppd42ns+dht22/init.lua b/esp8266-lua/ppd42ns+dht22/init.lua
deleted file mode 100644
index 558ca96e8..000000000
--- a/esp8266-lua/ppd42ns+dht22/init.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-tmr.delay(100000)
-
-wifi.setmode(wifi.STATION)
-wifi.sta.autoconnect(1)
-print('set mode=STATION (mode='..wifi.getmode()..')')
-print('MAC: ',wifi.sta.getmac())
-print('chip: ',node.chipid())
-print('heap: ',node.heap())
-
-wifi.sta.config("Freifunk","")
-
--- dofile('main.lua')
diff --git a/esp8266-lua/ppd42ns+dht22/main.lua b/esp8266-lua/ppd42ns+dht22/main.lua
deleted file mode 100644
index fd75e4c30..000000000
--- a/esp8266-lua/ppd42ns+dht22/main.lua
+++ /dev/null
@@ -1,107 +0,0 @@
--- esp8266-12
-pin_P1=6 -- gpio12 black
-pin_P2=5 -- gpio14 white
--- pin_P2=nil -- to disable ppd
-sampletime=30000 -- 30 seconds
-filter_time=10000 -- in us
--- set to nil (false) to disable DHT
-PIN_DHT22=3
-PIN_GREEN_LED = 2 -- GPIO4
-PIN_RED_LED = 1
--- change any setting in config.lua
-dofile('config.lua')
-
-durationP1=0
-trigOnP1=0
-lastTriggerP1=0
-lowpulseoccupancyP1=0
-
-durationP2=0
-trigOnP2=0
-lastTriggerP2=0
-lowpulseoccupancyP2=0
-
-temperature=-999
-humidity=-999
-tempdec=99
-humidec=99
-
-gpio.mode(PIN_GREEN_LED, gpio.OUTPUT)
-gpio.write(PIN_GREEN_LED, gpio.HIGH)
-c = gpio.HIGH
-
-if(pin_P2~=nil) then
- gpio.mode(pin_P1, gpio.INT)
- function pin4change(level)
- if (tmr.now() - lastTriggerP1) > filter_time then
- if level == gpio.LOW then
- trigOnP1 = tmr.now()
- else
- durationP1 = tmr.now() - trigOnP1
- lowpulseoccupancyP1 = lowpulseoccupancyP1 + durationP1
- end
- lastTriggerP1 = tmr.now()
- end
- gpio.trig(pin_P1, "both")
- end
- gpio.trig(pin_P1, "both", pin4change)
-
-
- gpio.mode(pin_P2, gpio.INT)
- function pin2change(level)
- if (tmr.now() - lastTriggerP2) > filter_time then
- if level == gpio.LOW then
- trigOnP2 = tmr.now()
- else
- durationP2 = tmr.now() - trigOnP1
- lowpulseoccupancyP2 = lowpulseoccupancyP2 + durationP2
- end
- lastTriggerP2 = tmr.now()
- end
- gpio.trig(pin_P2, "both")
- end
- gpio.trig(pin_P2, "both", pin2change)
-
-end
-
-function send_it()
- if wifi.sta.getip() == nil then
- status = wifi.sta.status()
- if status == 1 then -- connecting
- gpio.write(PIN_GREEN_LED, c)
- if c == gpio.HIGH then
- c = gpio.LOW
- else
- c = gpio.HIGH
- end
- elseif status <= 4 then
- gpio.write(PIN_GREEN_LED, gpio.LOW)
- elseif status == 5 then
- gpio.write(PIN_GREEN_LED, gpio.HIGH)
- end
- else
- print('IP: ',wifi.sta.getip())
- if (pin_P2~=nil) then
- send_to_api(lowpulseoccupancyP1, lowpulseoccupancyP2, sampletime)
- end
- if (PIN_DHT22 and (dht~=nil)) then
- status,temperature,humidity,tempdec,humidec=dht.readxx(PIN_DHT22)
- if( status == dht.OK ) then
- temperature=math.floor(temperature).."."..tempdec
- humidity=math.floor(humidity).."."..humidec
- print("DHT Temperature: "..temperature.." ".."Humidity: "..humidity)
- send_to_api_dht(temperature,humidity)
- else
- print ("DHT error, status="..status.." PIN_DHT22="..PIN_DHT22)
- end
- end
- end
- -- even if the data could not be sent.
- -- throw it away and try again after samplingtime
- lowpulseoccupancyP1 = 0
- lowpulseoccupancyP2 = 0
- tmr.alarm(0, sampletime, 0, send_it)
-end
-
-tmr.alarm(0, sampletime, 0, send_it)
-dofile('http.lua')
diff --git a/esp8266-lua/ppd42ns+dht22/readme.md b/esp8266-lua/ppd42ns+dht22/readme.md
deleted file mode 100644
index 34ac7b71b..000000000
--- a/esp8266-lua/ppd42ns+dht22/readme.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# ppd42ns
-
-this dir derived from ../ppd42ns/, DHT22 added
-
-## some links for implementation
-
-- http://esp8266.co.uk/tutorials/introduction-to-the-gpio-api/
-- http://www.nodemcu.com/docs/gpio-module/#gpio-module-gpio-trig
-- https://github.com/nodemcu/nodemcu-firmware/issues/179
-
-
-## other implementations
-
-### 1
-
-https://github.com/marcel12bell/feinstaub-app/blob/master/init.lua
-
-seems wrong, because no interrupt is used. one value each second via alarm timer.
-
-### ?
-
-# DHT22
-
- PINS
- ####
- ####
- ####
- ||||
- 1234
-
- PIN connections
- 1 3V3 4.6kOhm 4.7muF[+]
- 2 GPIO 4.6kOhm
- 3
- 4 GND 4.7muF[-]
-
-* resistor/capacitor are optional, it works without, too
-* connect to D3 (nodemcu PIN) resp. GPIO0
-
-
diff --git a/esp8266-lua/ppd42ns/Makefile b/esp8266-lua/ppd42ns/Makefile
deleted file mode 100644
index 9da827118..000000000
--- a/esp8266-lua/ppd42ns/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# for using makefile add luatool.py to your path
-
-upload: upload_main upload_init
- luatool.py -l
-
-upload_main:
- luatool.py -f main.lua
- luatool.py -f http.lua
-
-upload_init:
- luatool.py -f init.lua
-
-noop:
- # upload empty init.lua and reboot
- luatool.py -r -f noop_init/init.lua
-
-upload_dev:
- luatool.py -f init.lua
- luatool.py -f maindev.lua
- luatool.py -f http.lua
- luatool.py -l
diff --git a/esp8266-lua/ppd42ns/http.lua b/esp8266-lua/ppd42ns/http.lua
deleted file mode 100644
index 0dbbc4125..000000000
--- a/esp8266-lua/ppd42ns/http.lua
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-function build_post_request(host, uri, data)
-
- request = "POST "..uri.." HTTP/1.1\r\n"..
- "Host: "..host.."\r\n"..
- "Connection: close\r\n"..
- "Content-Type: application/json\r\n"..
- "User-Agent: esp8266\r\n"..
- "Sensor: esp8266-"..node.chipid().."\r\n"..
- "Content-Length: "..string.len(data).."\r\n"..
- "\r\n"..
- data
-
- print(request)
-
- return request
-end
-
-function send_to_api(lowpulseoccupancyP1, lowpulseoccupancyP2, sampletime)
-
- local ratioP1 = lowpulseoccupancyP1 / (sampletime*10.0)
- local P1 = 1.1*ratioP1*ratioP1*ratioP1-3.8*ratioP1*ratioP1+520*ratioP1+0.62
- local ratioP2 = lowpulseoccupancyP2 / (sampletime*10.0)
- local P2 = 1.1*ratioP2*ratioP2*ratioP2-3.8*ratioP2*ratioP2+520*ratioP2+0.62
- local data = '{"sensordatavalues":[{"value_type":"durP1","value":"'..lowpulseoccupancyP1..'"},{"value_type":"ratioP1","value":"'..ratioP1..'"},{"value_type":"P1","value":"'..P1..'"}'
- data = data .. ',{"value_type":"durP2","value":"'..lowpulseoccupancyP2..'"},{"value_type":"ratioP2","value":"'..ratioP2..'"},{"value_type":"P2","value":"'..P2..'"}]}'
-
- print("start api connect")
- api=net.createConnection(net.TCP, 0)
- print("connect")
- api:on("receive", function(sck, c) print(c) end )
- api:connect(80, "api.dusti.xyz")
- api:on("connection", function(sck)
- local post_request = build_post_request("api.dusti.xyz", "/v1/push-sensor-data/", data)
- sck:send(post_request)
- print("sent")
- end)
-end
diff --git a/esp8266-lua/ppd42ns/init.lua b/esp8266-lua/ppd42ns/init.lua
deleted file mode 100644
index 8cbf000b8..000000000
--- a/esp8266-lua/ppd42ns/init.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-tmr.delay(100000)
-
-wifi.setmode(wifi.STATION)
-wifi.sta.autoconnect(1)
-print('set mode=STATION (mode='..wifi.getmode()..')')
-print('MAC: ',wifi.sta.getmac())
-print('chip: ',node.chipid())
-print('heap: ',node.heap())
-
-wifi.sta.config("Freifunk","")
--- wifi.sta.config("shack","welcome2shack")
-
-dofile('main.lua')
diff --git a/esp8266-lua/ppd42ns/main.lua b/esp8266-lua/ppd42ns/main.lua
deleted file mode 100644
index 8ae26c6b2..000000000
--- a/esp8266-lua/ppd42ns/main.lua
+++ /dev/null
@@ -1,87 +0,0 @@
--- esp8266-12
-pin_P1=6 -- gpio12 black
-pin_P2=5 -- gpio14 white
-
-sampletime=30000 -- 30 seconds
-filter_time=10000 -- in us
-
-durationP1=0
-trigOnP1=0
-lastTriggerP1=0
-lowpulseoccupancyP1=0
-
-durationP2=0
-trigOnP2=0
-lastTriggerP2=0
-lowpulseoccupancyP2=0
-
-
-PIN_GREEN_LED = 2
-PIN_RED_LED = 1
-gpio.mode(PIN_GREEN_LED, gpio.OUTPUT)
-gpio.write(PIN_GREEN_LED, gpio.HIGH)
-c = gpio.HIGH
-
-
-gpio.mode(pin_P1, gpio.INT)
-function pin4change(level)
- if (tmr.now() - lastTriggerP1) > filter_time then
- if level == gpio.LOW then
- trigOnP1 = tmr.now()
- else
- durationP1 = tmr.now() - trigOnP1
- lowpulseoccupancyP1 = lowpulseoccupancyP1 + durationP1
- end
- lastTriggerP1 = tmr.now()
- end
- gpio.trig(pin_P1, "both")
-end
-gpio.trig(pin_P1, "both", pin4change)
-
-
-gpio.mode(pin_P2, gpio.INT)
-function pin2change(level)
- if (tmr.now() - lastTriggerP2) > filter_time then
- if level == gpio.LOW then
- trigOnP2 = tmr.now()
- else
- durationP2 = tmr.now() - trigOnP1
- lowpulseoccupancyP2 = lowpulseoccupancyP2 + durationP2
- end
- lastTriggerP2 = tmr.now()
- end
- gpio.trig(pin_P2, "both")
-end
-gpio.trig(pin_P2, "both", pin2change)
-
-
-function send_it()
- if wifi.sta.getip() == nil then
- status = wifi.sta.status()
- if status == 1 then -- connecting
- gpio.write(PIN_GREEN_LED, c)
- if c == gpio.HIGH then
- c = gpio.LOW
- else
- c = gpio.HIGH
- end
- elseif status <= 4 then
- gpio.write(PIN_GREEN_LED, gpio.LOW)
- elseif status == 5 then
- gpio.write(PIN_GREEN_LED, gpio.HIGH)
- end
- else
- print('IP: ',wifi.sta.getip())
- send_to_api(lowpulseoccupancyP1, lowpulseoccupancyP2, sampletime)
- end
- -- even if the data could not be sent.
- -- throw it away and try again after samplingtime
- lowpulseoccupancyP1 = 0
- lowpulseoccupancyP2 = 0
- tmr.alarm(0, sampletime, 0, send_it)
-end
-
-tmr.alarm(0, sampletime, 0, send_it)
-
-
-dofile('http.lua')
diff --git a/esp8266-lua/ppd42ns/readme.md b/esp8266-lua/ppd42ns/readme.md
deleted file mode 100644
index 6d21c815c..000000000
--- a/esp8266-lua/ppd42ns/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# ppd42ns
-
-## some links for implementation
-
-- http://esp8266.co.uk/tutorials/introduction-to-the-gpio-api/
-- http://www.nodemcu.com/docs/gpio-module/#gpio-module-gpio-trig
-- https://github.com/nodemcu/nodemcu-firmware/issues/179
-
-
-## other implementations
-
-### 1
-
-https://github.com/marcel12bell/feinstaub-app/blob/master/init.lua
-
-seems wrong, because no interrupt is used. one value each second via alarm timer.
-
-### ?
\ No newline at end of file
diff --git a/esp8266-lua/ppd42ns_mqtt/Makefile b/esp8266-lua/ppd42ns_mqtt/Makefile
deleted file mode 100644
index ff9a5bc27..000000000
--- a/esp8266-lua/ppd42ns_mqtt/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# for using makefile add luatool.py to your path
-
-upload: upload_main upload_init
- luatool.py -p /dev/ttyUSB1 -l
-
-upload_main:
- luatool.py -p /dev/ttyUSB1 -f main.lua
- luatool.py -p /dev/ttyUSB1 -f publish.lua
-
-upload_init:
- luatool.py -p /dev/ttyUSB1 -f init.lua
-
diff --git a/esp8266-lua/ppd42ns_mqtt/init.lua b/esp8266-lua/ppd42ns_mqtt/init.lua
deleted file mode 100644
index 1ea756443..000000000
--- a/esp8266-lua/ppd42ns_mqtt/init.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-SSID = ""
-KEY = ""
-BROKER = "mqtt.opensensors.io" -- Ip/hostname of MQTT broker
-BRPORT = 1883 -- MQTT broker port
-BRUSER = "" -- If MQTT authenitcation is used then define the user
-BRPWD = "" -- The above user password
-CLIENTID = "" -- The MQTT ID. Change to something you like
-TOPIC = "/orgs/topic"
-SEND_TO_DUSTY = true
-
--- do not change below this line
-sampletime = 30000 -- 30 seconds
-filter_time = 10000 -- in us
-
--- esp8266-12
-pin_P1=6 -- gpio12 black
-pin_P2=5 -- gpio14 white
-
-dofile('main.lua')
\ No newline at end of file
diff --git a/esp8266-lua/ppd42ns_mqtt/main.lua b/esp8266-lua/ppd42ns_mqtt/main.lua
deleted file mode 100644
index bccb80bb7..000000000
--- a/esp8266-lua/ppd42ns_mqtt/main.lua
+++ /dev/null
@@ -1,103 +0,0 @@
-durationP1=0
-trigOnP1=0
-lastTriggerP1=0
-lowpulseoccupancyP1=0
-
-durationP2=0
-trigOnP2=0
-lastTriggerP2=0
-lowpulseoccupancyP2=0
-
-PIN_GREEN_LED = 2
-PIN_RED_LED = 1
-gpio.mode(PIN_GREEN_LED, gpio.OUTPUT)
-gpio.write(PIN_GREEN_LED, gpio.HIGH)
-c = gpio.HIGH
-
-gpio.mode(pin_P1, gpio.INT)
-function pin4change(level)
- if (tmr.now() - lastTriggerP1) > filter_time then
- if level == gpio.LOW then
- trigOnP1 = tmr.now()
- else
- durationP1 = tmr.now() - trigOnP1
- lowpulseoccupancyP1 = lowpulseoccupancyP1 + durationP1
- end
- lastTriggerP1 = tmr.now()
- end
- gpio.trig(pin_P1, "both")
-end
-gpio.trig(pin_P1, "both", pin4change)
-
-
-gpio.mode(pin_P2, gpio.INT)
-function pin2change(level)
- if (tmr.now() - lastTriggerP2) > filter_time then
- if level == gpio.LOW then
- trigOnP2 = tmr.now()
- else
- durationP2 = tmr.now() - trigOnP1
- lowpulseoccupancyP2 = lowpulseoccupancyP2 + durationP2
- end
- lastTriggerP2 = tmr.now()
- end
- gpio.trig(pin_P2, "both")
-end
-gpio.trig(pin_P2, "both", pin2change)
-
-
-function send_it()
- if wifi.sta.getip() == nil then
- status = wifi.sta.status()
- if status == 1 then -- connecting
- gpio.write(PIN_GREEN_LED, c)
- if c == gpio.HIGH then
- c = gpio.LOW
- else
- c = gpio.HIGH
- end
- elseif status <= 4 then
- gpio.write(PIN_GREEN_LED, gpio.LOW)
- elseif status == 5 then
- gpio.write(PIN_GREEN_LED, gpio.HIGH)
- end
- else
- print('IP: ',wifi.sta.getip())
- send_to_api(lowpulseoccupancyP1, lowpulseoccupancyP2, sampletime)
- end
- -- even if the data could not be sent.
- -- throw it away and try again after samplingtime
- lowpulseoccupancyP1 = 0
- lowpulseoccupancyP2 = 0
- tmr.alarm(0, sampletime, 0, send_it)
-end
-
-dofile('publish.lua')
-
-function main()
- print("wait!")
- tmr.delay(100000)
-
- -- wifi connect
- wifi.setmode(wifi.STATION)
- wifi.sta.autoconnect(1)
- print('set mode=STATION (mode='..wifi.getmode()..')')
- print('MAC: ',wifi.sta.getmac())
- print('chip: ',node.chipid())
- print('heap: ',node.heap())
- wifi.sta.config(SSID, KEY)
-
- -- create mqtt connection
- m = mqtt.Client( CLIENTID, 3600, BRUSER, BRPWD)
- m:on("offline", function(conn)
- print("Disconnected from broker...")
- print(node.heap())
- -- reconnect
- connect_broker()
- end)
- connect_broker()
- tmr.alarm(0, sampletime, 1, send_it)
-end
-
--- main
-main()
\ No newline at end of file
diff --git a/esp8266-lua/ppd42ns_mqtt/publish.lua b/esp8266-lua/ppd42ns_mqtt/publish.lua
deleted file mode 100644
index 34010a359..000000000
--- a/esp8266-lua/ppd42ns_mqtt/publish.lua
+++ /dev/null
@@ -1,79 +0,0 @@
-function build_post_request(host, uri, data)
- local request = "POST "..uri.." HTTP/1.1\r\n"..
- "Host: "..host.."\r\n"..
- "Connection: close\r\n"..
- "Content-Type: application/json\r\n"..
- "User-Agent: esp8266\r\n"..
- "Sensor: esp8266-"..node.chipid().."\r\n"..
- "Content-Length: "..string.len(data).."\r\n"..
- "\r\n"..data
- return request
-end
-
-function send_to_dusty(ratioP1, P1, ratioP2, P2)
- local data = '{"sensordatavalues":[{"value_type":"durP1","value":"'..lowpulseoccupancyP1..'"},{"value_type":"ratioP1","value":"'..ratioP1..'"},{"value_type":"P1","value":"'..P1..'"}' ..
- ',{"value_type":"durP2","value":"'..lowpulseoccupancyP2..'"},{"value_type":"ratioP2","value":"'..ratioP2..'"},{"value_type":"P2","value":"'..P2..'"}]}'
-
- print("start api connect")
- local api=net.createConnection(net.TCP, 0)
- print("connect")
-
- api:on("receive", function(sck, c) print(c) end )
- api:connect(80, "api.dusti.xyz")
- api:on("connection", function(sck)
- local post_request = build_post_request("api.dusti.xyz", "/v1/push-sensor-data/", data)
- sck:send(post_request)
- print("sent")
- end)
-end
-
--- connect
-function connect_broker()
- print "Connecting to MQTT broker. Please wait..."
- m:connect( BROKER , BRPORT, 0, function(conn)
- print("Connected to MQTT:" .. BROKER .. ":" .. BRPORT .." as " .. CLIENTID )
- end)
-end
-
--- pub
-pub_sem = 0
-function publish_mqtt(msg, cb)
- print("Publish to " .. TOPIC .. ":" .. msg)
- print('heap: ',node.heap())
-
- if pub_sem == 0 then
- pub_sem = 1
- m:publish(TOPIC,msg,0,0,function(conn)
- print("sent mqtt")
- pub_sem = 0
- -- call next when done
- if cb ~= nil then
- cb()
- end
- end)
- else
- print("Semaphore was 1, skip!")
- end
-end
-
--- pub to broker
-function send_to_broker(ratioP1, P1, ratioP2, P2, cb)
- publish_mqtt('{"durP1": "'..lowpulseoccupancyP1..'","ratioP1":"'..ratioP1..'","P1":"'..P1..'","durP2":"'..lowpulseoccupancyP2..'","ratioP2":"'..ratioP2..'","P2":"'..P2..'"}', cb)
-end
-
--- http post
-function send_to_api(lowpulseoccupancyP1, lowpulseoccupancyP2, sampletime)
- local ratioP1 = lowpulseoccupancyP1 / (sampletime*10.0)
- local P1 = 1.1*ratioP1*ratioP1*ratioP1-3.8*ratioP1*ratioP1+520*ratioP1+0.62
- local ratioP2 = lowpulseoccupancyP2 / (sampletime*10.0)
- local P2 = 1.1*ratioP2*ratioP2*ratioP2-3.8*ratioP2*ratioP2+520*ratioP2+0.62
-
- if SEND_TO_DUSTY == true then
- dustyCallback = function()
- -- http
- send_to_dusty(ratioP1, P1, ratioP2, P2)
- end
- end
- -- mqtt
- send_to_broker(ratioP1, P1, ratioP2, P2, dustyCallback)
-end
diff --git a/esp8266-lua/ppd42ns_mqtt/readme.md b/esp8266-lua/ppd42ns_mqtt/readme.md
deleted file mode 100644
index 6d21c815c..000000000
--- a/esp8266-lua/ppd42ns_mqtt/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# ppd42ns
-
-## some links for implementation
-
-- http://esp8266.co.uk/tutorials/introduction-to-the-gpio-api/
-- http://www.nodemcu.com/docs/gpio-module/#gpio-module-gpio-trig
-- https://github.com/nodemcu/nodemcu-firmware/issues/179
-
-
-## other implementations
-
-### 1
-
-https://github.com/marcel12bell/feinstaub-app/blob/master/init.lua
-
-seems wrong, because no interrupt is used. one value each second via alarm timer.
-
-### ?
\ No newline at end of file
diff --git a/esp8266-lua/wifi-freifunk-test/Makefile b/esp8266-lua/wifi-freifunk-test/Makefile
deleted file mode 120000
index d0b0e8e00..000000000
--- a/esp8266-lua/wifi-freifunk-test/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile
\ No newline at end of file
diff --git a/esp8266-lua/wifi-freifunk-test/init.lua b/esp8266-lua/wifi-freifunk-test/init.lua
deleted file mode 100644
index d9e043172..000000000
--- a/esp8266-lua/wifi-freifunk-test/init.lua
+++ /dev/null
@@ -1,37 +0,0 @@
---[[--------------------------
- test connecting to Freifunk without password.
---------------------------]]--
-
------------ CONFIG -----------
-SSID = "Freifunk"
-PASSWORD = ""
-TIMEOUT = 10000000 -- 10 seconds
-------------------------------
-
-function connect(timeout)
- local time = tmr.now()
- wifi.sta.connect()
-
- -- Wait for IP address; check each 1000ms; timeout
- tmr.alarm(1, 1000, 1,
- function()
- if wifi.sta.status() == 5 then
- tmr.stop(1)
- print("Station: connected! IP: " .. wifi.sta.getip())
- return true
- else
- if tmr.now() - time > timeout then
- tmr.stop(1)
- print("Timeout!")
- return false
- end
- end
- end
- )
-end
-
---[[ Main loop ]]--
-print("Setting up Wi-Fi connection..")
-wifi.setmode(wifi.STATION)
-wifi.sta.config(SSID, PASSWORD)
-connect(TIMEOUT)
diff --git a/esp8266-lua/wifi-freifunk-test/main.lua b/esp8266-lua/wifi-freifunk-test/main.lua
deleted file mode 100644
index 0711ed9dd..000000000
--- a/esp8266-lua/wifi-freifunk-test/main.lua
+++ /dev/null
@@ -1 +0,0 @@
--- empty
diff --git a/esp8266/dht22_led/README.md b/esp8266/dht22_led/README.md
deleted file mode 100644
index 2ff518d36..000000000
--- a/esp8266/dht22_led/README.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# dht+LED
-
-## config.lua
-
-mapping of gpios
-* does not match
-
-https://github.com/nodemcu/nodemcu-firmware
-
-from Build 20141219 on:
-
- 0 [*] GPIO16
- 1 GPIO5
- 2 GPIO4
- 3 GPIO0
- 4 GPIO2
- 5 GPIO14 (SPI CLK)
- 6 GPIO12 (SPI MISO)
- 7 GPIO13 (SPI MOSI)
- 8 GPIO15 (SPI CS)
- 9 GPIO3 (UART RX)
- 10 GPIO1 (UART TX)
- 11 GPIO9
- 12 GPIO10
-
-# temperature sensor ds18b20
-
-With ds18b20.lua (from nodemcu lib):
-
-Weird result:
- > print(t.read(addrs[1],t.K))
- 277.025
- > print(t.read(addrs[1],t.C))
- 3.8125
-
-
--- read temperature with DS18B20
--- node.compile("ds18b20.lua") -- run this only once to compile and save to "ds18b20.lc"
-t=require("ds18b20")
-t.setup(4)
-addrs=t.addrs()
--- Total DS18B20 numbers, assume it is 2
-print(table.getn(addrs))
--- The first DS18B20
-print(t.read(addrs[1],t.C))
-print(t.read(addrs[1],t.F))
-print(t.read(addrs[1],t.K))
--- The second DS18B20
-print(t.read(addrs[2],t.C))
-print(t.read(addrs[2],t.F))
-print(t.read(addrs[2],t.K))
--- Just read
-print(t.read())
--- Just read as centigrade
-print(t.read(nil,t.C))
--- Don't forget to release it after use
-t = nil
-ds18b20 = nil
-package.loaded["ds18b20"]=nil
-
-
-# dust sensor
-
-http://www.sca-shinyei.com/pdf/PPD42NS.pdf
-
-Model PPD42NS
-
-This sensor is to create Digital (Lo Pulse) output to Particulate Matters(PM). Lo Pulse Occupancy time (LPO
-time) is in proportion to PM concentration. The output from “P1” is for PM whose size is around 1 micro meter
-or larger. “P1” Output characteristics is shown in the attached drawing Fig2.,when tested in standard
-condition stipulated below.
-
-Model | PPD42NS
-Detectable particle size | approx. 1μm (minimum.)
-Detectable range of concentration | 0~28,000 pcs/liter (0~8,000pcs/0.01 CF=283ml)
-Supply Voltage | DC5V +/- 10% (CN1:Pin1=GND, Pin3=+5V) Ripple Voltage within 30mV
-Operating Temperature Range | 0~45°C
-Operating Humidity Range | 95%rh or less (without dew condensation)
-Power consumption | 90mA
-Storage temperature | -30~60°C
-Time for stabilization | 1 minute after power turned on
-Dimensions | 59(W) × 45(H) × 22(D) [mm]
-Weight | 24g(approx.)
-Output Method | Negative Logic, Digital output, Hi : over 4.0V(Rev.2) Lo : under 0.7V (As Input impedance : 200kΩ) OP-Amp output, Pull-up resistor : 10kΩ
-
-
-
-PINs
-
- CN : S5B-EH(JST)
- 1 : COMMON(GND) green
- 2 : OUTPUT(P2) white
- 3 : INPUT(5VDC 90mA) yellow
- 4 : OUTPUT(P1) black
- 5 : INPUT(T1) white
- FOR THRESHOLD FOR [P2]
-
-
-
\ No newline at end of file
diff --git a/esp8266/ppd42ns+dht22/ppd42ns/readme.md b/esp8266/ppd42ns+dht22/ppd42ns/readme.md
deleted file mode 100644
index 5d6cc30a7..000000000
--- a/esp8266/ppd42ns+dht22/ppd42ns/readme.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# ppd42ns
-
-## some links for implementation
-
-- http://esp8266.co.uk/tutorials/introduction-to-the-gpio-api/
-- http://www.nodemcu.com/docs/gpio-module/#gpio-module-gpio-trig
-- https://github.com/nodemcu/nodemcu-firmware/issues/179
-
-
-## other implementations
-
-1. https://github.com/marcel12bell/feinstaub-app/blob/master/init.lua
-(Seems wrong, because no interrupt is used. One value each second via alarm timer.)
-
-# DHT22
-
-Pins and orientation (Front view)
-
-
-####
-####
-####
-||||
-1234
-
-
-How to connect R1 = 4.7kOhm and C1 = 4.7uF/6.3V correctly:
-
-|PIN | Function | Connections |
-| ------------- |:-------------:| -----:|
-| 1 | 3V3 | R1 , C1 (+) |
-| 2 | Data | R1 , GPIO (Null) |
-| 3 | NC | - |
-| 4 | GND | C1 (-) |
diff --git a/airrohr-firmware/ext_def.h b/ext_def.h
similarity index 100%
rename from airrohr-firmware/ext_def.h
rename to ext_def.h
diff --git a/airrohr-firmware/get-platformio.py b/get-platformio.py
similarity index 100%
rename from airrohr-firmware/get-platformio.py
rename to get-platformio.py
diff --git a/homeassistant/mqtt2influx.py b/homeassistant/mqtt2influx.py
deleted file mode 100755
index 979351a89..000000000
--- a/homeassistant/mqtt2influx.py
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import argparse
-from influxdb import InfluxDBClient
-import paho.mqtt.client as mqtt
-import sys
-
-# globals
-verbosity_level=3;
-
-# main
-def main():
- args = parse_args()
- verbosity_level=args.verbosity
- print(args)
- try:
- userdata={}
- iclient = InfluxDBClient(args.influxhost, args.influxport, args.influxuser, args.influxpass, database=args.influxdb)
- dbexists=False;
- for d in iclient.get_list_database():
- dbexists=args.influxdb in d.values()
- if dbexists is True:
- continue;
- if dbexists is not True:
- debug_out("creating database "+args.influxdb,3)
- iclient.create_database(args.influxdb)
- except InfluxDBClientError:
- print("influx client error, exiting...")
- sys.exit(1)
-
- userdata["iclient"]=iclient
- userdata["topicroot"]=args.topicroot
-
- # connect to MQTT
- mclient = mqtt.Client(client_id=sys.argv[0], clean_session=True, userdata=userdata)#, protocol=MQTTv31)
- # in constructor: mclient.user_data_set(userdata)
- if args.mqttuser is not None:
- mclient.username_pw_set(args.mqttuser, args.mqttpass)
- mclient.on_connect = on_connect
- mclient.on_disconnect = on_disconnect
- mclient.on_message = on_message
- debug_out("connecting to mqtt "+args.influxdb,3)
- try:
- mclient.connect(args.mqtthost, args.mqttport, 60)
- except ConnectionRefusedError as e:
- debug_out("connection failed: ")
- print(e)
- # mclient.subscribe.callback(on_message, args.topicroot+"#", hostname=args.mqtthost)
- #mclient.loop_forever(timeout=1.0, max_packets=1, retry_first_connection=False)
- mclient.loop_forever()
-
-def debug_out(msg,verbosity=5):
- if verbosity>verbosity_level:
- print(msg)
-
-def on_connect(client, userdata, flags, rc):
- debug_out("Connected with result code "+str(rc),3)
- # Subscribing in on_connect() means that if we lose the connection and
- # reconnect then subscriptions will be renewed.
- client.subscribe(userdata["topicroot"]+"#")
- debug_out("subscribed to "+userdata["topicroot"]+"#",5)
-
-def on_disconnect(client, userdata, rc):
- debug_out("Disconnected",3)
-
-# The callback for when a PUBLISH message is received from the server.
-def on_message(client, userdata, msg):
- debug_out(msg.topic+" "+str(msg.payload),5)
- # if topicroot is found at beginning: strip it
- ss=msg.topic.lstrip(userdata["topicroot"]).split("/")
- slen=len(ss)
- json_body={}
- if (slen)>=3:
- # split contains all parts
- json_body = {
- "measurement": ss[slen-1],
- "fields": {
- "value": msg.payload
- },
- "tags":{
- "sensortype": ss[slen-2],
- "nodeid": ss[slen-3]
- }}
- userdata["iclient"].write(json_body)
- # state_topic: "dusti/esp8266-16058770/PPD42NS/#"
- # name: "PPD Sensor"
- # qos: 0
- # unit_of_measurement: "%"
- # value_template: '{{ value }}'
-
-
-def parse_args():
- parser = argparse.ArgumentParser(
- description='Forward MQTT messages to am InfluxDB')
- parser.add_argument('-i', '--influxhost', dest='influxhost', type=str, required=False, default='localhost',
- help='hostname of InfluxDB http API')
- parser.add_argument('-I','--influxport', dest='influxport', type=int, required=False, default=8086,
- help='port of InfluxDB http API')
- parser.add_argument('-m', '--mqtthost', dest='mqtthost', type=str, required=False, default='localhost',
- help='hostname of MQTT server')
- parser.add_argument('-M','--mqttport', dest='mqttport', type=int, required=False, default=1883,
- help='port of MQTT server')
- parser.add_argument('-t', '--topicroot', dest='topicroot', type=str, required=False, default='',
- help='only consider topics starting with topicroot')
- parser.add_argument('-o', '--omittopic', dest='omittopic', nargs='*', required=False,
- help="omit topics matching pattern")
- parser.add_argument('-u', '--influxuser', dest='influxuser', type=str, required=False, default=None,
- help='username for InfluxDB')
- parser.add_argument('-U', '--mqttuser', dest='mqttuser', type=str, required=False, default=None,
- help='username for MQTT')
- parser.add_argument('-p', '--influxpass', dest='influxpass', type=str, required=False, default=None,
- help='password for InfluxDB')
- parser.add_argument('-P', '--mqttpass', dest='mqttpass', type=str, required=False, default=None,
- help='password for MQTT')
- parser.add_argument('-d', '--influxdb', dest='influxdb', type=str, required=False, default='mqtt2influx',
- help='name of InfluxDB to store data in')
- parser.add_argument('-v', '--verbosity', dest='verbosity', type=int, required=False, default=5,
- help='name of InfluxDB to store data in')
- return parser.parse_args()
-
-
-if __name__ == '__main__':
- #sys.exit(
- main()
- #)
-
\ No newline at end of file
diff --git a/homeassistant/topic2yaml.py b/homeassistant/topic2yaml.py
deleted file mode 100755
index 6fe6471e9..000000000
--- a/homeassistant/topic2yaml.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import paho.mqtt.client as mqtt
-import os.path
-
-mqtthost="mqtt.opendataset.click"
-mqttport=1883
-topicroot="dusti/" # topics start with topicroot
-# only topics defined here will be used
-unitdict={
- "P1":"1/cf",
- "P2":"1/cf",
- "durP1":"ns",
- "durP2":"ns",
- "ratioP1":"1",
- "ratioP2":"1",
- "temperature":"°C",
- "humidity":"%"
-}
-
-seentopics={}
-
-def on_connect(client, userdata, flags, rc):
- #print("Connected with result code "+str(rc))
-
- # Subscribing in on_connect() means that if we lose the connection and
- # reconnect then subscriptions will be renewed.
- client.subscribe(topicroot+"#")
-
-# The callback for when a PUBLISH message is received from the server.
-def on_message(client, userdata, msg):
- #print(msg.topic+" "+str(msg.payload))
- if seentopics.get(msg.topic) is not None:
- return
- seentopics[msg.topic]=1
- # if topicroot is found at beginning: strip it
- # split the remaining topic
- ss=msg.topic.lstrip(topicroot).split("/")
- # if topic is in unitdict, output
- if unitdict.get(ss[len(ss)-1]) is not None:
- configstr =' - platform: mqtt\n'
- configstr+=' state_topic: "'+msg.topic+'"\n'
- configstr+=' name: "'+msg.topic.lstrip(topicroot)+'"\n'
- configstr+=' qos: 0\n'
- configstr+=' unit_of_measurement: "'+unitdict.get(ss[len(ss)-1])+'"\n'
- configstr+=' value_template: \'{{ value }}\'\n'
- print (configstr)
- # state_topic: "dusti/esp8266-16058770/PPD42NS/#"
- # name: "PPD Sensor"
- # qos: 0
- # unit_of_measurement: "%"
- # value_template: '{{ value }}'
-
-client = mqtt.Client()
-client.on_connect = on_connect
-client.on_message = on_message
-
-client.connect(mqtthost, mqttport, 60)
-
-# Blocking call that processes network traffic, dispatches callbacks and
-# handles reconnecting.
-# Other loop*() functions are available that give a threaded interface and a
-# manual interface.
-client.loop_forever()
diff --git a/airrohr-firmware/html-content.h b/html-content.h
similarity index 100%
rename from airrohr-firmware/html-content.h
rename to html-content.h
diff --git a/airrohr-firmware/intl.h b/intl.h
similarity index 100%
rename from airrohr-firmware/intl.h
rename to intl.h
diff --git a/airrohr-firmware/intl_bg.h b/intl_bg.h
similarity index 100%
rename from airrohr-firmware/intl_bg.h
rename to intl_bg.h
diff --git a/airrohr-firmware/intl_cz.h b/intl_cz.h
similarity index 100%
rename from airrohr-firmware/intl_cz.h
rename to intl_cz.h
diff --git a/airrohr-firmware/intl_de.h b/intl_de.h
similarity index 100%
rename from airrohr-firmware/intl_de.h
rename to intl_de.h
diff --git a/airrohr-firmware/intl_dk.h b/intl_dk.h
similarity index 100%
rename from airrohr-firmware/intl_dk.h
rename to intl_dk.h
diff --git a/airrohr-firmware/intl_en.h b/intl_en.h
similarity index 100%
rename from airrohr-firmware/intl_en.h
rename to intl_en.h
diff --git a/airrohr-firmware/intl_es.h b/intl_es.h
similarity index 100%
rename from airrohr-firmware/intl_es.h
rename to intl_es.h
diff --git a/airrohr-firmware/intl_fr.h b/intl_fr.h
similarity index 100%
rename from airrohr-firmware/intl_fr.h
rename to intl_fr.h
diff --git a/airrohr-firmware/intl_hu.h b/intl_hu.h
similarity index 100%
rename from airrohr-firmware/intl_hu.h
rename to intl_hu.h
diff --git a/airrohr-firmware/intl_it.h b/intl_it.h
similarity index 100%
rename from airrohr-firmware/intl_it.h
rename to intl_it.h
diff --git a/airrohr-firmware/intl_lu.h b/intl_lu.h
similarity index 100%
rename from airrohr-firmware/intl_lu.h
rename to intl_lu.h
diff --git a/airrohr-firmware/intl_nl.h b/intl_nl.h
similarity index 100%
rename from airrohr-firmware/intl_nl.h
rename to intl_nl.h
diff --git a/airrohr-firmware/intl_pl.h b/intl_pl.h
similarity index 100%
rename from airrohr-firmware/intl_pl.h
rename to intl_pl.h
diff --git a/airrohr-firmware/intl_pt.h b/intl_pt.h
similarity index 100%
rename from airrohr-firmware/intl_pt.h
rename to intl_pt.h
diff --git a/airrohr-firmware/intl_rs.h b/intl_rs.h
similarity index 100%
rename from airrohr-firmware/intl_rs.h
rename to intl_rs.h
diff --git a/airrohr-firmware/intl_ru.h b/intl_ru.h
similarity index 100%
rename from airrohr-firmware/intl_ru.h
rename to intl_ru.h
diff --git a/airrohr-firmware/intl_se.h b/intl_se.h
similarity index 100%
rename from airrohr-firmware/intl_se.h
rename to intl_se.h
diff --git a/airrohr-firmware/intl_sk.h b/intl_sk.h
similarity index 100%
rename from airrohr-firmware/intl_sk.h
rename to intl_sk.h
diff --git a/airrohr-firmware/intl_template.h b/intl_template.h
similarity index 100%
rename from airrohr-firmware/intl_template.h
rename to intl_template.h
diff --git a/airrohr-firmware/intl_tr.h b/intl_tr.h
similarity index 100%
rename from airrohr-firmware/intl_tr.h
rename to intl_tr.h
diff --git a/airrohr-firmware/intl_ua.h b/intl_ua.h
similarity index 100%
rename from airrohr-firmware/intl_ua.h
rename to intl_ua.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/.github/stale.yml b/lib/ESP8266_SSD1306/.github/stale.yml
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/.github/stale.yml
rename to lib/ESP8266_SSD1306/.github/stale.yml
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/.gitignore b/lib/ESP8266_SSD1306/.gitignore
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/.gitignore
rename to lib/ESP8266_SSD1306/.gitignore
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/.piopm b/lib/ESP8266_SSD1306/.piopm
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/.piopm
rename to lib/ESP8266_SSD1306/.piopm
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/CMakeLists.txt b/lib/ESP8266_SSD1306/CMakeLists.txt
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/CMakeLists.txt
rename to lib/ESP8266_SSD1306/CMakeLists.txt
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/README.md b/lib/ESP8266_SSD1306/README.md
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/README.md
rename to lib/ESP8266_SSD1306/README.md
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/UPGRADE-3.0.md b/lib/ESP8266_SSD1306/UPGRADE-3.0.md
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/UPGRADE-3.0.md
rename to lib/ESP8266_SSD1306/UPGRADE-3.0.md
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/UPGRADE-4.0.md b/lib/ESP8266_SSD1306/UPGRADE-4.0.md
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/UPGRADE-4.0.md
rename to lib/ESP8266_SSD1306/UPGRADE-4.0.md
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/component.mk b/lib/ESP8266_SSD1306/component.mk
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/component.mk
rename to lib/ESP8266_SSD1306/component.mk
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/library.properties b/lib/ESP8266_SSD1306/library.properties
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/library.properties
rename to lib/ESP8266_SSD1306/library.properties
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/license b/lib/ESP8266_SSD1306/license
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/license
rename to lib/ESP8266_SSD1306/license
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/resources/DemoFrame1.jpg b/lib/ESP8266_SSD1306/resources/DemoFrame1.jpg
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/resources/DemoFrame1.jpg
rename to lib/ESP8266_SSD1306/resources/DemoFrame1.jpg
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/resources/DemoFrame2.jpg b/lib/ESP8266_SSD1306/resources/DemoFrame2.jpg
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/resources/DemoFrame2.jpg
rename to lib/ESP8266_SSD1306/resources/DemoFrame2.jpg
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/resources/DemoFrame3.jpg b/lib/ESP8266_SSD1306/resources/DemoFrame3.jpg
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/resources/DemoFrame3.jpg
rename to lib/ESP8266_SSD1306/resources/DemoFrame3.jpg
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/resources/DemoFrame4.jpg b/lib/ESP8266_SSD1306/resources/DemoFrame4.jpg
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/resources/DemoFrame4.jpg
rename to lib/ESP8266_SSD1306/resources/DemoFrame4.jpg
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/resources/FontTool.png b/lib/ESP8266_SSD1306/resources/FontTool.png
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/resources/FontTool.png
rename to lib/ESP8266_SSD1306/resources/FontTool.png
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/resources/SPI_version.jpg b/lib/ESP8266_SSD1306/resources/SPI_version.jpg
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/resources/SPI_version.jpg
rename to lib/ESP8266_SSD1306/resources/SPI_version.jpg
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/resources/glyphEditor.html b/lib/ESP8266_SSD1306/resources/glyphEditor.html
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/resources/glyphEditor.html
rename to lib/ESP8266_SSD1306/resources/glyphEditor.html
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/resources/glyphEditor.png b/lib/ESP8266_SSD1306/resources/glyphEditor.png
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/resources/glyphEditor.png
rename to lib/ESP8266_SSD1306/resources/glyphEditor.png
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/resources/xbmPreview.png b/lib/ESP8266_SSD1306/resources/xbmPreview.png
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/resources/xbmPreview.png
rename to lib/ESP8266_SSD1306/resources/xbmPreview.png
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplay.cpp b/lib/ESP8266_SSD1306/src/OLEDDisplay.cpp
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplay.cpp
rename to lib/ESP8266_SSD1306/src/OLEDDisplay.cpp
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplay.h b/lib/ESP8266_SSD1306/src/OLEDDisplay.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplay.h
rename to lib/ESP8266_SSD1306/src/OLEDDisplay.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplayFonts.h b/lib/ESP8266_SSD1306/src/OLEDDisplayFonts.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplayFonts.h
rename to lib/ESP8266_SSD1306/src/OLEDDisplayFonts.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplayUi.cpp b/lib/ESP8266_SSD1306/src/OLEDDisplayUi.cpp
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplayUi.cpp
rename to lib/ESP8266_SSD1306/src/OLEDDisplayUi.cpp
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplayUi.h b/lib/ESP8266_SSD1306/src/OLEDDisplayUi.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/OLEDDisplayUi.h
rename to lib/ESP8266_SSD1306/src/OLEDDisplayUi.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/SH1106.h b/lib/ESP8266_SSD1306/src/SH1106.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/SH1106.h
rename to lib/ESP8266_SSD1306/src/SH1106.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/SH1106Brzo.h b/lib/ESP8266_SSD1306/src/SH1106Brzo.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/SH1106Brzo.h
rename to lib/ESP8266_SSD1306/src/SH1106Brzo.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/SH1106Spi.h b/lib/ESP8266_SSD1306/src/SH1106Spi.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/SH1106Spi.h
rename to lib/ESP8266_SSD1306/src/SH1106Spi.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/SH1106Wire.h b/lib/ESP8266_SSD1306/src/SH1106Wire.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/SH1106Wire.h
rename to lib/ESP8266_SSD1306/src/SH1106Wire.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306.h b/lib/ESP8266_SSD1306/src/SSD1306.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306.h
rename to lib/ESP8266_SSD1306/src/SSD1306.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306Brzo.h b/lib/ESP8266_SSD1306/src/SSD1306Brzo.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306Brzo.h
rename to lib/ESP8266_SSD1306/src/SSD1306Brzo.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306I2C.h b/lib/ESP8266_SSD1306/src/SSD1306I2C.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306I2C.h
rename to lib/ESP8266_SSD1306/src/SSD1306I2C.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306Spi.h b/lib/ESP8266_SSD1306/src/SSD1306Spi.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306Spi.h
rename to lib/ESP8266_SSD1306/src/SSD1306Spi.h
diff --git a/airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306Wire.h b/lib/ESP8266_SSD1306/src/SSD1306Wire.h
similarity index 100%
rename from airrohr-firmware/lib/ESP8266_SSD1306/src/SSD1306Wire.h
rename to lib/ESP8266_SSD1306/src/SSD1306Wire.h
diff --git a/lib/TinyGSM/examples/AllFunctions/AllFunctions.ino b/lib/TinyGSM/examples/AllFunctions/AllFunctions.ino
new file mode 100644
index 000000000..b3e6ff6bb
--- /dev/null
+++ b/lib/TinyGSM/examples/AllFunctions/AllFunctions.ino
@@ -0,0 +1,488 @@
+/**************************************************************
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ * NOTE:
+ * Some of the functions may be unavailable for your modem.
+ * Just comment them out.
+ *
+ **************************************************************/
+
+// Select your modem:
+#define TINY_GSM_MODEM_SIM800
+// #define TINY_GSM_MODEM_SIM808
+// #define TINY_GSM_MODEM_SIM868
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_SIM7000
+// #define TINY_GSM_MODEM_SIM7000SSL
+// #define TINY_GSM_MODEM_SIM7080
+// #define TINY_GSM_MODEM_SIM5360
+// #define TINY_GSM_MODEM_SIM7600
+// #define TINY_GSM_MODEM_UBLOX
+// #define TINY_GSM_MODEM_SARAR4
+// #define TINY_GSM_MODEM_M95
+// #define TINY_GSM_MODEM_BG96
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_MC60
+// #define TINY_GSM_MODEM_MC60E
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE
+// #define TINY_GSM_MODEM_SEQUANS_MONARCH
+
+// Set serial for debug console (to the Serial Monitor, default speed 115200)
+#define SerialMon Serial
+
+// Set serial for AT commands (to the module)
+// Use Hardware Serial on Mega, Leonardo, Micro
+#ifndef __AVR_ATmega328P__
+#define SerialAT Serial1
+
+// or Software Serial on Uno, Nano
+#else
+#include
+SoftwareSerial SerialAT(2, 3); // RX, TX
+#endif
+
+// See all AT commands, if wanted
+// #define DUMP_AT_COMMANDS
+
+// Define the serial console for debug prints, if needed
+#define TINY_GSM_DEBUG SerialMon
+
+// Range to attempt to autobaud
+// NOTE: DO NOT AUTOBAUD in production code. Once you've established
+// communication, set a fixed baud rate using modem.setBaud(#).
+#define GSM_AUTOBAUD_MIN 9600
+#define GSM_AUTOBAUD_MAX 57600
+
+// Add a reception delay, if needed.
+// This may be needed for a fast processor at a slow baud rate.
+// #define TINY_GSM_YIELD() { delay(2); }
+
+/*
+ * Tests enabled
+ */
+#define TINY_GSM_TEST_GPRS true
+#define TINY_GSM_TEST_WIFI false
+#define TINY_GSM_TEST_TCP true
+#define TINY_GSM_TEST_SSL true
+#define TINY_GSM_TEST_CALL false
+#define TINY_GSM_TEST_SMS false
+#define TINY_GSM_TEST_USSD false
+#define TINY_GSM_TEST_BATTERY true
+#define TINY_GSM_TEST_TEMPERATURE true
+#define TINY_GSM_TEST_GSM_LOCATION false
+#define TINY_GSM_TEST_NTP false
+#define TINY_GSM_TEST_TIME false
+#define TINY_GSM_TEST_GPS false
+// disconnect and power down modem after tests
+#define TINY_GSM_POWERDOWN false
+
+// set GSM PIN, if any
+#define GSM_PIN ""
+
+// Set phone numbers, if you want to test SMS and Calls
+// #define SMS_TARGET "+380xxxxxxxxx"
+// #define CALL_TARGET "+380xxxxxxxxx"
+
+// Your GPRS credentials, if any
+const char apn[] = "YourAPN";
+// const char apn[] = "ibasis.iot";
+const char gprsUser[] = "";
+const char gprsPass[] = "";
+
+// Your WiFi connection credentials, if applicable
+const char wifiSSID[] = "YourSSID";
+const char wifiPass[] = "YourWiFiPass";
+
+// Server details to test TCP/SSL
+const char server[] = "vsh.pp.ua";
+const char resource[] = "/TinyGSM/logo.txt";
+
+#include
+
+#if TINY_GSM_TEST_GPRS && not defined TINY_GSM_MODEM_HAS_GPRS
+#undef TINY_GSM_TEST_GPRS
+#undef TINY_GSM_TEST_WIFI
+#define TINY_GSM_TEST_GPRS false
+#define TINY_GSM_TEST_WIFI true
+#endif
+#if TINY_GSM_TEST_WIFI && not defined TINY_GSM_MODEM_HAS_WIFI
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+#endif
+
+#ifdef DUMP_AT_COMMANDS
+#include
+StreamDebugger debugger(SerialAT, SerialMon);
+TinyGsm modem(debugger);
+#else
+TinyGsm modem(SerialAT);
+#endif
+
+void setup() {
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ // !!!!!!!!!!!
+ // Set your reset, enable, power pins here
+ // !!!!!!!!!!!
+
+ DBG("Wait...");
+ delay(6000);
+
+ // Set GSM module baud rate
+ TinyGsmAutoBaud(SerialAT, GSM_AUTOBAUD_MIN, GSM_AUTOBAUD_MAX);
+ // SerialAT.begin(9600);
+}
+
+void loop() {
+ // Restart takes quite some time
+ // To skip it, call init() instead of restart()
+ DBG("Initializing modem...");
+ if (!modem.restart()) {
+ // if (!modem.init()) {
+ DBG("Failed to restart modem, delaying 10s and retrying");
+ // restart autobaud in case GSM just rebooted
+ // TinyGsmAutoBaud(SerialAT, GSM_AUTOBAUD_MIN, GSM_AUTOBAUD_MAX);
+ return;
+ }
+
+ String name = modem.getModemName();
+ DBG("Modem Name:", name);
+
+ String modemInfo = modem.getModemInfo();
+ DBG("Modem Info:", modemInfo);
+
+#if TINY_GSM_TEST_GPRS
+ // Unlock your SIM card with a PIN if needed
+ if (GSM_PIN && modem.getSimStatus() != 3) { modem.simUnlock(GSM_PIN); }
+#endif
+
+#if TINY_GSM_TEST_WIFI
+ DBG("Setting SSID/password...");
+ if (!modem.networkConnect(wifiSSID, wifiPass)) {
+ DBG(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+#endif
+
+#if TINY_GSM_TEST_GPRS && defined TINY_GSM_MODEM_XBEE
+ // The XBee must run the gprsConnect function BEFORE waiting for network!
+ modem.gprsConnect(apn, gprsUser, gprsPass);
+#endif
+
+ DBG("Waiting for network...");
+ if (!modem.waitForNetwork(600000L, true)) {
+ delay(10000);
+ return;
+ }
+
+ if (modem.isNetworkConnected()) { DBG("Network connected"); }
+
+#if TINY_GSM_TEST_GPRS
+ DBG("Connecting to", apn);
+ if (!modem.gprsConnect(apn, gprsUser, gprsPass)) {
+ delay(10000);
+ return;
+ }
+
+ bool res = modem.isGprsConnected();
+ DBG("GPRS status:", res ? "connected" : "not connected");
+
+ String ccid = modem.getSimCCID();
+ DBG("CCID:", ccid);
+
+ String imei = modem.getIMEI();
+ DBG("IMEI:", imei);
+
+ String imsi = modem.getIMSI();
+ DBG("IMSI:", imsi);
+
+ String cop = modem.getOperator();
+ DBG("Operator:", cop);
+
+ IPAddress local = modem.localIP();
+ DBG("Local IP:", local);
+
+ int csq = modem.getSignalQuality();
+ DBG("Signal quality:", csq);
+#endif
+
+#if TINY_GSM_TEST_USSD && defined TINY_GSM_MODEM_HAS_SMS
+ String ussd_balance = modem.sendUSSD("*111#");
+ DBG("Balance (USSD):", ussd_balance);
+
+ String ussd_phone_num = modem.sendUSSD("*161#");
+ DBG("Phone number (USSD):", ussd_phone_num);
+#endif
+
+#if TINY_GSM_TEST_TCP && defined TINY_GSM_MODEM_HAS_TCP
+ TinyGsmClient client(modem, 0);
+ const int port = 80;
+ DBG("Connecting to", server);
+ if (!client.connect(server, port)) {
+ DBG("... failed");
+ } else {
+ // Make a HTTP GET request:
+ client.print(String("GET ") + resource + " HTTP/1.0\r\n");
+ client.print(String("Host: ") + server + "\r\n");
+ client.print("Connection: close\r\n\r\n");
+
+ // Wait for data to arrive
+ uint32_t start = millis();
+ while (client.connected() && !client.available() &&
+ millis() - start < 30000L) {
+ delay(100);
+ };
+
+ // Read data
+ start = millis();
+ char logo[640] = {
+ '\0',
+ };
+ int read_chars = 0;
+ while (client.connected() && millis() - start < 10000L) {
+ while (client.available()) {
+ logo[read_chars] = client.read();
+ logo[read_chars + 1] = '\0';
+ read_chars++;
+ start = millis();
+ }
+ }
+ SerialMon.println(logo);
+ DBG("##### RECEIVED:", strlen(logo), "CHARACTERS");
+ client.stop();
+ }
+#endif
+
+#if TINY_GSM_TEST_SSL && defined TINY_GSM_MODEM_HAS_SSL
+ TinyGsmClientSecure secureClient(modem, 1);
+ const int securePort = 443;
+ DBG("Connecting securely to", server);
+ if (!secureClient.connect(server, securePort)) {
+ DBG("... failed");
+ } else {
+ // Make a HTTP GET request:
+ secureClient.print(String("GET ") + resource + " HTTP/1.0\r\n");
+ secureClient.print(String("Host: ") + server + "\r\n");
+ secureClient.print("Connection: close\r\n\r\n");
+
+ // Wait for data to arrive
+ uint32_t startS = millis();
+ while (secureClient.connected() && !secureClient.available() &&
+ millis() - startS < 30000L) {
+ delay(100);
+ };
+
+ // Read data
+ startS = millis();
+ char logoS[640] = {
+ '\0',
+ };
+ int read_charsS = 0;
+ while (secureClient.connected() && millis() - startS < 10000L) {
+ while (secureClient.available()) {
+ logoS[read_charsS] = secureClient.read();
+ logoS[read_charsS + 1] = '\0';
+ read_charsS++;
+ startS = millis();
+ }
+ }
+ SerialMon.println(logoS);
+ DBG("##### RECEIVED:", strlen(logoS), "CHARACTERS");
+ secureClient.stop();
+ }
+#endif
+
+#if TINY_GSM_TEST_CALL && defined TINY_GSM_MODEM_HAS_CALLING && \
+ defined CALL_TARGET
+ DBG("Calling:", CALL_TARGET);
+
+ // This is NOT supported on M590
+ res = modem.callNumber(CALL_TARGET);
+ DBG("Call:", res ? "OK" : "fail");
+
+ if (res) {
+ delay(1000L);
+
+ // Play DTMF A, duration 1000ms
+ modem.dtmfSend('A', 1000);
+
+ // Play DTMF 0..4, default duration (100ms)
+ for (char tone = '0'; tone <= '4'; tone++) { modem.dtmfSend(tone); }
+
+ delay(5000);
+
+ res = modem.callHangup();
+ DBG("Hang up:", res ? "OK" : "fail");
+ }
+#endif
+
+#if TINY_GSM_TEST_SMS && defined TINY_GSM_MODEM_HAS_SMS && defined SMS_TARGET
+ res = modem.sendSMS(SMS_TARGET, String("Hello from ") + imei);
+ DBG("SMS:", res ? "OK" : "fail");
+
+ // This is only supported on SIMxxx series
+ res = modem.sendSMS_UTF8_begin(SMS_TARGET);
+ if (res) {
+ auto stream = modem.sendSMS_UTF8_stream();
+ stream.print(F("Привіііт! Print number: "));
+ stream.print(595);
+ res = modem.sendSMS_UTF8_end();
+ }
+ DBG("UTF8 SMS:", res ? "OK" : "fail");
+
+#endif
+
+#if TINY_GSM_TEST_GSM_LOCATION && defined TINY_GSM_MODEM_HAS_GSM_LOCATION
+ float lat = 0;
+ float lon = 0;
+ float accuracy = 0;
+ int year = 0;
+ int month = 0;
+ int day = 0;
+ int hour = 0;
+ int min = 0;
+ int sec = 0;
+ for (int8_t i = 15; i; i--) {
+ DBG("Requesting current GSM location");
+ if (modem.getGsmLocation(&lat, &lon, &accuracy, &year, &month, &day, &hour,
+ &min, &sec)) {
+ DBG("Latitude:", String(lat, 8), "\tLongitude:", String(lon, 8));
+ DBG("Accuracy:", accuracy);
+ DBG("Year:", year, "\tMonth:", month, "\tDay:", day);
+ DBG("Hour:", hour, "\tMinute:", min, "\tSecond:", sec);
+ break;
+ } else {
+ DBG("Couldn't get GSM location, retrying in 15s.");
+ delay(15000L);
+ }
+ }
+ DBG("Retrieving GSM location again as a string");
+ String location = modem.getGsmLocation();
+ DBG("GSM Based Location String:", location);
+#endif
+
+#if TINY_GSM_TEST_GPS && defined TINY_GSM_MODEM_HAS_GPS
+ DBG("Enabling GPS/GNSS/GLONASS and waiting 15s for warm-up");
+ modem.enableGPS();
+ delay(15000L);
+ float lat2 = 0;
+ float lon2 = 0;
+ float speed2 = 0;
+ float alt2 = 0;
+ int vsat2 = 0;
+ int usat2 = 0;
+ float accuracy2 = 0;
+ int year2 = 0;
+ int month2 = 0;
+ int day2 = 0;
+ int hour2 = 0;
+ int min2 = 0;
+ int sec2 = 0;
+ for (int8_t i = 15; i; i--) {
+ DBG("Requesting current GPS/GNSS/GLONASS location");
+ if (modem.getGPS(&lat2, &lon2, &speed2, &alt2, &vsat2, &usat2, &accuracy2,
+ &year2, &month2, &day2, &hour2, &min2, &sec2)) {
+ DBG("Latitude:", String(lat2, 8), "\tLongitude:", String(lon2, 8));
+ DBG("Speed:", speed2, "\tAltitude:", alt2);
+ DBG("Visible Satellites:", vsat2, "\tUsed Satellites:", usat2);
+ DBG("Accuracy:", accuracy2);
+ DBG("Year:", year2, "\tMonth:", month2, "\tDay:", day2);
+ DBG("Hour:", hour2, "\tMinute:", min2, "\tSecond:", sec2);
+ break;
+ } else {
+ DBG("Couldn't get GPS/GNSS/GLONASS location, retrying in 15s.");
+ delay(15000L);
+ }
+ }
+ DBG("Retrieving GPS/GNSS/GLONASS location again as a string");
+ String gps_raw = modem.getGPSraw();
+ DBG("GPS/GNSS Based Location String:", gps_raw);
+ DBG("Disabling GPS");
+ modem.disableGPS();
+#endif
+
+#if TINY_GSM_TEST_NTP && defined TINY_GSM_MODEM_HAS_NTP
+ DBG("Asking modem to sync with NTP");
+ modem.NTPServerSync("132.163.96.5", 20);
+#endif
+
+#if TINY_GSM_TEST_TIME && defined TINY_GSM_MODEM_HAS_TIME
+ int year3 = 0;
+ int month3 = 0;
+ int day3 = 0;
+ int hour3 = 0;
+ int min3 = 0;
+ int sec3 = 0;
+ float timezone = 0;
+ for (int8_t i = 5; i; i--) {
+ DBG("Requesting current network time");
+ if (modem.getNetworkTime(&year3, &month3, &day3, &hour3, &min3, &sec3,
+ &timezone)) {
+ DBG("Year:", year3, "\tMonth:", month3, "\tDay:", day3);
+ DBG("Hour:", hour3, "\tMinute:", min3, "\tSecond:", sec3);
+ DBG("Timezone:", timezone);
+ break;
+ } else {
+ DBG("Couldn't get network time, retrying in 15s.");
+ delay(15000L);
+ }
+ }
+ DBG("Retrieving time again as a string");
+ String time = modem.getGSMDateTime(DATE_FULL);
+ DBG("Current Network Time:", time);
+#endif
+
+#if TINY_GSM_TEST_BATTERY && defined TINY_GSM_MODEM_HAS_BATTERY
+ uint8_t chargeState = -99;
+ int8_t percent = -99;
+ uint16_t milliVolts = -9999;
+ modem.getBattStats(chargeState, percent, milliVolts);
+ DBG("Battery charge state:", chargeState);
+ DBG("Battery charge 'percent':", percent);
+ DBG("Battery voltage:", milliVolts / 1000.0F);
+#endif
+
+#if TINY_GSM_TEST_TEMPERATURE && defined TINY_GSM_MODEM_HAS_TEMPERATURE
+ float temp = modem.getTemperature();
+ DBG("Chip temperature:", temp);
+#endif
+
+#if TINY_GSM_POWERDOWN
+
+#if TINY_GSM_TEST_GPRS
+ modem.gprsDisconnect();
+ delay(5000L);
+ if (!modem.isGprsConnected()) {
+ DBG("GPRS disconnected");
+ } else {
+ DBG("GPRS disconnect: Failed.");
+ }
+#endif
+
+#if TINY_GSM_TEST_WIFI
+ modem.networkDisconnect();
+ DBG("WiFi disconnected");
+#endif
+
+ // Try to power-off (modem may decide to restart automatically)
+ // To turn off modem completely, please use Reset/Enable pins
+ modem.poweroff();
+ DBG("Poweroff.");
+#endif
+
+ DBG("End of tests.");
+
+ // Do nothing forevermore
+ while (true) { modem.maintain(); }
+}
diff --git a/lib/TinyGSM/examples/BlynkClient/BlynkClient.ino b/lib/TinyGSM/examples/BlynkClient/BlynkClient.ino
new file mode 100644
index 000000000..2ab7f3d9c
--- /dev/null
+++ b/lib/TinyGSM/examples/BlynkClient/BlynkClient.ino
@@ -0,0 +1,115 @@
+/**************************************************************
+ *
+ * For this example, you need to install Blynk library:
+ * https://github.com/blynkkk/blynk-library/releases/latest
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ **************************************************************
+ *
+ * Blynk is a platform with iOS and Android apps to control
+ * Arduino, Raspberry Pi and the likes over the Internet.
+ * You can easily build graphic interfaces for all your
+ * projects by simply dragging and dropping widgets.
+ *
+ * Blynk supports many development boards with WiFi, Ethernet,
+ * GSM, Bluetooth, BLE, USB/Serial connection methods.
+ * See more in Blynk library examples and community forum.
+ *
+ * http://www.blynk.io/
+ *
+ * Change GPRS apm, user, pass, and Blynk auth token to run :)
+ **************************************************************/
+
+/* Fill in information from Blynk Device Info here */
+#define BLYNK_TEMPLATE_ID "TMPxxxxxx"
+#define BLYNK_TEMPLATE_NAME "Device"
+#define BLYNK_AUTH_TOKEN "YourAuthToken"
+
+#define BLYNK_PRINT Serial // Comment this out to disable prints and save space
+
+// Default heartbeat interval for GSM is 60
+// If you want override this value, uncomment and set this option:
+// #define BLYNK_HEARTBEAT 30
+
+// Select your modem:
+#define TINY_GSM_MODEM_SIM800
+// #define TINY_GSM_MODEM_SIM808
+// #define TINY_GSM_MODEM_SIM868
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_SIM7000
+// #define TINY_GSM_MODEM_SIM7000SSL
+// #define TINY_GSM_MODEM_SIM7080
+// #define TINY_GSM_MODEM_SIM5360
+// #define TINY_GSM_MODEM_SIM7600
+// #define TINY_GSM_MODEM_UBLOX
+// #define TINY_GSM_MODEM_SARAR4
+// #define TINY_GSM_MODEM_M95
+// #define TINY_GSM_MODEM_BG96
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_MC60
+// #define TINY_GSM_MODEM_MC60E
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE
+// #define TINY_GSM_MODEM_SEQUANS_MONARCH
+
+#include
+#include
+
+// Set serial for debug console (to the Serial Monitor, default speed 115200)
+#define SerialMon Serial
+
+// Hardware Serial on Mega, Leonardo, Micro
+#ifndef __AVR_ATmega328P__
+#define SerialAT Serial1
+
+// or Software Serial on Uno, Nano
+#else
+#include
+SoftwareSerial SerialAT(2, 3); // RX, TX
+#endif
+
+
+// Your GPRS credentials, if any
+const char apn[] = "YourAPN";
+const char user[] = "";
+const char pass[] = "";
+
+// You should get Auth Token in the Blynk App.
+// Go to the Project Settings (nut icon).
+const char auth[] = "YourAuthToken";
+
+TinyGsm modem(SerialAT);
+
+void setup()
+{
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ // Set GSM module baud rate
+ SerialAT.begin(115200);
+ delay(6000);
+
+ // Restart takes quite some time
+ // To skip it, call init() instead of restart()
+ SerialMon.println("Initializing modem...");
+ modem.restart();
+
+ String modemInfo = modem.getModemInfo();
+ SerialMon.print("Modem Info: ");
+ SerialMon.println(modemInfo);
+
+ // Unlock your SIM card with a PIN
+ //modem.simUnlock("1234");
+
+ Blynk.begin(auth, modem, apn, user, pass);
+}
+
+void loop()
+{
+ Blynk.run();
+}
diff --git a/lib/TinyGSM/examples/FileDownload/FileDownload.ino b/lib/TinyGSM/examples/FileDownload/FileDownload.ino
new file mode 100644
index 000000000..d66e4b7df
--- /dev/null
+++ b/lib/TinyGSM/examples/FileDownload/FileDownload.ino
@@ -0,0 +1,356 @@
+/**************************************************************
+ *
+ * For this example, you need to install CRC32 library:
+ * https://github.com/bakercp/CRC32
+ * or from http://librarymanager/all#CRC32+checksum
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ * ATTENTION! Downloading big files requires of knowledge of
+ * the TinyGSM internals and some modem specifics,
+ * so this is for more experienced developers.
+ *
+ **************************************************************/
+
+// Select your modem:
+#define TINY_GSM_MODEM_SIM800
+// #define TINY_GSM_MODEM_SIM808
+// #define TINY_GSM_MODEM_SIM868
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_SIM7000
+// #define TINY_GSM_MODEM_SIM7000SSL
+// #define TINY_GSM_MODEM_SIM7080
+// #define TINY_GSM_MODEM_SIM5360
+// #define TINY_GSM_MODEM_SIM7600
+// #define TINY_GSM_MODEM_UBLOX
+// #define TINY_GSM_MODEM_SARAR4
+// #define TINY_GSM_MODEM_M95
+// #define TINY_GSM_MODEM_BG96
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_MC60
+// #define TINY_GSM_MODEM_MC60E
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE
+// #define TINY_GSM_MODEM_SEQUANS_MONARCH
+
+// Set serial for debug console (to the Serial Monitor, default speed 115200)
+#define SerialMon Serial
+
+// Set serial for AT commands (to the module)
+// Use Hardware Serial on Mega, Leonardo, Micro
+#ifndef __AVR_ATmega328P__
+#define SerialAT Serial1
+
+// or Software Serial on Uno, Nano
+#else
+#include
+SoftwareSerial SerialAT(2, 3); // RX, TX
+#endif
+
+// Increase RX buffer to capture the entire response
+// Chips without internal buffering (A6/A7, ESP8266, M590)
+// need enough space in the buffer for the entire response
+// else data will be lost (and the http library will fail).
+#if !defined(TINY_GSM_RX_BUFFER)
+#define TINY_GSM_RX_BUFFER 1024
+#endif
+
+// See all AT commands, if wanted
+// #define DUMP_AT_COMMANDS
+
+// Define the serial console for debug prints, if needed
+#define TINY_GSM_DEBUG SerialMon
+// #define LOGGING // <- Logging is for the HTTP library
+
+// Add a reception delay, if needed.
+// This may be needed for a fast processor at a slow baud rate.
+// #define TINY_GSM_YIELD() { delay(2); }
+
+// Define how you're planning to connect to the internet.
+// This is only needed for this example, not in other code.
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+
+// set GSM PIN, if any
+#define GSM_PIN ""
+
+// Your GPRS credentials, if any
+const char apn[] = "YourAPN";
+const char gprsUser[] = "";
+const char gprsPass[] = "";
+
+// Your WiFi connection credentials, if applicable
+const char wifiSSID[] = "YourSSID";
+const char wifiPass[] = "YourWiFiPass";
+
+// Server details
+const char server[] = "vsh.pp.ua";
+const int port = 80;
+
+#include
+#include
+
+// Just in case someone defined the wrong thing..
+#if TINY_GSM_USE_GPRS && not defined TINY_GSM_MODEM_HAS_GPRS
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS false
+#define TINY_GSM_USE_WIFI true
+#endif
+#if TINY_GSM_USE_WIFI && not defined TINY_GSM_MODEM_HAS_WIFI
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+#endif
+
+const char resource[] = "/TinyGSM/test_1k.bin";
+uint32_t knownCRC32 = 0x6f50d767;
+uint32_t knownFileSize = 1024; // In case server does not send it
+
+#ifdef DUMP_AT_COMMANDS
+#include
+StreamDebugger debugger(SerialAT, SerialMon);
+TinyGsm modem(debugger);
+#else
+TinyGsm modem(SerialAT);
+#endif
+
+TinyGsmClient client(modem);
+
+void setup() {
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ // !!!!!!!!!!!
+ // Set your reset, enable, power pins here
+ // !!!!!!!!!!!
+
+ SerialMon.println("Wait...");
+
+ // Set GSM module baud rate
+ SerialAT.begin(115200);
+ delay(6000);
+
+ // Restart takes quite some time
+ // To skip it, call init() instead of restart()
+ SerialMon.println("Initializing modem...");
+ modem.restart();
+ // modem.init();
+
+ String modemInfo = modem.getModemInfo();
+ SerialMon.print("Modem Info: ");
+ SerialMon.println(modemInfo);
+
+#if TINY_GSM_USE_GPRS
+ // Unlock your SIM card with a PIN if needed
+ if (GSM_PIN && modem.getSimStatus() != 3) { modem.simUnlock(GSM_PIN); }
+#endif
+}
+
+void printPercent(uint32_t readLength, uint32_t contentLength) {
+ // If we know the total length
+ if (contentLength != (uint32_t)-1) {
+ SerialMon.print("\r ");
+ SerialMon.print((100.0 * readLength) / contentLength);
+ SerialMon.print('%');
+ } else {
+ SerialMon.println(readLength);
+ }
+}
+
+void loop() {
+#if TINY_GSM_USE_WIFI
+ // Wifi connection parameters must be set before waiting for the network
+ SerialMon.print(F("Setting SSID/password..."));
+ if (!modem.networkConnect(wifiSSID, wifiPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+#endif
+
+#if TINY_GSM_USE_GPRS && defined TINY_GSM_MODEM_XBEE
+ // The XBee must run the gprsConnect function BEFORE waiting for network!
+ modem.gprsConnect(apn, gprsUser, gprsPass);
+#endif
+
+ SerialMon.print("Waiting for network...");
+ if (!modem.waitForNetwork()) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isNetworkConnected()) { SerialMon.println("Network connected"); }
+
+#if TINY_GSM_USE_GPRS
+ // GPRS connection parameters are usually set after network registration
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(apn);
+ if (!modem.gprsConnect(apn, gprsUser, gprsPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isGprsConnected()) { SerialMon.println("GPRS connected"); }
+#endif
+
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(server);
+ if (!client.connect(server, port)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ // Make a HTTP GET request:
+ client.print(String("GET ") + resource + " HTTP/1.0\r\n");
+ client.print(String("Host: ") + server + "\r\n");
+ client.print("Connection: close\r\n\r\n");
+
+ // Let's see what the entire elapsed time is, from after we send the request.
+ uint32_t timeElapsed = millis();
+
+ SerialMon.println(F("Waiting for response header"));
+
+ // While we are still looking for the end of the header (i.e. empty line
+ // FOLLOWED by a newline), continue to read data into the buffer, parsing each
+ // line (data FOLLOWED by a newline). If it takes too long to get data from
+ // the client, we need to exit.
+
+ const uint32_t clientReadTimeout = 5000;
+ uint32_t clientReadStartTime = millis();
+ String headerBuffer;
+ bool finishedHeader = false;
+ uint32_t contentLength = 0;
+
+ while (!finishedHeader) {
+ int nlPos;
+
+ if (client.available()) {
+ clientReadStartTime = millis();
+ while (client.available()) {
+ char c = client.read();
+ headerBuffer += c;
+
+ // Uncomment the lines below to see the data coming into the buffer
+ // if (c < 16)
+ // SerialMon.print('0');
+ // SerialMon.print(c, HEX);
+ // SerialMon.print(' ');
+ // if (isprint(c))
+ // SerialMon.print(reinterpret_cast c);
+ // else
+ // SerialMon.print('*');
+ // SerialMon.print(' ');
+
+ // Let's exit and process if we find a new line
+ if (headerBuffer.indexOf(F("\r\n")) >= 0) break;
+ }
+ } else {
+ if (millis() - clientReadStartTime > clientReadTimeout) {
+ // Time-out waiting for data from client
+ SerialMon.println(F(">>> Client Timeout !"));
+ break;
+ }
+ }
+
+ // See if we have a new line.
+ nlPos = headerBuffer.indexOf(F("\r\n"));
+
+ if (nlPos > 0) {
+ headerBuffer.toLowerCase();
+ // Check if line contains content-length
+ if (headerBuffer.startsWith(F("content-length:"))) {
+ contentLength =
+ headerBuffer.substring(headerBuffer.indexOf(':') + 1).toInt();
+ // SerialMon.print(F("Got Content Length: ")); // uncomment for
+ // SerialMon.println(contentLength); // confirmation
+ }
+
+ headerBuffer.remove(0, nlPos + 2); // remove the line
+ } else if (nlPos == 0) {
+ // if the new line is empty (i.e. "\r\n" is at the beginning of the line),
+ // we are done with the header.
+ finishedHeader = true;
+ }
+ }
+
+ // The two cases which are not managed properly are as follows:
+ // 1. The client doesn't provide data quickly enough to keep up with this
+ // loop.
+ // 2. If the client data is segmented in the middle of the 'Content-Length: '
+ // header,
+ // then that header may be missed/damaged.
+ //
+
+ uint32_t readLength = 0;
+ CRC32 crc;
+
+ if (finishedHeader && contentLength == knownFileSize) {
+ SerialMon.println(F("Reading response data"));
+ clientReadStartTime = millis();
+
+ printPercent(readLength, contentLength);
+ while (readLength < contentLength && client.connected() &&
+ millis() - clientReadStartTime < clientReadTimeout) {
+ while (client.available()) {
+ uint8_t c = client.read();
+ // SerialMon.print(reinterpret_castc); // Uncomment this to show
+ // data
+ crc.update(c);
+ readLength++;
+ if (readLength % (contentLength / 13) == 0) {
+ printPercent(readLength, contentLength);
+ }
+ clientReadStartTime = millis();
+ }
+ }
+ printPercent(readLength, contentLength);
+ }
+
+ timeElapsed = millis() - timeElapsed;
+ SerialMon.println();
+
+ // Shutdown
+
+ client.stop();
+ SerialMon.println(F("Server disconnected"));
+
+#if TINY_GSM_USE_WIFI
+ modem.networkDisconnect();
+ SerialMon.println(F("WiFi disconnected"));
+#endif
+#if TINY_GSM_USE_GPRS
+ modem.gprsDisconnect();
+ SerialMon.println(F("GPRS disconnected"));
+#endif
+
+ float duration = float(timeElapsed) / 1000;
+
+ SerialMon.println();
+ SerialMon.print("Content-Length: ");
+ SerialMon.println(contentLength);
+ SerialMon.print("Actually read: ");
+ SerialMon.println(readLength);
+ SerialMon.print("Calc. CRC32: 0x");
+ SerialMon.println(crc.finalize(), HEX);
+ SerialMon.print("Known CRC32: 0x");
+ SerialMon.println(knownCRC32, HEX);
+ SerialMon.print("Duration: ");
+ SerialMon.print(duration);
+ SerialMon.println("s");
+
+ // Do nothing forevermore
+ while (true) { delay(1000); }
+}
diff --git a/lib/TinyGSM/examples/HttpClient/HttpClient.ino b/lib/TinyGSM/examples/HttpClient/HttpClient.ino
new file mode 100644
index 000000000..3e4659bfd
--- /dev/null
+++ b/lib/TinyGSM/examples/HttpClient/HttpClient.ino
@@ -0,0 +1,261 @@
+/**************************************************************
+ *
+ * This sketch connects to a website and downloads a page.
+ * It can be used to perform HTTP/RESTful API calls.
+ *
+ * For this example, you need to install ArduinoHttpClient library:
+ * https://github.com/arduino-libraries/ArduinoHttpClient
+ * or from http://librarymanager/all#ArduinoHttpClient
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ * For more HTTP API examples, see ArduinoHttpClient library
+ *
+ * NOTE: This example may NOT work with the XBee because the
+ * HttpClient library does not empty to serial buffer fast enough
+ * and the buffer overflow causes the HttpClient library to stall.
+ * Boards with faster processors may work, 8MHz boards will not.
+ **************************************************************/
+
+// Select your modem:
+#define TINY_GSM_MODEM_SIM800
+// #define TINY_GSM_MODEM_SIM808
+// #define TINY_GSM_MODEM_SIM868
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_SIM7000
+// #define TINY_GSM_MODEM_SIM7000SSL
+// #define TINY_GSM_MODEM_SIM7080
+// #define TINY_GSM_MODEM_SIM5360
+// #define TINY_GSM_MODEM_SIM7600
+// #define TINY_GSM_MODEM_UBLOX
+// #define TINY_GSM_MODEM_SARAR4
+// #define TINY_GSM_MODEM_M95
+// #define TINY_GSM_MODEM_BG96
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_MC60
+// #define TINY_GSM_MODEM_MC60E
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE
+// #define TINY_GSM_MODEM_SEQUANS_MONARCH
+
+// Set serial for debug console (to the Serial Monitor, default speed 115200)
+#define SerialMon Serial
+
+// Set serial for AT commands (to the module)
+// Use Hardware Serial on Mega, Leonardo, Micro
+#ifndef __AVR_ATmega328P__
+#define SerialAT Serial1
+
+// or Software Serial on Uno, Nano
+#else
+#include
+SoftwareSerial SerialAT(2, 3); // RX, TX
+#endif
+
+// Increase RX buffer to capture the entire response
+// Chips without internal buffering (A6/A7, ESP8266, M590)
+// need enough space in the buffer for the entire response
+// else data will be lost (and the http library will fail).
+#if !defined(TINY_GSM_RX_BUFFER)
+#define TINY_GSM_RX_BUFFER 650
+#endif
+
+// See all AT commands, if wanted
+// #define DUMP_AT_COMMANDS
+
+// Define the serial console for debug prints, if needed
+#define TINY_GSM_DEBUG SerialMon
+// #define LOGGING // <- Logging is for the HTTP library
+
+// Range to attempt to autobaud
+// NOTE: DO NOT AUTOBAUD in production code. Once you've established
+// communication, set a fixed baud rate using modem.setBaud(#).
+#define GSM_AUTOBAUD_MIN 9600
+#define GSM_AUTOBAUD_MAX 115200
+
+// Add a reception delay, if needed.
+// This may be needed for a fast processor at a slow baud rate.
+// #define TINY_GSM_YIELD() { delay(2); }
+
+// Define how you're planning to connect to the internet
+// These defines are only for this example; they are not needed in other code.
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+
+// set GSM PIN, if any
+#define GSM_PIN ""
+
+// Your GPRS credentials, if any
+const char apn[] = "YourAPN";
+const char gprsUser[] = "";
+const char gprsPass[] = "";
+
+// Your WiFi connection credentials, if applicable
+const char wifiSSID[] = "YourSSID";
+const char wifiPass[] = "YourWiFiPass";
+
+// Server details
+const char server[] = "vsh.pp.ua";
+const char resource[] = "/TinyGSM/logo.txt";
+const int port = 80;
+
+#include
+#include
+
+// Just in case someone defined the wrong thing..
+#if TINY_GSM_USE_GPRS && not defined TINY_GSM_MODEM_HAS_GPRS
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS false
+#define TINY_GSM_USE_WIFI true
+#endif
+#if TINY_GSM_USE_WIFI && not defined TINY_GSM_MODEM_HAS_WIFI
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+#endif
+
+#ifdef DUMP_AT_COMMANDS
+#include
+StreamDebugger debugger(SerialAT, SerialMon);
+TinyGsm modem(debugger);
+#else
+TinyGsm modem(SerialAT);
+#endif
+
+TinyGsmClient client(modem);
+HttpClient http(client, server, port);
+
+void setup() {
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ // !!!!!!!!!!!
+ // Set your reset, enable, power pins here
+ // !!!!!!!!!!!
+
+ SerialMon.println("Wait...");
+
+ // Set GSM module baud rate
+ TinyGsmAutoBaud(SerialAT, GSM_AUTOBAUD_MIN, GSM_AUTOBAUD_MAX);
+ // SerialAT.begin(9600);
+ delay(6000);
+
+ // Restart takes quite some time
+ // To skip it, call init() instead of restart()
+ SerialMon.println("Initializing modem...");
+ modem.restart();
+ // modem.init();
+
+ String modemInfo = modem.getModemInfo();
+ SerialMon.print("Modem Info: ");
+ SerialMon.println(modemInfo);
+
+#if TINY_GSM_USE_GPRS
+ // Unlock your SIM card with a PIN if needed
+ if (GSM_PIN && modem.getSimStatus() != 3) { modem.simUnlock(GSM_PIN); }
+#endif
+}
+
+void loop() {
+#if TINY_GSM_USE_WIFI
+ // Wifi connection parameters must be set before waiting for the network
+ SerialMon.print(F("Setting SSID/password..."));
+ if (!modem.networkConnect(wifiSSID, wifiPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+#endif
+
+#if TINY_GSM_USE_GPRS && defined TINY_GSM_MODEM_XBEE
+ // The XBee must run the gprsConnect function BEFORE waiting for network!
+ modem.gprsConnect(apn, gprsUser, gprsPass);
+#endif
+
+ SerialMon.print("Waiting for network...");
+ if (!modem.waitForNetwork()) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isNetworkConnected()) { SerialMon.println("Network connected"); }
+
+#if TINY_GSM_USE_GPRS
+ // GPRS connection parameters are usually set after network registration
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(apn);
+ if (!modem.gprsConnect(apn, gprsUser, gprsPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isGprsConnected()) { SerialMon.println("GPRS connected"); }
+#endif
+
+ SerialMon.print(F("Performing HTTP GET request... "));
+ int err = http.get(resource);
+ if (err != 0) {
+ SerialMon.println(F("failed to connect"));
+ delay(10000);
+ return;
+ }
+
+ int status = http.responseStatusCode();
+ SerialMon.print(F("Response status code: "));
+ SerialMon.println(status);
+ if (!status) {
+ delay(10000);
+ return;
+ }
+
+ SerialMon.println(F("Response Headers:"));
+ while (http.headerAvailable()) {
+ String headerName = http.readHeaderName();
+ String headerValue = http.readHeaderValue();
+ SerialMon.println(" " + headerName + " : " + headerValue);
+ }
+
+ int length = http.contentLength();
+ if (length >= 0) {
+ SerialMon.print(F("Content length is: "));
+ SerialMon.println(length);
+ }
+ if (http.isResponseChunked()) {
+ SerialMon.println(F("The response is chunked"));
+ }
+
+ String body = http.responseBody();
+ SerialMon.println(F("Response:"));
+ SerialMon.println(body);
+
+ SerialMon.print(F("Body length is: "));
+ SerialMon.println(body.length());
+
+ // Shutdown
+
+ http.stop();
+ SerialMon.println(F("Server disconnected"));
+
+#if TINY_GSM_USE_WIFI
+ modem.networkDisconnect();
+ SerialMon.println(F("WiFi disconnected"));
+#endif
+#if TINY_GSM_USE_GPRS
+ modem.gprsDisconnect();
+ SerialMon.println(F("GPRS disconnected"));
+#endif
+
+ // Do nothing forevermore
+ while (true) { delay(1000); }
+}
diff --git a/lib/TinyGSM/examples/HttpsClient/HttpsClient.ino b/lib/TinyGSM/examples/HttpsClient/HttpsClient.ino
new file mode 100644
index 000000000..33092f206
--- /dev/null
+++ b/lib/TinyGSM/examples/HttpsClient/HttpsClient.ino
@@ -0,0 +1,257 @@
+/**************************************************************
+ *
+ * This sketch connects to a website and downloads a page.
+ * It can be used to perform HTTP/RESTful API calls.
+ *
+ * For this example, you need to install ArduinoHttpClient library:
+ * https://github.com/arduino-libraries/ArduinoHttpClient
+ * or from http://librarymanager/all#ArduinoHttpClient
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ * SSL/TLS is not yet supported on the Quectel modems
+ * The A6/A7/A20 and M590 are not capable of SSL/TLS
+ *
+ * For more HTTP API examples, see ArduinoHttpClient library
+ *
+ * NOTE: This example may NOT work with the XBee because the
+ * HttpClient library does not empty to serial buffer fast enough
+ * and the buffer overflow causes the HttpClient library to stall.
+ * Boards with faster processors may work, 8MHz boards will not.
+ **************************************************************/
+
+// Select your modem:
+#define TINY_GSM_MODEM_SIM800
+// #define TINY_GSM_MODEM_SIM808
+// #define TINY_GSM_MODEM_SIM868
+// #define TINY_GSM_MODEM_SIM7000SSL
+// #define TINY_GSM_MODEM_SIM7080
+// #define TINY_GSM_MODEM_UBLOX
+// #define TINY_GSM_MODEM_SARAR4
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE
+// #define TINY_GSM_MODEM_SEQUANS_MONARCH
+
+// Set serial for debug console (to the Serial Monitor, default speed 115200)
+#define SerialMon Serial
+
+// Set serial for AT commands (to the module)
+// Use Hardware Serial on Mega, Leonardo, Micro
+#ifndef __AVR_ATmega328P__
+#define SerialAT Serial1
+
+// or Software Serial on Uno, Nano
+#else
+#include
+SoftwareSerial SerialAT(2, 3); // RX, TX
+#endif
+
+// Increase RX buffer to capture the entire response
+// Chips without internal buffering (A6/A7, ESP8266, M590)
+// need enough space in the buffer for the entire response
+// else data will be lost (and the http library will fail).
+#if !defined(TINY_GSM_RX_BUFFER)
+#define TINY_GSM_RX_BUFFER 650
+#endif
+
+// See all AT commands, if wanted
+// #define DUMP_AT_COMMANDS
+
+// Define the serial console for debug prints, if needed
+#define TINY_GSM_DEBUG SerialMon
+// #define LOGGING // <- Logging is for the HTTP library
+
+// Range to attempt to autobaud
+// NOTE: DO NOT AUTOBAUD in production code. Once you've established
+// communication, set a fixed baud rate using modem.setBaud(#).
+#define GSM_AUTOBAUD_MIN 9600
+#define GSM_AUTOBAUD_MAX 115200
+
+// Add a reception delay, if needed.
+// This may be needed for a fast processor at a slow baud rate.
+// #define TINY_GSM_YIELD() { delay(2); }
+
+// Define how you're planning to connect to the internet.
+// This is only needed for this example, not in other code.
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+
+// set GSM PIN, if any
+#define GSM_PIN ""
+
+// flag to force SSL client authentication, if needed
+// #define TINY_GSM_SSL_CLIENT_AUTHENTICATION
+
+// Your GPRS credentials, if any
+const char apn[] = "YourAPN";
+const char gprsUser[] = "";
+const char gprsPass[] = "";
+
+// Your WiFi connection credentials, if applicable
+const char wifiSSID[] = "YourSSID";
+const char wifiPass[] = "YourWiFiPass";
+
+// Server details
+const char server[] = "vsh.pp.ua";
+const char resource[] = "/TinyGSM/logo.txt";
+const int port = 443;
+
+#include
+#include
+
+// Just in case someone defined the wrong thing..
+#if TINY_GSM_USE_GPRS && not defined TINY_GSM_MODEM_HAS_GPRS
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS false
+#define TINY_GSM_USE_WIFI true
+#endif
+#if TINY_GSM_USE_WIFI && not defined TINY_GSM_MODEM_HAS_WIFI
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+#endif
+
+#ifdef DUMP_AT_COMMANDS
+#include
+StreamDebugger debugger(SerialAT, SerialMon);
+TinyGsm modem(debugger);
+#else
+TinyGsm modem(SerialAT);
+#endif
+
+TinyGsmClientSecure client(modem);
+HttpClient http(client, server, port);
+
+void setup() {
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ // !!!!!!!!!!!
+ // Set your reset, enable, power pins here
+ // !!!!!!!!!!!
+
+ SerialMon.println("Wait...");
+
+ // Set GSM module baud rate
+ TinyGsmAutoBaud(SerialAT, GSM_AUTOBAUD_MIN, GSM_AUTOBAUD_MAX);
+ // SerialAT.begin(9600);
+ delay(6000);
+
+ // Restart takes quite some time
+ // To skip it, call init() instead of restart()
+ SerialMon.println("Initializing modem...");
+ modem.restart();
+ // modem.init();
+
+ String modemInfo = modem.getModemInfo();
+ SerialMon.print("Modem Info: ");
+ SerialMon.println(modemInfo);
+
+#if TINY_GSM_USE_GPRS
+ // Unlock your SIM card with a PIN if needed
+ if (GSM_PIN && modem.getSimStatus() != 3) { modem.simUnlock(GSM_PIN); }
+#endif
+}
+
+void loop() {
+#if TINY_GSM_USE_WIFI
+ // Wifi connection parameters must be set before waiting for the network
+ SerialMon.print(F("Setting SSID/password..."));
+ if (!modem.networkConnect(wifiSSID, wifiPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+#endif
+
+#if TINY_GSM_USE_GPRS && defined TINY_GSM_MODEM_XBEE
+ // The XBee must run the gprsConnect function BEFORE waiting for network!
+ modem.gprsConnect(apn, gprsUser, gprsPass);
+#endif
+
+ SerialMon.print("Waiting for network...");
+ if (!modem.waitForNetwork()) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isNetworkConnected()) { SerialMon.println("Network connected"); }
+
+#if TINY_GSM_USE_GPRS
+ // GPRS connection parameters are usually set after network registration
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(apn);
+ if (!modem.gprsConnect(apn, gprsUser, gprsPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isGprsConnected()) { SerialMon.println("GPRS connected"); }
+#endif
+
+ SerialMon.print(F("Performing HTTPS GET request... "));
+ http.connectionKeepAlive(); // Currently, this is needed for HTTPS
+ int err = http.get(resource);
+ if (err != 0) {
+ SerialMon.println(F("failed to connect"));
+ delay(10000);
+ return;
+ }
+
+ int status = http.responseStatusCode();
+ SerialMon.print(F("Response status code: "));
+ SerialMon.println(status);
+ if (!status) {
+ delay(10000);
+ return;
+ }
+
+ SerialMon.println(F("Response Headers:"));
+ while (http.headerAvailable()) {
+ String headerName = http.readHeaderName();
+ String headerValue = http.readHeaderValue();
+ SerialMon.println(" " + headerName + " : " + headerValue);
+ }
+
+ int length = http.contentLength();
+ if (length >= 0) {
+ SerialMon.print(F("Content length is: "));
+ SerialMon.println(length);
+ }
+ if (http.isResponseChunked()) {
+ SerialMon.println(F("The response is chunked"));
+ }
+
+ String body = http.responseBody();
+ SerialMon.println(F("Response:"));
+ SerialMon.println(body);
+
+ SerialMon.print(F("Body length is: "));
+ SerialMon.println(body.length());
+
+ // Shutdown
+
+ http.stop();
+ SerialMon.println(F("Server disconnected"));
+
+#if TINY_GSM_USE_WIFI
+ modem.networkDisconnect();
+ SerialMon.println(F("WiFi disconnected"));
+#endif
+#if TINY_GSM_USE_GPRS
+ modem.gprsDisconnect();
+ SerialMon.println(F("GPRS disconnected"));
+#endif
+
+ // Do nothing forevermore
+ while (true) { delay(1000); }
+}
diff --git a/lib/TinyGSM/examples/MqttClient/MqttClient.ino b/lib/TinyGSM/examples/MqttClient/MqttClient.ino
new file mode 100644
index 000000000..77a850083
--- /dev/null
+++ b/lib/TinyGSM/examples/MqttClient/MqttClient.ino
@@ -0,0 +1,290 @@
+/**************************************************************
+ *
+ * For this example, you need to install PubSubClient library:
+ * https://github.com/knolleary/pubsubclient
+ * or from http://librarymanager/all#PubSubClient
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ * For more MQTT examples, see PubSubClient library
+ *
+ **************************************************************
+ * This example connects to HiveMQ's showcase broker.
+ *
+ * You can quickly test sending and receiving messages from the HiveMQ webclient
+ * available at http://www.hivemq.com/demos/websocket-client/.
+ *
+ * Subscribe to the topic GsmClientTest/ledStatus
+ * Publish "toggle" to the topic GsmClientTest/led and the LED on your board
+ * should toggle and you should see a new message published to
+ * GsmClientTest/ledStatus with the newest LED status.
+ *
+ **************************************************************/
+
+// Select your modem:
+#define TINY_GSM_MODEM_SIM800
+// #define TINY_GSM_MODEM_SIM808
+// #define TINY_GSM_MODEM_SIM868
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_SIM7000
+// #define TINY_GSM_MODEM_SIM7000SSL
+// #define TINY_GSM_MODEM_SIM7080
+// #define TINY_GSM_MODEM_SIM5360
+// #define TINY_GSM_MODEM_SIM7600
+// #define TINY_GSM_MODEM_UBLOX
+// #define TINY_GSM_MODEM_SARAR4
+// #define TINY_GSM_MODEM_M95
+// #define TINY_GSM_MODEM_BG96
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_MC60
+// #define TINY_GSM_MODEM_MC60E
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE
+// #define TINY_GSM_MODEM_SEQUANS_MONARCH
+
+// Set serial for debug console (to the Serial Monitor, default speed 115200)
+#define SerialMon Serial
+
+// Set serial for AT commands (to the module)
+// Use Hardware Serial on Mega, Leonardo, Micro
+#ifndef __AVR_ATmega328P__
+#define SerialAT Serial1
+
+// or Software Serial on Uno, Nano
+#else
+#include
+SoftwareSerial SerialAT(2, 3); // RX, TX
+#endif
+
+// See all AT commands, if wanted
+// #define DUMP_AT_COMMANDS
+
+// Define the serial console for debug prints, if needed
+#define TINY_GSM_DEBUG SerialMon
+
+// Range to attempt to autobaud
+// NOTE: DO NOT AUTOBAUD in production code. Once you've established
+// communication, set a fixed baud rate using modem.setBaud(#).
+#define GSM_AUTOBAUD_MIN 9600
+#define GSM_AUTOBAUD_MAX 115200
+
+// Add a reception delay, if needed.
+// This may be needed for a fast processor at a slow baud rate.
+// #define TINY_GSM_YIELD() { delay(2); }
+
+// Define how you're planning to connect to the internet.
+// This is only needed for this example, not in other code.
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+
+// set GSM PIN, if any
+#define GSM_PIN ""
+
+// Your GPRS credentials, if any
+const char apn[] = "YourAPN";
+const char gprsUser[] = "";
+const char gprsPass[] = "";
+
+// Your WiFi connection credentials, if applicable
+const char wifiSSID[] = "YourSSID";
+const char wifiPass[] = "YourWiFiPass";
+
+// MQTT details
+const char* broker = "broker.hivemq.com";
+
+const char* topicLed = "GsmClientTest/led";
+const char* topicInit = "GsmClientTest/init";
+const char* topicLedStatus = "GsmClientTest/ledStatus";
+
+#include
+#include
+
+// Just in case someone defined the wrong thing..
+#if TINY_GSM_USE_GPRS && not defined TINY_GSM_MODEM_HAS_GPRS
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS false
+#define TINY_GSM_USE_WIFI true
+#endif
+#if TINY_GSM_USE_WIFI && not defined TINY_GSM_MODEM_HAS_WIFI
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+#endif
+
+#ifdef DUMP_AT_COMMANDS
+#include
+StreamDebugger debugger(SerialAT, SerialMon);
+TinyGsm modem(debugger);
+#else
+TinyGsm modem(SerialAT);
+#endif
+TinyGsmClient client(modem);
+PubSubClient mqtt(client);
+
+#define LED_PIN 13
+int ledStatus = LOW;
+
+uint32_t lastReconnectAttempt = 0;
+
+void mqttCallback(char* topic, byte* payload, unsigned int len) {
+ SerialMon.print("Message arrived [");
+ SerialMon.print(topic);
+ SerialMon.print("]: ");
+ SerialMon.write(payload, len);
+ SerialMon.println();
+
+ // Only proceed if incoming message's topic matches
+ if (String(topic) == topicLed) {
+ ledStatus = !ledStatus;
+ digitalWrite(LED_PIN, ledStatus);
+ mqtt.publish(topicLedStatus, ledStatus ? "1" : "0");
+ }
+}
+
+boolean mqttConnect() {
+ SerialMon.print("Connecting to ");
+ SerialMon.print(broker);
+
+ // Connect to MQTT Broker
+ boolean status = mqtt.connect("GsmClientTest");
+
+ // Or, if you want to authenticate MQTT:
+ // boolean status = mqtt.connect("GsmClientName", "mqtt_user", "mqtt_pass");
+
+ if (status == false) {
+ SerialMon.println(" fail");
+ return false;
+ }
+ SerialMon.println(" success");
+ mqtt.publish(topicInit, "GsmClientTest started");
+ mqtt.subscribe(topicLed);
+ return mqtt.connected();
+}
+
+
+void setup() {
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ pinMode(LED_PIN, OUTPUT);
+
+ // !!!!!!!!!!!
+ // Set your reset, enable, power pins here
+ // !!!!!!!!!!!
+
+ SerialMon.println("Wait...");
+
+ // Set GSM module baud rate
+ TinyGsmAutoBaud(SerialAT, GSM_AUTOBAUD_MIN, GSM_AUTOBAUD_MAX);
+ // SerialAT.begin(9600);
+ delay(6000);
+
+ // Restart takes quite some time
+ // To skip it, call init() instead of restart()
+ SerialMon.println("Initializing modem...");
+ modem.restart();
+ // modem.init();
+
+ String modemInfo = modem.getModemInfo();
+ SerialMon.print("Modem Info: ");
+ SerialMon.println(modemInfo);
+
+#if TINY_GSM_USE_GPRS
+ // Unlock your SIM card with a PIN if needed
+ if (GSM_PIN && modem.getSimStatus() != 3) { modem.simUnlock(GSM_PIN); }
+#endif
+
+#if TINY_GSM_USE_WIFI
+ // Wifi connection parameters must be set before waiting for the network
+ SerialMon.print(F("Setting SSID/password..."));
+ if (!modem.networkConnect(wifiSSID, wifiPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+#endif
+
+#if TINY_GSM_USE_GPRS && defined TINY_GSM_MODEM_XBEE
+ // The XBee must run the gprsConnect function BEFORE waiting for network!
+ modem.gprsConnect(apn, gprsUser, gprsPass);
+#endif
+
+ SerialMon.print("Waiting for network...");
+ if (!modem.waitForNetwork()) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isNetworkConnected()) { SerialMon.println("Network connected"); }
+
+#if TINY_GSM_USE_GPRS
+ // GPRS connection parameters are usually set after network registration
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(apn);
+ if (!modem.gprsConnect(apn, gprsUser, gprsPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isGprsConnected()) { SerialMon.println("GPRS connected"); }
+#endif
+
+ // MQTT Broker setup
+ mqtt.setServer(broker, 1883);
+ mqtt.setCallback(mqttCallback);
+}
+
+void loop() {
+ // Make sure we're still registered on the network
+ if (!modem.isNetworkConnected()) {
+ SerialMon.println("Network disconnected");
+ if (!modem.waitForNetwork(180000L, true)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ if (modem.isNetworkConnected()) {
+ SerialMon.println("Network re-connected");
+ }
+
+#if TINY_GSM_USE_GPRS
+ // and make sure GPRS/EPS is still connected
+ if (!modem.isGprsConnected()) {
+ SerialMon.println("GPRS disconnected!");
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(apn);
+ if (!modem.gprsConnect(apn, gprsUser, gprsPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ if (modem.isGprsConnected()) { SerialMon.println("GPRS reconnected"); }
+ }
+#endif
+ }
+
+ if (!mqtt.connected()) {
+ SerialMon.println("=== MQTT NOT CONNECTED ===");
+ // Reconnect every 10 seconds
+ uint32_t t = millis();
+ if (t - lastReconnectAttempt > 10000L) {
+ lastReconnectAttempt = t;
+ if (mqttConnect()) { lastReconnectAttempt = 0; }
+ }
+ delay(100);
+ return;
+ }
+
+ mqtt.loop();
+}
diff --git a/lib/TinyGSM/examples/WebClient/WebClient.ino b/lib/TinyGSM/examples/WebClient/WebClient.ino
new file mode 100644
index 000000000..74ffa0a8d
--- /dev/null
+++ b/lib/TinyGSM/examples/WebClient/WebClient.ino
@@ -0,0 +1,244 @@
+/**************************************************************
+ *
+ * This sketch connects to a website and downloads a page.
+ * It can be used to perform HTTP/RESTful API calls.
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ **************************************************************/
+
+// Select your modem:
+#define TINY_GSM_MODEM_SIM800
+// #define TINY_GSM_MODEM_SIM808
+// #define TINY_GSM_MODEM_SIM868
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_SIM7000
+// #define TINY_GSM_MODEM_SIM7000SSL
+// #define TINY_GSM_MODEM_SIM7080
+// #define TINY_GSM_MODEM_SIM5360
+// #define TINY_GSM_MODEM_SIM7600
+// #define TINY_GSM_MODEM_UBLOX
+// #define TINY_GSM_MODEM_SARAR4
+// #define TINY_GSM_MODEM_M95
+// #define TINY_GSM_MODEM_BG96
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_MC60
+// #define TINY_GSM_MODEM_MC60E
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE
+// #define TINY_GSM_MODEM_SEQUANS_MONARCH
+
+// Set serial for debug console (to the Serial Monitor, default speed 115200)
+#define SerialMon Serial
+
+// Set serial for AT commands (to the module)
+// Use Hardware Serial on Mega, Leonardo, Micro
+#ifndef __AVR_ATmega328P__
+#define SerialAT Serial1
+
+// or Software Serial on Uno, Nano
+#else
+#include
+SoftwareSerial SerialAT(2, 3); // RX, TX
+#endif
+
+// Increase RX buffer to capture the entire response
+// Chips without internal buffering (A6/A7, ESP8266, M590)
+// need enough space in the buffer for the entire response
+// else data will be lost (and the http library will fail).
+#if !defined(TINY_GSM_RX_BUFFER)
+#define TINY_GSM_RX_BUFFER 650
+#endif
+
+// See all AT commands, if wanted
+// #define DUMP_AT_COMMANDS
+
+// Define the serial console for debug prints, if needed
+#define TINY_GSM_DEBUG SerialMon
+
+// Range to attempt to autobaud
+// NOTE: DO NOT AUTOBAUD in production code. Once you've established
+// communication, set a fixed baud rate using modem.setBaud(#).
+#define GSM_AUTOBAUD_MIN 9600
+#define GSM_AUTOBAUD_MAX 115200
+
+// Add a reception delay, if needed.
+// This may be needed for a fast processor at a slow baud rate.
+// #define TINY_GSM_YIELD() { delay(2); }
+
+// Uncomment this if you want to use SSL
+// #define USE_SSL
+
+// Define how you're planning to connect to the internet.
+// This is only needed for this example, not in other code.
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+
+// set GSM PIN, if any
+#define GSM_PIN ""
+
+// Your GPRS credentials, if any
+const char apn[] = "YourAPN";
+const char gprsUser[] = "";
+const char gprsPass[] = "";
+
+// Your WiFi connection credentials, if applicable
+const char wifiSSID[] = "YourSSID";
+const char wifiPass[] = "YourWiFiPass";
+
+// Server details
+const char server[] = "vsh.pp.ua";
+const char resource[] = "/TinyGSM/logo.txt";
+
+#include
+
+// Just in case someone defined the wrong thing..
+#if TINY_GSM_USE_GPRS && not defined TINY_GSM_MODEM_HAS_GPRS
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS false
+#define TINY_GSM_USE_WIFI true
+#endif
+#if TINY_GSM_USE_WIFI && not defined TINY_GSM_MODEM_HAS_WIFI
+#undef TINY_GSM_USE_GPRS
+#undef TINY_GSM_USE_WIFI
+#define TINY_GSM_USE_GPRS true
+#define TINY_GSM_USE_WIFI false
+#endif
+
+#ifdef DUMP_AT_COMMANDS
+#include
+StreamDebugger debugger(SerialAT, SerialMon);
+TinyGsm modem(debugger);
+#else
+TinyGsm modem(SerialAT);
+#endif
+
+#ifdef USE_SSL
+TinyGsmClientSecure client(modem);
+const int port = 443;
+#else
+TinyGsmClient client(modem);
+const int port = 80;
+#endif
+
+void setup() {
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ // !!!!!!!!!!!
+ // Set your reset, enable, power pins here
+ // !!!!!!!!!!!
+
+ SerialMon.println("Wait...");
+
+ // Set GSM module baud rate
+ TinyGsmAutoBaud(SerialAT, GSM_AUTOBAUD_MIN, GSM_AUTOBAUD_MAX);
+ // SerialAT.begin(9600);
+ delay(6000);
+
+ // Restart takes quite some time
+ // To skip it, call init() instead of restart()
+ SerialMon.println("Initializing modem...");
+ modem.restart();
+ // modem.init();
+
+ String modemInfo = modem.getModemInfo();
+ SerialMon.print("Modem Info: ");
+ SerialMon.println(modemInfo);
+
+#if TINY_GSM_USE_GPRS
+ // Unlock your SIM card with a PIN if needed
+ if (GSM_PIN && modem.getSimStatus() != 3) { modem.simUnlock(GSM_PIN); }
+#endif
+}
+
+void loop() {
+#if TINY_GSM_USE_WIFI
+ // Wifi connection parameters must be set before waiting for the network
+ SerialMon.print(F("Setting SSID/password..."));
+ if (!modem.networkConnect(wifiSSID, wifiPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+#endif
+
+#if TINY_GSM_USE_GPRS && defined TINY_GSM_MODEM_XBEE
+ // The XBee must run the gprsConnect function BEFORE waiting for network!
+ modem.gprsConnect(apn, gprsUser, gprsPass);
+#endif
+
+ SerialMon.print("Waiting for network...");
+ if (!modem.waitForNetwork()) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isNetworkConnected()) { SerialMon.println("Network connected"); }
+
+#if TINY_GSM_USE_GPRS
+ // GPRS connection parameters are usually set after network registration
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(apn);
+ if (!modem.gprsConnect(apn, gprsUser, gprsPass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ if (modem.isGprsConnected()) { SerialMon.println("GPRS connected"); }
+#endif
+
+ SerialMon.print("Connecting to ");
+ SerialMon.println(server);
+ if (!client.connect(server, port)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ // Make a HTTP GET request:
+ SerialMon.println("Performing HTTP GET request...");
+ client.print(String("GET ") + resource + " HTTP/1.1\r\n");
+ client.print(String("Host: ") + server + "\r\n");
+ client.print("Connection: close\r\n\r\n");
+ client.println();
+
+ uint32_t timeout = millis();
+ while (client.connected() && millis() - timeout < 10000L) {
+ // Print available data
+ while (client.available()) {
+ char c = client.read();
+ SerialMon.print(c);
+ timeout = millis();
+ }
+ }
+ SerialMon.println();
+
+ // Shutdown
+
+ client.stop();
+ SerialMon.println(F("Server disconnected"));
+
+#if TINY_GSM_USE_WIFI
+ modem.networkDisconnect();
+ SerialMon.println(F("WiFi disconnected"));
+#endif
+#if TINY_GSM_USE_GPRS
+ modem.gprsDisconnect();
+ SerialMon.println(F("GPRS disconnected"));
+#endif
+
+ // Do nothing forevermore
+ while (true) { delay(1000); }
+}
diff --git a/lib/TinyGSM/examples/example_dependencies.json b/lib/TinyGSM/examples/example_dependencies.json
new file mode 100644
index 000000000..76d7297f8
--- /dev/null
+++ b/lib/TinyGSM/examples/example_dependencies.json
@@ -0,0 +1,41 @@
+[
+ {
+ "name": "PubSubClient",
+ "owner": "knolleary",
+ "library id": "89",
+ "url": "https://github.com/knolleary/pubsubclient.git",
+ "version": "~2.8",
+ "note": "A client library for MQTT messaging.",
+ "authors": ["Nick O'Leary"]
+ },
+ {
+ "name": "Blynk",
+ "owner": "blynkkk",
+ "library id": "415",
+ "url": "https://github.com/blynkkk/blynk-library.git",
+ "version": "~0.6.7",
+ "authors": ["Volodymyr Shymanskyy"],
+ "frameworks": "*",
+ "platforms": "*"
+ },
+ {
+ "name": "AceCRC",
+ "owner": "bxparks",
+ "library id": "1202",
+ "url": "https://github.com/bxparks/AceCRC.git",
+ "version": "~1.0.1",
+ "authors": ["Brian T. Park"],
+ "frameworks": "*",
+ "platforms": "*"
+ },
+ {
+ "name": "StreamDebugger",
+ "owner": "vshymanskyy",
+ "library id": "1286",
+ "url": "https://github.com/vshymanskyy/StreamDebugger.git",
+ "version": "~1.0.1",
+ "authors": ["Volodymyr Shymanskyy"],
+ "frameworks": "*",
+ "platforms": "*"
+ }
+]
diff --git a/lib/TinyGSM/examples/more/Hologram_Dash/Hologram_Dash.ino b/lib/TinyGSM/examples/more/Hologram_Dash/Hologram_Dash.ino
new file mode 100644
index 000000000..5578fc40d
--- /dev/null
+++ b/lib/TinyGSM/examples/more/Hologram_Dash/Hologram_Dash.ino
@@ -0,0 +1,136 @@
+/**************************************************************
+ *
+ * This sketch connects to a website and downloads a page.
+ * It can be used to perform HTTP/RESTful API calls.
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ **************************************************************/
+
+// Hologram Dash uses UBLOX U2 modems
+#define TINY_GSM_MODEM_UBLOX
+
+// Increase RX buffer if needed
+#if !defined(TINY_GSM_RX_BUFFER)
+#define TINY_GSM_RX_BUFFER 512
+#endif
+
+#include
+
+// Uncomment this if you want to see all AT commands
+// #define DUMP_AT_COMMANDS
+
+// Uncomment this if you want to use SSL
+// #define USE_SSL
+
+// Set serial for debug console (to the Serial Monitor, speed 115200)
+#define SerialMon Serial
+
+// We'll be using SerialSystem in Passthrough mode
+#define SerialAT SerialSystem
+
+// Your GPRS credentials
+// Leave empty, if missing user or pass
+const char apn[] = "YourAPN";
+const char user[] = "";
+const char pass[] = "";
+
+// Server details
+const char server[] = "vsh.pp.ua";
+const char resource[] = "/TinyGSM/logo.txt";
+
+#ifdef DUMP_AT_COMMANDS
+ #include
+ StreamDebugger debugger(SerialAT, SerialMon);
+ TinyGsm mdm(debugger);
+#else
+ TinyGsm mdm(SerialAT);
+#endif
+
+#ifdef USE_SSL
+ TinyGsmClientSecure client(mdm);
+ const int port = 443;
+#else
+ TinyGsmClient client(mdm);
+ const int port = 80;
+#endif
+
+void setup() {
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ // Set up Passthrough
+ HologramCloud.enterPassthrough();
+ delay(6000);
+
+ // Restart takes quite some time
+ // To skip it, call init() instead of restart()
+ SerialMon.println(F("Initializing modem..."));
+ mdm.restart();
+
+ String modemInfo = mdm.getModemInfo();
+ SerialMon.print(F("Modem: "));
+ SerialMon.println(modemInfo);
+
+ // Unlock your SIM card with a PIN
+ //mdm.simUnlock("1234");
+}
+
+void loop() {
+ SerialMon.print(F("Waiting for network..."));
+ if (!mdm.waitForNetwork()) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(apn);
+ if (!mdm.gprsConnect(apn, user, pass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(server);
+ if (!client.connect(server, port)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ // Make a HTTP GET request:
+ client.print(String("GET ") + resource + " HTTP/1.0\r\n");
+ client.print(String("Host: ") + server + "\r\n");
+ client.print("Connection: close\r\n\r\n");
+
+ uint32_t timeout = millis();
+ while (client.connected() && millis() - timeout < 10000L) {
+ // Print available data
+ while (client.available()) {
+ char c = client.read();
+ SerialMon.print(c);
+ timeout = millis();
+ }
+ }
+ SerialMon.println();
+
+ // Shutdown
+
+ client.stop();
+ SerialMon.println(F("Server disconnected"));
+
+ mdm.gprsDisconnect();
+ SerialMon.println(F("GPRS disconnected"));
+
+ // Do nothing forevermore
+ while (true) {
+ delay(1000);
+ }
+}
diff --git a/lib/TinyGSM/examples/more/Industruino/Industruino.ino b/lib/TinyGSM/examples/more/Industruino/Industruino.ino
new file mode 100644
index 000000000..cd2b747e8
--- /dev/null
+++ b/lib/TinyGSM/examples/more/Industruino/Industruino.ino
@@ -0,0 +1,161 @@
+/**************************************************************
+ *
+ * This sketch connects to a website and downloads a page.
+ * It can be used to perform HTTP/RESTful API calls.
+ *
+ * For this example, you need to install ArduinoHttpClient library:
+ * https://github.com/arduino-libraries/ArduinoHttpClient
+ * or from http://librarymanager/all#ArduinoHttpClient
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ * For more HTTP API examples, see ArduinoHttpClient library
+ *
+ **************************************************************/
+
+// Industruino uses SIM800H
+#define TINY_GSM_MODEM_SIM800
+
+// Increase RX buffer if needed
+#if !defined(TINY_GSM_RX_BUFFER)
+#define TINY_GSM_RX_BUFFER 512
+#endif
+
+#include
+#include
+
+// Uncomment this if you want to see all AT commands
+// #define DUMP_AT_COMMANDS
+
+// Uncomment this if you want to use SSL
+// #define USE_SSL
+
+// Set serial for debug console (to the Serial Monitor, speed 115200)
+#define SerialMon SerialUSB
+
+// Select Serial1 or Serial depending on your module configuration
+#define SerialAT Serial1
+
+// Your GPRS credentials
+// Leave empty, if missing user or pass
+const char apn[] = "YourAPN";
+const char user[] = "";
+const char pass[] = "";
+
+// Server details
+const char server[] = "vsh.pp.ua";
+const char resource[] = "/TinyGSM/logo.txt";
+
+#ifdef DUMP_AT_COMMANDS
+ #include
+ StreamDebugger debugger(SerialAT, SerialMon);
+ TinyGsm modem(debugger);
+#else
+ TinyGsm modem(SerialAT);
+#endif
+
+#ifdef USE_SSL
+ TinyGsmClientSecure client(modem);
+ HttpClient http(client, server, 443);
+#else
+ TinyGsmClient client(modem);
+ HttpClient http(client, server, 80);
+#endif
+
+void setup() {
+ // Turn on modem with 1 second pulse on D6
+ pinMode(6, OUTPUT);
+ digitalWrite(6, HIGH);
+ delay(1000);
+ digitalWrite(6, LOW);
+
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ // Set GSM module baud rate
+ SerialAT.begin(115200);
+ delay(6000);
+
+ // Restart takes quite some time
+ // To skip it, call init() instead of restart()
+ SerialMon.println(F("Initializing modem..."));
+ modem.restart();
+
+ String modemInfo = modem.getModemInfo();
+ SerialMon.print(F("Modem: "));
+ SerialMon.println(modemInfo);
+
+ // Unlock your SIM card with a PIN
+ //modem.simUnlock("1234");
+}
+
+void loop() {
+ SerialMon.print(F("Waiting for network..."));
+ if (!modem.waitForNetwork()) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ SerialMon.print(F("Connecting to "));
+ SerialMon.print(apn);
+ if (!modem.gprsConnect(apn, user, pass)) {
+ SerialMon.println(" fail");
+ delay(10000);
+ return;
+ }
+ SerialMon.println(" success");
+
+ SerialMon.print(F("Performing HTTP GET request... "));
+ int err = http.get(resource);
+ if (err != 0) {
+ SerialMon.println(F("failed to connect"));
+ delay(10000);
+ return;
+ }
+
+ int status = http.responseStatusCode();
+ SerialMon.println(status);
+ if (!status) {
+ delay(10000);
+ return;
+ }
+
+ while (http.headerAvailable()) {
+ String headerName = http.readHeaderName();
+ String headerValue = http.readHeaderValue();
+ //SerialMon.println(headerName + " : " + headerValue);
+ }
+
+ int length = http.contentLength();
+ if (length >= 0) {
+ SerialMon.print(F("Content length is: "));
+ SerialMon.println(length);
+ }
+ if (http.isResponseChunked()) {
+ SerialMon.println(F("The response is chunked"));
+ }
+
+ String body = http.responseBody();
+ SerialMon.println(F("Response:"));
+ SerialMon.println(body);
+
+ SerialMon.print(F("Body length is: "));
+ SerialMon.println(body.length());
+
+ // Shutdown
+
+ http.stop();
+ SerialMon.println(F("Server disconnected"));
+
+ modem.gprsDisconnect();
+ SerialMon.println(F("GPRS disconnected"));
+
+ // Do nothing forevermore
+ while (true) {
+ delay(1000);
+ }
+}
diff --git a/lib/TinyGSM/examples/more/SIM800_SslSetCert/COMODORSACertificationAuthority.h b/lib/TinyGSM/examples/more/SIM800_SslSetCert/COMODORSACertificationAuthority.h
new file mode 100644
index 000000000..514db99a1
--- /dev/null
+++ b/lib/TinyGSM/examples/more/SIM800_SslSetCert/COMODORSACertificationAuthority.h
@@ -0,0 +1,36 @@
+const char cert[] PROGMEM =
+"-----BEGIN CERTIFICATE-----\n"
+"MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB\n"
+"hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G\n"
+"A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV\n"
+"BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5\n"
+"MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT\n"
+"EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR\n"
+"Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh\n"
+"dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR\n"
+"6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X\n"
+"pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC\n"
+"9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV\n"
+"/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf\n"
+"Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z\n"
+"+pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w\n"
+"qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah\n"
+"SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC\n"
+"u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf\n"
+"Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq\n"
+"crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E\n"
+"FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB\n"
+"/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl\n"
+"wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM\n"
+"4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV\n"
+"2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna\n"
+"FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ\n"
+"CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK\n"
+"boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke\n"
+"jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL\n"
+"S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb\n"
+"QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl\n"
+"0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB\n"
+"NVOFBkpdn627G190\n"
+"-----END CERTIFICATE-----\n";
+
diff --git a/lib/TinyGSM/examples/more/SIM800_SslSetCert/DSTRootCAX3.der.h b/lib/TinyGSM/examples/more/SIM800_SslSetCert/DSTRootCAX3.der.h
new file mode 100644
index 000000000..15063a3e2
--- /dev/null
+++ b/lib/TinyGSM/examples/more/SIM800_SslSetCert/DSTRootCAX3.der.h
@@ -0,0 +1,74 @@
+const char cert[] PROGMEM =
+{
+ 0x30, 0x82, 0x03, 0x4a, 0x30, 0x82, 0x02, 0x32, 0xa0, 0x03, 0x02, 0x01,
+ 0x02, 0x02, 0x10, 0x44, 0xaf, 0xb0, 0x80, 0xd6, 0xa3, 0x27, 0xba, 0x89,
+ 0x30, 0x39, 0x86, 0x2e, 0xf8, 0x40, 0x6b, 0x30, 0x0d, 0x06, 0x09, 0x2a,
+ 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x3f,
+ 0x31, 0x24, 0x30, 0x22, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x1b, 0x44,
+ 0x69, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x20, 0x53, 0x69, 0x67, 0x6e, 0x61,
+ 0x74, 0x75, 0x72, 0x65, 0x20, 0x54, 0x72, 0x75, 0x73, 0x74, 0x20, 0x43,
+ 0x6f, 0x2e, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13,
+ 0x0e, 0x44, 0x53, 0x54, 0x20, 0x52, 0x6f, 0x6f, 0x74, 0x20, 0x43, 0x41,
+ 0x20, 0x58, 0x33, 0x30, 0x1e, 0x17, 0x0d, 0x30, 0x30, 0x30, 0x39, 0x33,
+ 0x30, 0x32, 0x31, 0x31, 0x32, 0x31, 0x39, 0x5a, 0x17, 0x0d, 0x32, 0x31,
+ 0x30, 0x39, 0x33, 0x30, 0x31, 0x34, 0x30, 0x31, 0x31, 0x35, 0x5a, 0x30,
+ 0x3f, 0x31, 0x24, 0x30, 0x22, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x1b,
+ 0x44, 0x69, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x20, 0x53, 0x69, 0x67, 0x6e,
+ 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x54, 0x72, 0x75, 0x73, 0x74, 0x20,
+ 0x43, 0x6f, 0x2e, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04, 0x03,
+ 0x13, 0x0e, 0x44, 0x53, 0x54, 0x20, 0x52, 0x6f, 0x6f, 0x74, 0x20, 0x43,
+ 0x41, 0x20, 0x58, 0x33, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09,
+ 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03,
+ 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01,
+ 0x00, 0xdf, 0xaf, 0xe9, 0x97, 0x50, 0x08, 0x83, 0x57, 0xb4, 0xcc, 0x62,
+ 0x65, 0xf6, 0x90, 0x82, 0xec, 0xc7, 0xd3, 0x2c, 0x6b, 0x30, 0xca, 0x5b,
+ 0xec, 0xd9, 0xc3, 0x7d, 0xc7, 0x40, 0xc1, 0x18, 0x14, 0x8b, 0xe0, 0xe8,
+ 0x33, 0x76, 0x49, 0x2a, 0xe3, 0x3f, 0x21, 0x49, 0x93, 0xac, 0x4e, 0x0e,
+ 0xaf, 0x3e, 0x48, 0xcb, 0x65, 0xee, 0xfc, 0xd3, 0x21, 0x0f, 0x65, 0xd2,
+ 0x2a, 0xd9, 0x32, 0x8f, 0x8c, 0xe5, 0xf7, 0x77, 0xb0, 0x12, 0x7b, 0xb5,
+ 0x95, 0xc0, 0x89, 0xa3, 0xa9, 0xba, 0xed, 0x73, 0x2e, 0x7a, 0x0c, 0x06,
+ 0x32, 0x83, 0xa2, 0x7e, 0x8a, 0x14, 0x30, 0xcd, 0x11, 0xa0, 0xe1, 0x2a,
+ 0x38, 0xb9, 0x79, 0x0a, 0x31, 0xfd, 0x50, 0xbd, 0x80, 0x65, 0xdf, 0xb7,
+ 0x51, 0x63, 0x83, 0xc8, 0xe2, 0x88, 0x61, 0xea, 0x4b, 0x61, 0x81, 0xec,
+ 0x52, 0x6b, 0xb9, 0xa2, 0xe2, 0x4b, 0x1a, 0x28, 0x9f, 0x48, 0xa3, 0x9e,
+ 0x0c, 0xda, 0x09, 0x8e, 0x3e, 0x17, 0x2e, 0x1e, 0xdd, 0x20, 0xdf, 0x5b,
+ 0xc6, 0x2a, 0x8a, 0xab, 0x2e, 0xbd, 0x70, 0xad, 0xc5, 0x0b, 0x1a, 0x25,
+ 0x90, 0x74, 0x72, 0xc5, 0x7b, 0x6a, 0xab, 0x34, 0xd6, 0x30, 0x89, 0xff,
+ 0xe5, 0x68, 0x13, 0x7b, 0x54, 0x0b, 0xc8, 0xd6, 0xae, 0xec, 0x5a, 0x9c,
+ 0x92, 0x1e, 0x3d, 0x64, 0xb3, 0x8c, 0xc6, 0xdf, 0xbf, 0xc9, 0x41, 0x70,
+ 0xec, 0x16, 0x72, 0xd5, 0x26, 0xec, 0x38, 0x55, 0x39, 0x43, 0xd0, 0xfc,
+ 0xfd, 0x18, 0x5c, 0x40, 0xf1, 0x97, 0xeb, 0xd5, 0x9a, 0x9b, 0x8d, 0x1d,
+ 0xba, 0xda, 0x25, 0xb9, 0xc6, 0xd8, 0xdf, 0xc1, 0x15, 0x02, 0x3a, 0xab,
+ 0xda, 0x6e, 0xf1, 0x3e, 0x2e, 0xf5, 0x5c, 0x08, 0x9c, 0x3c, 0xd6, 0x83,
+ 0x69, 0xe4, 0x10, 0x9b, 0x19, 0x2a, 0xb6, 0x29, 0x57, 0xe3, 0xe5, 0x3d,
+ 0x9b, 0x9f, 0xf0, 0x02, 0x5d, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 0x42,
+ 0x30, 0x40, 0x30, 0x0f, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff,
+ 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30, 0x0e, 0x06, 0x03, 0x55,
+ 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x01, 0x06, 0x30,
+ 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xc4, 0xa7,
+ 0xb1, 0xa4, 0x7b, 0x2c, 0x71, 0xfa, 0xdb, 0xe1, 0x4b, 0x90, 0x75, 0xff,
+ 0xc4, 0x15, 0x60, 0x85, 0x89, 0x10, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
+ 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x82, 0x01,
+ 0x01, 0x00, 0xa3, 0x1a, 0x2c, 0x9b, 0x17, 0x00, 0x5c, 0xa9, 0x1e, 0xee,
+ 0x28, 0x66, 0x37, 0x3a, 0xbf, 0x83, 0xc7, 0x3f, 0x4b, 0xc3, 0x09, 0xa0,
+ 0x95, 0x20, 0x5d, 0xe3, 0xd9, 0x59, 0x44, 0xd2, 0x3e, 0x0d, 0x3e, 0xbd,
+ 0x8a, 0x4b, 0xa0, 0x74, 0x1f, 0xce, 0x10, 0x82, 0x9c, 0x74, 0x1a, 0x1d,
+ 0x7e, 0x98, 0x1a, 0xdd, 0xcb, 0x13, 0x4b, 0xb3, 0x20, 0x44, 0xe4, 0x91,
+ 0xe9, 0xcc, 0xfc, 0x7d, 0xa5, 0xdb, 0x6a, 0xe5, 0xfe, 0xe6, 0xfd, 0xe0,
+ 0x4e, 0xdd, 0xb7, 0x00, 0x3a, 0xb5, 0x70, 0x49, 0xaf, 0xf2, 0xe5, 0xeb,
+ 0x02, 0xf1, 0xd1, 0x02, 0x8b, 0x19, 0xcb, 0x94, 0x3a, 0x5e, 0x48, 0xc4,
+ 0x18, 0x1e, 0x58, 0x19, 0x5f, 0x1e, 0x02, 0x5a, 0xf0, 0x0c, 0xf1, 0xb1,
+ 0xad, 0xa9, 0xdc, 0x59, 0x86, 0x8b, 0x6e, 0xe9, 0x91, 0xf5, 0x86, 0xca,
+ 0xfa, 0xb9, 0x66, 0x33, 0xaa, 0x59, 0x5b, 0xce, 0xe2, 0xa7, 0x16, 0x73,
+ 0x47, 0xcb, 0x2b, 0xcc, 0x99, 0xb0, 0x37, 0x48, 0xcf, 0xe3, 0x56, 0x4b,
+ 0xf5, 0xcf, 0x0f, 0x0c, 0x72, 0x32, 0x87, 0xc6, 0xf0, 0x44, 0xbb, 0x53,
+ 0x72, 0x6d, 0x43, 0xf5, 0x26, 0x48, 0x9a, 0x52, 0x67, 0xb7, 0x58, 0xab,
+ 0xfe, 0x67, 0x76, 0x71, 0x78, 0xdb, 0x0d, 0xa2, 0x56, 0x14, 0x13, 0x39,
+ 0x24, 0x31, 0x85, 0xa2, 0xa8, 0x02, 0x5a, 0x30, 0x47, 0xe1, 0xdd, 0x50,
+ 0x07, 0xbc, 0x02, 0x09, 0x90, 0x00, 0xeb, 0x64, 0x63, 0x60, 0x9b, 0x16,
+ 0xbc, 0x88, 0xc9, 0x12, 0xe6, 0xd2, 0x7d, 0x91, 0x8b, 0xf9, 0x3d, 0x32,
+ 0x8d, 0x65, 0xb4, 0xe9, 0x7c, 0xb1, 0x57, 0x76, 0xea, 0xc5, 0xb6, 0x28,
+ 0x39, 0xbf, 0x15, 0x65, 0x1c, 0xc8, 0xf6, 0x77, 0x96, 0x6a, 0x0a, 0x8d,
+ 0x77, 0x0b, 0xd8, 0x91, 0x0b, 0x04, 0x8e, 0x07, 0xdb, 0x29, 0xb6, 0x0a,
+ 0xee, 0x9d, 0x82, 0x35, 0x35, 0x10
+};
diff --git a/lib/TinyGSM/examples/more/SIM800_SslSetCert/DSTRootCAX3.h b/lib/TinyGSM/examples/more/SIM800_SslSetCert/DSTRootCAX3.h
new file mode 100644
index 000000000..55e79d96c
--- /dev/null
+++ b/lib/TinyGSM/examples/more/SIM800_SslSetCert/DSTRootCAX3.h
@@ -0,0 +1,22 @@
+const char cert[] PROGMEM =
+"-----BEGIN CERTIFICATE-----\n"
+"MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/\n"
+"MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\n"
+"DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow\n"
+"PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD\n"
+"Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\n"
+"AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O\n"
+"rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq\n"
+"OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b\n"
+"xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw\n"
+"7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD\n"
+"aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV\n"
+"HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG\n"
+"SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69\n"
+"ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr\n"
+"AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz\n"
+"R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5\n"
+"JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo\n"
+"Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ\n"
+"-----END CERTIFICATE-----\n";
+
diff --git a/lib/TinyGSM/examples/more/SIM800_SslSetCert/SIM800_SslSetCert.ino b/lib/TinyGSM/examples/more/SIM800_SslSetCert/SIM800_SslSetCert.ino
new file mode 100644
index 000000000..eef420761
--- /dev/null
+++ b/lib/TinyGSM/examples/more/SIM800_SslSetCert/SIM800_SslSetCert.ino
@@ -0,0 +1,96 @@
+/**************************************************************
+ *
+ * This sketch uploads SSL certificates to the SIM8xx
+ *
+ * TinyGSM Getting Started guide:
+ * https://tiny.cc/tinygsm-readme
+ *
+ **************************************************************/
+
+// This example is specific to SIM8xx
+#define TINY_GSM_MODEM_SIM800
+
+// Select your certificate:
+#include "DSTRootCAX3.h"
+//#include "DSTRootCAX3.der.h"
+//#include "COMODORSACertificationAuthority.h"
+
+// Select the file you want to write into
+// (the file is stored on the modem)
+#define CERT_FILE "C:\\USER\\CERT.CRT"
+
+#include
+
+// Set serial for debug console (to the Serial Monitor, speed 115200)
+#define SerialMon Serial
+
+// Use Hardware Serial for AT commands
+#define SerialAT Serial1
+
+// Uncomment this if you want to see all AT commands
+// #define DUMP_AT_COMMANDS
+
+
+#ifdef DUMP_AT_COMMANDS
+ #include
+ StreamDebugger debugger(SerialAT, SerialMon);
+ TinyGsm modem(debugger);
+#else
+ TinyGsm modem(SerialAT);
+#endif
+
+void setup() {
+ // Set console baud rate
+ SerialMon.begin(115200);
+ delay(10);
+
+ // Set GSM module baud rate
+ SerialAT.begin(115200);
+ delay(6000);
+
+ SerialMon.println(F("Initializing modem..."));
+ modem.init();
+
+ modem.sendAT(GF("+FSCREATE=" CERT_FILE));
+ if (modem.waitResponse() != 1) return;
+
+ const int cert_size = sizeof(cert);
+
+ modem.sendAT(GF("+FSWRITE=" CERT_FILE ",0,"), cert_size, GF(",10"));
+ if (modem.waitResponse(GF(">")) != 1) {
+ return;
+ }
+
+ for (int i = 0; i < cert_size; i++) {
+ char c = pgm_read_byte(&cert[i]);
+ modem.stream.write(c);
+ }
+
+ modem.stream.write(GSM_NL);
+ modem.stream.flush();
+
+ if (modem.waitResponse(2000) != 1) return;
+
+ modem.sendAT(GF("+SSLSETCERT=\"" CERT_FILE "\""));
+ if (modem.waitResponse() != 1) return;
+ if (modem.waitResponse(5000L, GF(GSM_NL "+SSLSETCERT:")) != 1) return;
+ const int retCode = modem.stream.readStringUntil('\n').toInt();
+
+
+ SerialMon.println();
+ SerialMon.println();
+ SerialMon.println(F("****************************"));
+ SerialMon.print(F("Setting Certificate: "));
+ SerialMon.println((0 == retCode) ? "OK" : "FAILED");
+ SerialMon.println(F("****************************"));
+}
+
+void loop() {
+ if (SerialAT.available()) {
+ SerialMon.write(SerialAT.read());
+ }
+ if (SerialMon.available()) {
+ SerialAT.write(SerialMon.read());
+ }
+ delay(0);
+}
diff --git a/lib/TinyGSM/keywords.txt b/lib/TinyGSM/keywords.txt
new file mode 100644
index 000000000..b6b4b105f
--- /dev/null
+++ b/lib/TinyGSM/keywords.txt
@@ -0,0 +1,29 @@
+#######################################
+# Data types (KEYWORD1)
+#######################################
+TinyGsm KEYWORD1
+TinyGsmClient KEYWORD1
+TinyGsmClientSecure KEYWORD1
+
+SerialAT KEYWORD1
+SerialMon KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+begin KEYWORD2
+restart KEYWORD2
+waitForNetwork KEYWORD2
+getSimStatus KEYWORD2
+gprsConnect KEYWORD2
+gprsDisconnect KEYWORD2
+isGprsConnected KEYWORD2
+isNetworkConnected KEYWORD2
+factoryReset KEYWORD2
+
+#######################################
+# Literals (LITERAL1)
+#######################################
+DATE_FULL LITERAL1
+DATE_TIME LITERAL1
+DATE_DATE LITERAL1
diff --git a/lib/TinyGSM/library.json b/lib/TinyGSM/library.json
new file mode 100644
index 000000000..a4d18275d
--- /dev/null
+++ b/lib/TinyGSM/library.json
@@ -0,0 +1,32 @@
+{
+ "name": "TinyGSM",
+ "version": "0.11.7",
+ "description": "A small Arduino library for GPRS modules, that just works. Includes examples for Blynk, MQTT, File Download, and Web Client. Supports many GSM, LTE, and WiFi modules with AT command interfaces.",
+ "keywords": "GSM, AT commands, AT, SIM800, SIM900, A6, A7, M590, ESP8266, SIM7000, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900A, SIM900D, SIM908, SIM968, M95, MC60, MC60E, BG96, ublox, Quectel, SIMCOM, AI Thinker, LTE, LTE-M",
+ "authors": [
+ {
+ "name": "Volodymyr Shymanskyy",
+ "url": "https://github.com/vshymanskyy",
+ "maintainer": true
+ }
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/vshymanskyy/TinyGSM.git"
+ },
+ "homepage": "https://github.com/vshymanskyy/TinyGSM",
+ "export": {
+ "include": [
+ "LICENSE",
+ "library.json",
+ "library.properties",
+ "README.md",
+ "keywords.txt",
+ "src/*",
+ "examples/*"
+ ]
+ },
+ "frameworks": ["arduino", "energia", "wiringpi"],
+ "platforms": "*",
+ "headers": "TinyGsmClient.h"
+}
diff --git a/airrohr-firmware/lib/readme.txt b/lib/readme.txt
similarity index 100%
rename from airrohr-firmware/lib/readme.txt
rename to lib/readme.txt
diff --git a/airrohr-firmware/oledfont.h b/oledfont.h
similarity index 100%
rename from airrohr-firmware/oledfont.h
rename to oledfont.h
diff --git a/perl-scripts/honey_pms.pl b/perl-scripts/honey_pms.pl
deleted file mode 100755
index 51d947f11..000000000
--- a/perl-scripts/honey_pms.pl
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /usr/bin/perl
-
-# decoding data from Honeywell PM sensor
-
-use strict;
-
-my $data_file = shift or die "Usage: $0 \n";
-
-open (FILE, $data_file) or die ("Could not open file!");
-
-my $len=0;
-my $framelength = 0;
-my $PM1cf = 0;
-my $PM10cf = 0;
-my $PM25cf = 0;
-my $PM1 = 0;
-my $PM10 = 0;
-my $PM25 = 0;
-my $PM03cnt = 0;
-my $PM05cnt = 0;
-my $PM1cnt = 0;
-my $PM10cnt = 0;
-my $PM25cnt = 0;
-my $checksum_is = 0;
-my $checksum_should = 0;
-my $buffer = 0;
-
-while (1) {
- $len = 0;
- $PM1 = 0;
- $PM10 = 0;
- $PM25 = 0;
- $checksum_is = 0;
- $checksum_should = 0;
- while($len!=32){
- read (FILE, $buffer, 1);
- printf ("%d Hex Format: %02lX - Dec Format: %d\n",$len,ord($buffer),ord($buffer));
- if ($len==0) { if (ord($buffer) != 66) { $len = -1 }; };
- if ($len==1) { if (ord($buffer) != 77) { $len = -1 }; };
- if ($len==2) { $checksum_is =ord($buffer);$framelength = 256*ord($buffer); };
- if ($len==3) { $checksum_is+=ord($buffer);$framelength += ord($buffer); };
- if ($len==4) { $checksum_is+=ord($buffer); };
- if ($len==5) { $checksum_is+=ord($buffer); };
- if ($len==6) { $checksum_is+=ord($buffer);$PM25 = 256*ord($buffer); };
- if ($len==7) { $checksum_is+=ord($buffer);$PM25 += ord($buffer); };
- if ($len==8) { $checksum_is+=ord($buffer);$PM10 = 256*ord($buffer); };
- if ($len==9) { $checksum_is+=ord($buffer);$PM10 += ord($buffer); };
- if ($len==10) { $checksum_is+=ord($buffer); }
- if ($len==11) { $checksum_is+=ord($buffer); }
- if ($len==12) { $checksum_is+=ord($buffer); }
- if ($len==13) { $checksum_is+=ord($buffer); }
- if ($len==14) { $checksum_is+=ord($buffer); }
- if ($len==15) { $checksum_is+=ord($buffer); }
- if ($len==16) { $checksum_is+=ord($buffer); }
- if ($len==17) { $checksum_is+=ord($buffer); }
- if ($len==18) { $checksum_is+=ord($buffer); }
- if ($len==19) { $checksum_is+=ord($buffer); }
- if ($len==20) { $checksum_is+=ord($buffer); }
- if ($len==21) { $checksum_is+=ord($buffer); }
- if ($len==22) { $checksum_is+=ord($buffer); }
- if ($len==23) { $checksum_is+=ord($buffer); }
- if ($len==24) { $checksum_is+=ord($buffer); }
- if ($len==25) { $checksum_is+=ord($buffer); }
- if ($len==26) { $checksum_is+=ord($buffer); }
- if ($len==27) { $checksum_is+=ord($buffer); }
- if ($len==28) { $checksum_is+=ord($buffer); }
- if ($len==29) { $checksum_is+=ord($buffer); }
- if ($len==30) { $checksum_should = 256*ord($buffer); }
- if ($len==31) { $checksum_should += ord($buffer); }
- $len++;
- }
-
- $checksum_is += 143;
-
- print "PM1: $PM1\n";
- print "PM2.5: $PM25\n";
- print "PM10: $PM10\n";
- print "Checksum is: $checksum_is - Checksum_should: $checksum_should\n";
-
-}
-
-print "\n=====End of Script=====";
-
-close(FILE);
diff --git a/perl-scripts/test_pms1003.pl b/perl-scripts/test_pms1003.pl
deleted file mode 100755
index 5953a0dfb..000000000
--- a/perl-scripts/test_pms1003.pl
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /usr/bin/perl
-
-# decoding data from Plantronics PMS 1003, PMS 7003
-
-use strict;
-
-my $data_file = shift or die "Usage: $0 \n";
-
-open (FILE, $data_file) or die ("Could not open file!");
-
-my $len=0;
-my $framelength = 0;
-my $PM1cf = 0;
-my $PM10cf = 0;
-my $PM25cf = 0;
-my $PM1 = 0;
-my $PM10 = 0;
-my $PM25 = 0;
-my $PM03cnt = 0;
-my $PM05cnt = 0;
-my $PM1cnt = 0;
-my $PM10cnt = 0;
-my $PM25cnt = 0;
-my $checksum_is = 0;
-my $checksum_should = 0;
-my $buffer = 0;
-
-while (1) {
- $len = 0;
- $PM1 = 0;
- $PM10 = 0;
- $PM25 = 0;
- $checksum_is = 0;
- $checksum_should = 0;
- while($len!=32){
- read (FILE, $buffer, 1);
- printf ("%d Hex Format: %02lX - Dec Format: %d\n",$len,ord($buffer),ord($buffer));
- if ($len==0) { if (ord($buffer) != 66) { $len = -1 }; };
- if ($len==1) { if (ord($buffer) != 77) { $len = -1 }; };
- if ($len==2) { $checksum_is =ord($buffer);$framelength = 256*ord($buffer); };
- if ($len==3) { $checksum_is+=ord($buffer);$framelength += ord($buffer); };
- if ($len==4) { $checksum_is+=ord($buffer);$PM1cf = 256*ord($buffer); };
- if ($len==5) { $checksum_is+=ord($buffer);$PM1cf += ord($buffer); };
- if ($len==6) { $checksum_is+=ord($buffer);$PM25cf = 256*ord($buffer); };
- if ($len==7) { $checksum_is+=ord($buffer);$PM25cf += ord($buffer); };
- if ($len==8) { $checksum_is+=ord($buffer);$PM10cf = 256*ord($buffer); };
- if ($len==9) { $checksum_is+=ord($buffer);$PM10cf += ord($buffer); };
- if ($len==10) { $checksum_is+=ord($buffer);$PM1 = 256*ord($buffer); };
- if ($len==11) { $checksum_is+=ord($buffer);$PM1 += ord($buffer); };
- if ($len==12) { $checksum_is+=ord($buffer);$PM25 = 256*ord($buffer); };
- if ($len==13) { $checksum_is+=ord($buffer);$PM25 += ord($buffer); };
- if ($len==14) { $checksum_is+=ord($buffer);$PM10 = 256*ord($buffer); };
- if ($len==15) { $checksum_is+=ord($buffer);$PM10 += ord($buffer); };
- if ($len==16) { $checksum_is+=ord($buffer);$PM03cnt = 256*ord($buffer); };
- if ($len==17) { $checksum_is+=ord($buffer);$PM03cnt += ord($buffer); };
- if ($len==18) { $checksum_is+=ord($buffer);$PM05cnt = 256*ord($buffer); };
- if ($len==19) { $checksum_is+=ord($buffer);$PM05cnt += ord($buffer); };
- if ($len==20) { $checksum_is+=ord($buffer); }
- if ($len==21) { $checksum_is+=ord($buffer); }
- if ($len==22) { $checksum_is+=ord($buffer); }
- if ($len==23) { $checksum_is+=ord($buffer); }
- if ($len==24) { $checksum_is+=ord($buffer); }
- if ($len==25) { $checksum_is+=ord($buffer); }
- if ($len==26) { $checksum_is+=ord($buffer); }
- if ($len==27) { $checksum_is+=ord($buffer); }
- if ($len==28) { $checksum_is+=ord($buffer); }
- if ($len==29) { $checksum_is+=ord($buffer); }
- if ($len==30) { $checksum_should = 256*ord($buffer); }
- if ($len==31) { $checksum_should += ord($buffer); }
- $len++;
- }
-
- $checksum_is += 143;
-
- print "PM1: $PM1\n";
- print "PM2.5: $PM25\n";
- print "PM10: $PM10\n";
- print "Checksum is: $checksum_is - Checksum_should: $checksum_should\n";
-
-}
-
-print "\n=====End of Script=====";
-
-close(FILE);
diff --git a/perl-scripts/test_pms3003.pl b/perl-scripts/test_pms3003.pl
deleted file mode 100755
index 18bf0603e..000000000
--- a/perl-scripts/test_pms3003.pl
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /usr/bin/perl
-use strict;
-
-my $data_file = shift or die "Usage: $0 \n";
-
-open (FILE, $data_file) or die ("Could not open file!");
-
-my $len=0;
-my $framelength = 0;
-my $PM1cf = 0;
-my $PM10cf = 0;
-my $PM25cf = 0;
-my $PM1 = 0;
-my $PM10 = 0;
-my $PM25 = 0;
-my $PM03cnt = 0;
-my $PM05cnt = 0;
-my $PM1cnt = 0;
-my $PM10cnt = 0;
-my $PM25cnt = 0;
-my $checksum_is = 0;
-my $checksum_should = 0;
-my $buffer = 0;
-
-while (1) {
- $len = 0;
- $PM1 = 0;
- $PM10 = 0;
- $PM25 = 0;
- $checksum_is = 0;
- $checksum_should = 0;
- while($len!=24){
- read (FILE, $buffer, 1);
- printf ("%d Hex Format: %02lX - Dec Format: %d\n",$len,ord($buffer),ord($buffer));
- if ($len==0) { if (ord($buffer) != 66) { $len = -1 }; };
- if ($len==1) { if (ord($buffer) != 77) { $len = -1 }; };
- if ($len==2) { $checksum_is =ord($buffer);$framelength = 256*ord($buffer); };
- if ($len==3) { $checksum_is+=ord($buffer);$framelength += ord($buffer); };
- if ($len==4) { $checksum_is+=ord($buffer);$PM1cf = 256*ord($buffer); };
- if ($len==5) { $checksum_is+=ord($buffer);$PM1cf += ord($buffer); };
- if ($len==6) { $checksum_is+=ord($buffer);$PM25cf = 256*ord($buffer); };
- if ($len==7) { $checksum_is+=ord($buffer);$PM25cf += ord($buffer); };
- if ($len==8) { $checksum_is+=ord($buffer);$PM10cf = 256*ord($buffer); };
- if ($len==9) { $checksum_is+=ord($buffer);$PM10cf += ord($buffer); };
- if ($len==10) { $checksum_is+=ord($buffer);$PM1 = 256*ord($buffer); };
- if ($len==11) { $checksum_is+=ord($buffer);$PM1 += ord($buffer); };
- if ($len==12) { $checksum_is+=ord($buffer);$PM25 = 256*ord($buffer); };
- if ($len==13) { $checksum_is+=ord($buffer);$PM25 += ord($buffer); };
- if ($len==14) { $checksum_is+=ord($buffer);$PM10 = 256*ord($buffer); };
- if ($len==15) { $checksum_is+=ord($buffer);$PM10 += ord($buffer); };
- if ($len==16) { $checksum_is+=ord($buffer);$PM03cnt = 256*ord($buffer); };
- if ($len==17) { $checksum_is+=ord($buffer);$PM03cnt += ord($buffer); };
- if ($len==18) { $checksum_is+=ord($buffer);$PM05cnt = 256*ord($buffer); };
- if ($len==19) { $checksum_is+=ord($buffer);$PM05cnt += ord($buffer); };
- if ($len==20) { $checksum_is+=ord($buffer); }
- if ($len==21) { $checksum_is+=ord($buffer); }
- if ($len==22) { $checksum_should = 256*ord($buffer); }
- if ($len==23) { $checksum_should += ord($buffer); }
- $len++;
- }
-
- $checksum_is += 143;
-
- print "PM1: $PM1\n";
- print "PM2.5: $PM25\n";
- print "PM10: $PM10\n";
- print "Checksum is: $checksum_is - Checksum_should: $checksum_should\n";
-
-}
-
-print "\n=====End of Script=====";
-
-close(FILE);
diff --git a/perl-scripts/test_sds011.pl b/perl-scripts/test_sds011.pl
deleted file mode 100755
index 6d255eb7b..000000000
--- a/perl-scripts/test_sds011.pl
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /usr/bin/perl
-use strict;
-
-#$data_file="/dev/cu.wchusbserial1410";
-
-my $data_file = shift or die "Usage: $0 \n";
-
-open (FILE, $data_file) or die ("Could not open file!");
-
-my $len=0;
-my $PM10 = 0;
-my $PM25 = 0;
-my $checksum_is = 0;
-my $checksum_should = 0;
-my $buffer = 0;
-
-while (1) {
- $len = 0;
- $PM10 = 0;
- $PM25 = 0;
- $checksum_is = 0;
- $checksum_should = 0;
- while($len!=10){
- read (FILE, $buffer, 1);
- printf ("%d Hex Format: %02lX - Dec Format: %d\n",$len,ord($buffer),ord($buffer));
- if ($len==0) { if (ord($buffer) != 170) { $len = -1; }; };
- if ($len==1) { if (ord($buffer) != 192) { $len = -1; }; };
- if ($len==2) { $checksum_is+=ord($buffer);$PM25 += ord($buffer); };
- if ($len==3) { $checksum_is+=ord($buffer);$PM25 += 256*ord($buffer); $PM25=$PM25; };
- if ($len==4) { $checksum_is+=ord($buffer);$PM10 += ord($buffer); };
- if ($len==5) { $checksum_is+=ord($buffer);$PM10 += 256*ord($buffer); $PM10=$PM10; };
- if ($len==6) { $checksum_is+=ord($buffer); }
- if ($len==7) { $checksum_is+=ord($buffer); }
- if ($len==8) { $checksum_should+=ord($buffer); }
- $len++;
- }
-
- print "PM2.5: ".($PM25/10)."\n";
- print "PM10: ".($PM10/10)."\n";
- print "Checksum is: $checksum_is - Checksum_should: $checksum_should\n";
-
-}
-
-print "\n=====End of Script=====";
-
-close(FILE);
diff --git a/airrohr-firmware/platformio.ini b/platformio.ini
similarity index 100%
rename from airrohr-firmware/platformio.ini
rename to platformio.ini
diff --git a/airrohr-firmware/platformio_script.py b/platformio_script.py
similarity index 100%
rename from airrohr-firmware/platformio_script.py
rename to platformio_script.py
diff --git a/airrohr-firmware/ppd42ns-wificonfig-ppd-sds-dht.spiffs.bin b/ppd42ns-wificonfig-ppd-sds-dht.spiffs.bin
similarity index 100%
rename from airrohr-firmware/ppd42ns-wificonfig-ppd-sds-dht.spiffs.bin
rename to ppd42ns-wificonfig-ppd-sds-dht.spiffs.bin
diff --git a/r-scripts/.Renviron b/r-scripts/.Renviron
deleted file mode 100644
index ad9a609e6..000000000
--- a/r-scripts/.Renviron
+++ /dev/null
@@ -1,3 +0,0 @@
-#oldpkg <- getOption("defaultPackages");
-#options(defaultPackages = c(oldpkg, "ggplot2","dplyr","timeSeries","forecast","plotly"))
-R_DEFAULT_PACKAGES='ggplot2,dplyr,timeSeries,forecast,plotly'
diff --git a/r-scripts/Makefile b/r-scripts/Makefile
deleted file mode 100644
index c4ddf4062..000000000
--- a/r-scripts/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-R_OPTS=--no-save --no-restore --no-init-file --no-site-file # vanilla, but with --environ
-
-# TODO: define all targets from source files, if possible
-
-all: readdata.RData luft.RData readdata_s_mitte.R
-
-run-scripts:
- # run these scripts
-
-%.pdf: %.Rmd
- R ${R_OPTS} -e "library(knitr); knit2pdf('$<')"
-
-%.pdf: %.rmd
- R ${R_OPTS} -e "library(knitr); knit2pdf('$<')"
-
-%.html: %.rmd
- R ${R_OPTS} -e "rmarkdown::render('$<')"
-
-%.html: %.Rmd
- R ${R_OPTS} -e "rmarkdown::render('$<')"
-
-# Note that you could also use
-# R ${R_OPTS} -e "markdown::markdownToHTML('markdown_example.md', 'markdown_example.html')"
-
-%.R: %.Rmd
- R ${R_OPTS} -e "library(knitr);knit('$<',tangle=TRUE)"
-
-# run R script and save workspace, e.g.
-# make gendataexample.RData
-%.RData: %.R
- R ${R_OPTS} -e 'source("$<"); save(list=ls(),file="$@")'
-
-# TODO
-# clean:
-# rm
-
diff --git a/r-scripts/README.md b/r-scripts/README.md
deleted file mode 100644
index 1494ccbb3..000000000
--- a/r-scripts/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-
-currently working on plots from csv data, which can be fetched with this wget script: [../apiclients/getarchive.sh](../apiclients/getarchive.sh).
-
diff --git a/r-scripts/TODO.md b/r-scripts/TODO.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/r-scripts/archive.luftdaten.info/00disclamer.md b/r-scripts/archive.luftdaten.info/00disclamer.md
deleted file mode 100644
index fb1295adc..000000000
--- a/r-scripts/archive.luftdaten.info/00disclamer.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Archive of luftdaten.info / api.dusti.xyz
-
-## about
-
-This archive consists of CSV dumps of all outdoor PPD42NS sensor that seem to have valid data.
-
-## Problems
-
-Please report problems in our opendata-stuttgart issuetracker: https://github.com/opendata-stuttgart/meta/issues
-
-## Future improvements
-
-- description of position of sensor on location
-- image of sensor at location
diff --git a/r-scripts/data/sampledata.csv b/r-scripts/data/sampledata.csv
deleted file mode 100644
index e45d00027..000000000
--- a/r-scripts/data/sampledata.csv
+++ /dev/null
@@ -1,300 +0,0 @@
-timestamp,type,indoor,location_id,sampling_rate,P1,P2,durP1,durP2,ratioP1,ratioP2,temperature,humidity,pressure,altitude,pressure_sealevel,brightness,dust_density,vo_raw,voltage,P10,P25,durP10,durP25,ratioP10,ratioP25
-2015-05-05 08:15:59.847276+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,16655.81,3513.72,2906824,972924,19.38,6.49
-2015-05-05 08:15:44.635833+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,28522.88,4473.86,3794072,1198488,25.29,7.99
-2015-05-05 08:15:29.426569+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15669.34,3569.94,2812860,986724,18.75,6.58
-2015-05-05 08:15:14.215062+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12730.82,3104.04,2503032,870160,16.69,5.80
-2015-05-05 08:14:59.003782+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14017.50,3551.84,2644788,982288,17.63,6.55
-2015-05-05 08:14:43.795172+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14654.00,3499.72,2711264,969476,18.08,6.46
-2015-05-05 08:14:28.587472+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,11382.61,3232.02,2342328,902680,15.62,6.02
-2015-05-05 08:14:13.374861+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,11994.71,3027.35,2416972,850496,16.11,5.67
-2015-05-05 08:13:58.163716+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13236.80,3318.26,2560024,924380,17.07,6.16
-2015-05-05 08:13:42.955626+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13134.64,3496.96,2548652,968796,16.99,6.46
-2015-05-05 08:13:27.747796+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12080.13,3061.42,2427160,859248,16.18,5.73
-2015-05-05 08:13:12.536725+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13187.93,3960.95,2554592,1080648,17.03,7.20
-2015-05-05 08:12:57.323005+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12409.39,3058.44,2465928,858484,16.44,5.72
-2015-05-05 08:12:42.111640+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14310.75,3640.22,2675696,1003868,17.84,6.69
-2015-05-05 08:12:26.906133+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12022.30,2602.99,2420268,739320,16.14,4.93
-2015-05-05 08:12:11.691216+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,11961.63,3174.79,2413012,888184,16.09,5.92
-2015-05-05 08:11:56.480045+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,11904.76,3318.15,2406184,924352,16.04,6.16
-2015-05-05 08:11:41.272567+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14927.72,3440.10,2739172,954744,18.26,6.36
-2015-05-05 08:11:26.061052+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14494.91,3539.82,2694860,979340,17.97,6.53
-2015-05-05 08:11:10.852364+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14609.72,3515.38,2706712,973332,18.04,6.49
-2015-05-05 08:10:55.641010+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13690.81,3717.87,2609768,1022676,17.40,6.82
-2015-05-05 08:10:40.432068+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12981.51,2931.16,2531480,825644,16.88,5.50
-2015-05-05 08:10:25.220743+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14127.96,3689.97,2656488,1015936,17.71,6.77
-2015-05-05 08:10:10.008948+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,18351.57,3648.68,3058768,1005924,20.39,6.71
-2015-05-05 08:09:54.800091+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14787.64,3492.74,2724940,967756,18.17,6.45
-2015-05-05 08:09:39.588713+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,18775.34,3154.54,3095036,883036,20.63,5.89
-2015-05-05 08:09:24.376809+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14704.39,3061.89,2716432,859368,18.11,5.73
-2015-05-05 08:09:09.168473+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,16089.01,3549.93,2853376,981820,19.02,6.55
-2015-05-05 08:08:53.956821+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12374.49,3008.88,2461856,845740,16.41,5.64
-2015-05-05 08:08:38.749043+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13621.06,3702.63,2602208,1018996,17.35,6.79
-2015-05-05 08:08:23.537203+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,18304.13,3576.32,3054668,988284,20.36,6.59
-2015-05-05 08:08:08.325756+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15531.32,3346.84,2799352,931532,18.66,6.21
-2015-05-05 08:07:53.116754+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15054.28,3810.12,2751944,1044840,18.35,6.97
-2015-05-05 08:07:37.905465+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15110.48,3527.66,2757588,976352,18.38,6.51
-2015-05-05 08:07:22.696484+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15372.52,3713.97,2783696,1021736,18.56,6.81
-2015-05-05 08:07:07.484829+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,16432.97,3744.92,2885980,1029196,19.24,6.86
-2015-05-05 08:06:52.273033+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13254.14,3027.24,2561948,850468,17.08,5.67
-2015-05-05 08:06:37.065732+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15125.64,3841.90,2759108,1052428,18.39,7.02
-2015-05-05 08:06:21.853667+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14873.51,3548.74,2733676,981528,18.22,6.54
-2015-05-05 08:06:06.641623+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14070.73,3623.70,2650436,999848,17.67,6.67
-2015-05-05 08:05:51.432748+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15095.25,3559.95,2756060,984276,18.37,6.56
-2015-05-05 08:05:36.221536+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15685.02,4060.55,2814388,1104004,18.76,7.36
-2015-05-05 08:05:21.009751+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14922.47,3699.48,2738640,1018236,18.26,6.79
-2015-05-05 08:05:05.801315+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15526.55,3226.29,2798884,901232,18.66,6.01
-2015-05-05 08:04:50.589918+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13359.51,3510.53,2573596,972140,17.16,6.48
-2015-05-05 08:04:35.381014+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14610.66,3478.12,2706808,964148,18.05,6.43
-2015-05-05 08:04:20.170226+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13949.51,3526.63,2637552,976100,17.58,6.51
-2015-05-05 08:04:04.961268+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15230.74,3748.08,2769612,1029956,18.46,6.87
-2015-05-05 08:03:49.750359+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13943.58,3410.71,2636920,947452,17.58,6.32
-2015-05-05 08:03:34.539083+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12246.37,3315.33,2446832,923644,16.31,6.16
-2015-05-05 08:03:19.327196+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14976.42,3213.73,2744096,898056,18.29,5.99
-2015-05-05 08:03:04.119030+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13604.49,3406.35,2600408,946368,17.34,6.31
-2015-05-05 08:02:48.910494+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14185.81,3336.36,2662588,928912,17.75,6.19
-2015-05-05 08:02:33.698878+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15685.60,3519.73,2814444,974404,18.76,6.50
-2015-05-05 08:02:18.490477+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,17986.16,3695.50,3026972,1017272,20.18,6.78
-2015-05-05 08:02:03.278640+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,16636.57,3602.63,2905032,994712,19.37,6.63
-2015-05-05 08:01:48.066729+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,19128.39,3189.17,3124772,891832,20.83,5.95
-2015-05-05 08:01:32.859209+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12524.79,3162.16,2479332,884976,16.53,5.90
-2015-05-05 08:01:17.648030+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,16854.28,3285.51,2925208,916160,19.50,6.11
-2015-05-05 08:01:02.439924+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,19356.69,5143.81,3143776,1343540,20.96,8.96
-2015-05-05 08:00:47.227051+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,17122.36,3986.78,2949776,1086728,19.67,7.24
-2015-05-05 08:00:32.016398+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,16495.93,4539.66,2891892,1213172,19.28,8.09
-2015-05-05 08:00:16.806951+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,16220.05,4216.82,2865860,1140188,19.11,7.60
-2015-05-05 08:00:01.595814+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,16018.60,3192.15,2846636,892588,18.98,5.95
-2015-05-05 07:59:46.384304+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,11194.17,2969.04,2318744,835456,15.46,5.57
-2015-05-05 07:59:31.175586+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13549.38,3581.16,2594408,989468,17.30,6.60
-2015-05-05 07:59:15.963926+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12427.38,3221.18,2468024,899940,16.45,6.00
-2015-05-05 07:59:00.755554+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13377.93,3055.74,2575624,857792,17.17,5.72
-2015-05-05 07:58:45.544093+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12639.05,3061.75,2492512,859332,16.62,5.73
-2015-05-05 07:58:30.335997+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14323.72,3153.91,2677052,882876,17.85,5.89
-2015-05-05 07:58:15.124818+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12574.56,3420.39,2485084,949856,16.57,6.33
-2015-05-05 07:57:59.916087+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13655.39,3480.45,2605932,964724,17.37,6.43
-2015-05-05 07:57:44.704924+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,10690.80,2820.04,2254264,796676,15.03,5.31
-2015-05-05 07:57:29.496228+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14805.90,3355.83,2726800,933780,18.18,6.23
-2015-05-05 07:57:14.284746+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14724.64,3159.52,2718504,884304,18.12,5.90
-2015-05-05 07:56:59.075649+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,11651.57,3744.80,2375488,1029168,15.84,6.86
-2015-05-05 07:56:43.864866+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14400.01,3241.13,2685008,904980,17.90,6.03
-2015-05-05 07:56:28.652978+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14084.52,3379.00,2651896,939560,17.68,6.26
-2015-05-05 07:56:13.444290+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13403.85,3290.78,2578476,917484,17.19,6.12
-2015-05-05 07:55:58.232980+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12560.22,2957.03,2483428,832348,16.56,5.55
-2015-05-05 07:55:43.024697+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12842.28,3762.37,2515732,1033392,16.77,6.89
-2015-05-05 07:55:27.812758+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12857.29,3052.16,2517436,856872,16.78,5.71
-2015-05-05 07:55:12.601291+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14628.15,3181.49,2708608,889884,18.06,5.93
-2015-05-05 07:54:57.392805+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14022.88,3575.14,2645360,987996,17.64,6.59
-2015-05-05 07:54:42.185576+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12365.04,3235.06,2460752,903448,16.41,6.02
-2015-05-05 07:54:26.972862+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14627.41,2861.19,2708532,807436,18.06,5.38
-2015-05-05 07:54:11.761278+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,10341.65,2757.68,2208208,780300,14.72,5.20
-2015-05-05 07:53:56.552581+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,10366.51,2964.73,2211524,834340,14.74,5.56
-2015-05-05 07:53:41.342085+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,12747.94,3604.30,2504988,995120,16.70,6.63
-2015-05-05 07:53:26.133667+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15351.96,3365.56,2781660,936208,18.54,6.24
-2015-05-05 07:53:10.921923+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13824.09,3430.26,2624132,952304,17.49,6.35
-2015-05-05 07:52:55.710395+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13052.93,3318.87,2539508,924532,16.93,6.16
-2015-05-05 07:52:40.502163+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,14690.84,3466.67,2715044,961320,18.10,6.41
-2015-05-05 07:52:25.289371+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,13686.16,3304.69,2609264,920976,17.40,6.14
-2015-05-05 07:52:10.081880+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,11051.58,3198.49,2300700,894196,15.34,5.96
-2015-05-05 07:51:54.870408+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,17526.92,3821.90,2986296,1047656,19.91,6.98
-2015-05-05 07:51:39.661422+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15608.33,3319.62,2806900,924720,18.71,6.16
-2015-05-05 07:51:24.449844+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15258.72,3900.04,2772400,1066252,18.48,7.11
-2015-05-05 07:51:09.238313+00:00,dsm501a,True,4,15000,,,,,,,,,,,,,,,,15131.79,3671.43,2759724,1011444,18.40,6.74
-2015-05-05 08:16:08.785643+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.06,197.00,0.96,,,,,,
-2015-05-05 08:16:07.787974+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,163.00,0.80,,,,,,
-2015-05-05 08:16:06.891019+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,148.00,0.72,,,,,,
-2015-05-05 08:16:05.747148+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,160.00,0.78,,,,,,
-2015-05-05 08:16:04.732423+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,146.00,0.71,,,,,,
-2015-05-05 08:16:03.749072+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,169.00,0.83,,,,,,
-2015-05-05 08:16:02.769387+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,156.00,0.76,,,,,,
-2015-05-05 08:16:02.281653+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,172.00,0.84,,,,,,
-2015-05-05 08:16:00.680902+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.01,138.00,0.67,,,,,,
-2015-05-05 08:15:59.683073+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,166.00,0.81,,,,,,
-2015-05-05 08:15:58.654590+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,146.00,0.71,,,,,,
-2015-05-05 08:15:57.641166+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,146.00,0.71,,,,,,
-2015-05-05 08:15:56.628379+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,156.00,0.76,,,,,,
-2015-05-05 08:15:55.615663+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,156.00,0.76,,,,,,
-2015-05-05 08:15:54.601595+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,160.00,0.78,,,,,,
-2015-05-05 08:15:53.588816+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,165.00,0.81,,,,,,
-2015-05-05 08:15:52.576731+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,154.00,0.75,,,,,,
-2015-05-05 08:15:51.562752+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,167.00,0.82,,,,,,
-2015-05-05 08:15:50.551588+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,161.00,0.79,,,,,,
-2015-05-05 08:15:49.536798+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,155.00,0.76,,,,,,
-2015-05-05 08:15:48.525155+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.05,175.00,0.85,,,,,,
-2015-05-05 08:15:47.511771+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,157.00,0.77,,,,,,
-2015-05-05 08:15:46.497825+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,157.00,0.77,,,,,,
-2015-05-05 08:15:45.486474+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,153.00,0.75,,,,,,
-2015-05-05 08:15:44.488568+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,155.00,0.76,,,,,,
-2015-05-05 08:15:43.458616+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,148.00,0.72,,,,,,
-2015-05-05 08:15:42.446907+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,153.00,0.75,,,,,,
-2015-05-05 08:15:41.432080+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.05,180.00,0.88,,,,,,
-2015-05-05 08:15:40.420297+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,166.00,0.81,,,,,,
-2015-05-05 08:15:39.407606+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,147.00,0.72,,,,,,
-2015-05-05 08:15:38.393640+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,163.00,0.80,,,,,,
-2015-05-05 08:15:37.381668+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,157.00,0.77,,,,,,
-2015-05-05 08:15:36.368651+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,142.00,0.69,,,,,,
-2015-05-05 08:15:35.354812+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,144.00,0.70,,,,,,
-2015-05-05 08:15:34.374228+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,140.00,0.68,,,,,,
-2015-05-05 08:15:33.348950+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,160.00,0.78,,,,,,
-2015-05-05 08:15:32.338170+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,146.00,0.71,,,,,,
-2015-05-05 08:15:31.302274+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,162.00,0.79,,,,,,
-2015-05-05 08:15:30.289726+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,165.00,0.81,,,,,,
-2015-05-05 08:15:29.292581+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,169.00,0.83,,,,,,
-2015-05-05 08:15:28.264352+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:15:27.250873+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,152.00,0.74,,,,,,
-2015-05-05 08:15:26.236420+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,157.00,0.77,,,,,,
-2015-05-05 08:15:25.224620+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,173.00,0.84,,,,,,
-2015-05-05 08:15:24.210639+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,147.00,0.72,,,,,,
-2015-05-05 08:15:23.197032+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:15:22.184634+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:15:21.170095+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,166.00,0.81,,,,,,
-2015-05-05 08:15:20.158473+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:15:19.145092+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,157.00,0.77,,,,,,
-2015-05-05 08:15:18.130389+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,160.00,0.78,,,,,,
-2015-05-05 08:15:17.118895+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,159.00,0.78,,,,,,
-2015-05-05 08:15:16.105094+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.01,135.00,0.66,,,,,,
-2015-05-05 08:15:15.092544+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,156.00,0.76,,,,,,
-2015-05-05 08:15:14.096413+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:15:13.065606+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,161.00,0.79,,,,,,
-2015-05-05 08:15:12.053550+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:15:11.041549+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,173.00,0.84,,,,,,
-2015-05-05 08:15:10.028215+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,149.00,0.73,,,,,,
-2015-05-05 08:15:09.013499+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,160.00,0.78,,,,,,
-2015-05-05 08:15:08.001414+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,159.00,0.78,,,,,,
-2015-05-05 08:15:06.986781+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,148.00,0.72,,,,,,
-2015-05-05 08:15:05.975465+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,153.00,0.75,,,,,,
-2015-05-05 08:15:04.961467+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,150.00,0.73,,,,,,
-2015-05-05 08:15:03.949245+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,157.00,0.77,,,,,,
-2015-05-05 08:15:02.935633+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,155.00,0.76,,,,,,
-2015-05-05 08:15:01.922654+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:15:00.909451+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,167.00,0.82,,,,,,
-2015-05-05 08:14:59.896781+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,171.00,0.83,,,,,,
-2015-05-05 08:14:58.897169+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,167.00,0.82,,,,,,
-2015-05-05 08:14:57.870485+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,155.00,0.76,,,,,,
-2015-05-05 08:14:56.858041+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,162.00,0.79,,,,,,
-2015-05-05 08:14:55.844151+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,169.00,0.83,,,,,,
-2015-05-05 08:14:54.830009+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,170.00,0.83,,,,,,
-2015-05-05 08:14:53.818305+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,164.00,0.80,,,,,,
-2015-05-05 08:14:52.804291+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,159.00,0.78,,,,,,
-2015-05-05 08:14:51.790312+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,170.00,0.83,,,,,,
-2015-05-05 08:14:50.778523+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,162.00,0.79,,,,,,
-2015-05-05 08:14:49.765706+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,165.00,0.81,,,,,,
-2015-05-05 08:14:48.751935+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,162.00,0.79,,,,,,
-2015-05-05 08:14:47.739428+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,165.00,0.81,,,,,,
-2015-05-05 08:14:46.725544+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,165.00,0.81,,,,,,
-2015-05-05 08:14:45.713473+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,162.00,0.79,,,,,,
-2015-05-05 08:14:44.700650+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,145.00,0.71,,,,,,
-2015-05-05 08:14:43.705650+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.01,134.00,0.65,,,,,,
-2015-05-05 08:14:42.672647+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,153.00,0.75,,,,,,
-2015-05-05 08:14:41.660431+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,165.00,0.81,,,,,,
-2015-05-05 08:14:40.647329+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,164.00,0.80,,,,,,
-2015-05-05 08:14:39.633216+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:14:38.621741+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,166.00,0.81,,,,,,
-2015-05-05 08:14:37.607283+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:14:36.595630+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,144.00,0.70,,,,,,
-2015-05-05 08:14:35.582094+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,163.00,0.80,,,,,,
-2015-05-05 08:14:34.567227+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,173.00,0.84,,,,,,
-2015-05-05 08:14:33.556477+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,166.00,0.81,,,,,,
-2015-05-05 08:14:32.542560+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,161.00,0.79,,,,,,
-2015-05-05 08:14:31.527978+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.03,158.00,0.77,,,,,,
-2015-05-05 08:14:30.516397+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,145.00,0.71,,,,,,
-2015-05-05 08:14:29.502226+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.04,165.00,0.81,,,,,,
-2015-05-05 08:14:28.505479+00:00,GP2Y1010AU0F,True,4,40,,,,,,,,,,,,,0.02,147.00,0.72,,,,,,
-2015-05-05 08:15:53.652791+00:00,PPD42NS,True,4,15000,18060.31,472.75,3033464,136864,20.22,0.91,,,,,,,,,,,,,,,
-2015-05-05 08:15:37.591676+00:00,PPD42NS,True,4,15000,10973.20,1140.35,2290708,330696,15.27,2.20,,,,,,,,,,,,,,,
-2015-05-05 08:15:21.531012+00:00,PPD42NS,True,4,15000,9031.82,694.32,2024608,201312,13.50,1.34,,,,,,,,,,,,,,,
-2015-05-05 08:15:05.471808+00:00,PPD42NS,True,4,15000,6748.41,709.72,1654212,205792,11.03,1.37,,,,,,,,,,,,,,,
-2015-05-05 08:14:49.408673+00:00,PPD42NS,True,4,15000,9180.91,861.82,2046436,250000,13.64,1.67,,,,,,,,,,,,,,,
-2015-05-05 08:14:33.347157+00:00,PPD42NS,True,4,15000,6627.27,212.59,1632392,61308,10.88,0.41,,,,,,,,,,,,,,,
-2015-05-05 08:14:17.284144+00:00,PPD42NS,True,4,15000,8683.26,481.20,1972564,139320,13.15,0.93,,,,,,,,,,,,,,,
-2015-05-05 08:14:01.223079+00:00,PPD42NS,True,4,15000,16169.20,265.25,2861024,76580,19.07,0.51,,,,,,,,,,,,,,,
-2015-05-05 08:13:45.160235+00:00,PPD42NS,True,4,15000,7369.07,1025.75,1762268,297548,11.75,1.98,,,,,,,,,,,,,,,
-2015-05-05 08:13:29.099202+00:00,PPD42NS,True,4,15000,6334.35,443.15,1578596,128256,10.52,0.86,,,,,,,,,,,,,,,
-2015-05-05 08:13:13.037600+00:00,PPD42NS,True,4,15000,8243.71,648.26,1904808,187916,12.70,1.25,,,,,,,,,,,,,,,
-2015-05-05 08:12:56.977150+00:00,PPD42NS,True,4,15000,7835.02,180.38,1839540,51972,12.26,0.35,,,,,,,,,,,,,,,
-2015-05-05 08:12:40.916799+00:00,PPD42NS,True,4,15000,7172.74,813.48,1728744,235956,11.52,1.57,,,,,,,,,,,,,,,
-2015-05-05 08:12:24.856448+00:00,PPD42NS,True,4,15000,6508.96,74.62,1610844,21368,10.74,0.14,,,,,,,,,,,,,,,
-2015-05-05 08:12:08.795162+00:00,PPD42NS,True,4,15000,6610.50,324.40,1629352,93748,10.86,0.62,,,,,,,,,,,,,,,
-2015-05-05 08:11:52.732573+00:00,PPD42NS,True,4,15000,6744.61,851.18,1653532,246908,11.02,1.65,,,,,,,,,,,,,,,
-2015-05-05 08:11:36.672057+00:00,PPD42NS,True,4,15000,7085.21,332.79,1713604,,11.42,0.64,,,,,,,,,,,,,,,
-2015-05-05 08:11:20.609985+00:00,PPD42NS,True,4,15000,6655.72,633.59,1637540,183648,10.92,1.22,,,,,,,,,,,,,,,
-2015-05-05 08:11:04.548396+00:00,PPD42NS,True,4,15000,7434.96,762.11,1773388,221024,11.82,1.47,,,,,,,,,,,,,,,
-2015-05-05 08:10:48.487666+00:00,PPD42NS,True,4,15000,6322.95,,1576472,93312,10.51,0.62,,,,,,,,,,,,,,,
-2015-05-05 08:10:32.425754+00:00,PPD42NS,True,4,15000,15485.83,0.62,2794880,0,18.63,0.00,,,,,,,,,,,,,,,
-2015-05-05 08:10:16.366296+00:00,PPD42NS,True,4,15000,6240.18,291.73,1560980,84264,10.41,0.56,,,,,,,,,,,,,,,
-2015-05-05 08:10:00.304462+00:00,PPD42NS,True,4,15000,6613.63,0.62,1629920,0,10.87,0.00,,,,,,,,,,,,,,,
-2015-05-05 08:09:44.245072+00:00,PPD42NS,True,4,15000,7288.21,544.46,1748532,157720,11.66,1.05,,,,,,,,,,,,,,,
-2015-05-05 08:09:28.182253+00:00,PPD42NS,True,4,15000,,0.62,1768704,0,11.79,0.00,,,,,,,,,,,,,,,
-2015-05-05 08:09:12.121973+00:00,PPD42NS,True,4,15000,6598.57,359.28,1627188,103880,10.85,0.69,,,,,,,,,,,,,,,
-2015-05-05 08:08:56.060432+00:00,PPD42NS,True,4,15000,14372.74,0.62,2682168,0,17.88,0.00,,,,,,,,,,,,,,,
-2015-05-05 08:08:40.001146+00:00,PPD42NS,True,4,15000,14841.77,644.33,2730452,186772,18.20,1.25,,,,,,,,,,,,,,,
-2015-05-05 08:08:23.938119+00:00,PPD42NS,True,4,15000,7090.27,580.28,1714484,168140,11.43,1.12,,,,,,,,,,,,,,,
-2015-05-05 08:08:07.875470+00:00,PPD42NS,True,4,15000,7339.64,0.62,1757280,0,11.72,0.00,,,,,,,,,,,,,,,
-2015-05-05 08:07:51.815667+00:00,PPD42NS,True,4,15000,8189.86,952.50,1896336,276316,12.64,1.84,,,,,,,,,,,,,,,
-2015-05-05 08:07:35.755389+00:00,PPD42NS,True,4,15000,7561.87,429.94,1794624,124416,11.96,0.83,,,,,,,,,,,,,,,
-2015-05-05 08:07:19.693213+00:00,PPD42NS,True,4,15000,7547.04,518.58,1792156,150192,11.95,1.00,,,,,,,,,,,,,,,
-2015-05-05 08:07:03.631448+00:00,PPD42NS,True,4,15000,7365.93,821.77,1761736,238364,11.74,1.59,,,,,,,,,,,,,,,
-2015-05-05 08:06:47.573833+00:00,PPD42NS,True,4,15000,6951.45,178.06,1690236,51300,11.27,0.34,,,,,,,,,,,,,,,
-2015-05-05 08:06:31.508709+00:00,PPD42NS,True,4,15000,8791.90,1052.69,1988940,305348,13.26,2.04,,,,,,,,,,,,,,,
-2015-05-05 08:06:15.445496+00:00,PPD42NS,True,4,15000,5967.60,321.06,1509084,92780,10.06,0.62,,,,,,,,,,,,,,,
-2015-05-05 08:05:59.385219+00:00,PPD42NS,True,4,15000,6992.30,243.54,1697404,70280,11.32,0.47,,,,,,,,,,,,,,,
-2015-05-05 08:05:43.323202+00:00,PPD42NS,True,4,15000,6991.09,450.90,1697192,130508,11.31,0.87,,,,,,,,,,,,,,,
-2015-05-05 08:05:27.263351+00:00,PPD42NS,True,4,15000,7176.04,237.85,1729312,68632,11.53,0.46,,,,,,,,,,,,,,,
-2015-05-05 08:05:11.200326+00:00,PPD42NS,True,4,15000,7148.58,,1724576,71072,11.50,0.47,,,,,,,,,,,,,,,
-2015-05-05 08:04:55.139757+00:00,PPD42NS,True,4,15000,16401.21,519.21,2882992,150376,19.22,1.00,,,,,,,,,,,,,,,
-2015-05-05 08:04:39.077065+00:00,PPD42NS,True,4,15000,6161.22,262.91,1546088,75900,10.31,0.51,,,,,,,,,,,,,,,
-2015-05-05 08:04:23.016566+00:00,PPD42NS,True,4,15000,7017.73,292.31,1701852,84432,11.35,0.56,,,,,,,,,,,,,,,
-2015-05-05 08:04:06.956241+00:00,PPD42NS,True,4,15000,14762.59,304.23,2722384,87892,18.15,0.59,,,,,,,,,,,,,,,
-2015-05-05 08:03:50.896043+00:00,PPD42NS,True,4,15000,6074.75,314.88,1529648,90984,10.20,0.61,,,,,,,,,,,,,,,
-2015-05-05 08:03:34.832675+00:00,PPD42NS,True,4,15000,7754.34,263.92,1826384,76192,12.18,0.51,,,,,,,,,,,,,,,
-2015-05-05 08:03:18.769698+00:00,PPD42NS,True,4,15000,5294.12,502.19,1374764,145424,9.17,0.97,,,,,,,,,,,,,,,
-2015-05-05 08:03:02.708364+00:00,PPD42NS,True,4,15000,7328.14,396.89,1755328,114808,11.70,0.77,,,,,,,,,,,,,,,
-2015-05-05 08:02:46.646314+00:00,PPD42NS,True,4,15000,6748.95,237.30,1654308,68472,11.03,0.46,,,,,,,,,,,,,,,
-2015-05-05 08:02:30.583076+00:00,PPD42NS,True,4,15000,7012.40,234.56,1700920,67676,11.34,0.45,,,,,,,,,,,,,,,
-2015-05-05 08:02:14.521072+00:00,PPD42NS,True,4,15000,7434.46,301.47,1773304,87092,11.82,0.58,,,,,,,,,,,,,,,
-2015-05-05 08:01:58.459735+00:00,PPD42NS,True,4,15000,7321.36,300.32,1754176,86756,11.69,0.58,,,,,,,,,,,,,,,
-2015-05-05 08:01:42.399430+00:00,PPD42NS,True,4,15000,7146.14,288.92,1724156,83448,11.49,0.56,,,,,,,,,,,,,,,
-2015-05-05 08:01:26.337841+00:00,PPD42NS,True,4,15000,6473.19,548.64,1604280,158936,10.70,1.06,,,,,,,,,,,,,,,
-2015-05-05 08:01:10.277576+00:00,PPD42NS,True,4,15000,14030.23,212.88,2646140,61392,17.64,0.41,,,,,,,,,,,,,,,
-2015-05-05 08:00:54.217136+00:00,PPD42NS,True,4,15000,6729.33,300.85,1650792,86912,11.01,0.58,,,,,,,,,,,,,,,
-2015-05-05 08:00:38.154787+00:00,PPD42NS,True,4,15000,6620.07,329.58,1631088,95252,10.87,0.64,,,,,,,,,,,,,,,
-2015-05-05 08:00:22.092329+00:00,PPD42NS,True,4,15000,8049.99,949.21,1874152,275364,12.49,1.84,,,,,,,,,,,,,,,
-2015-05-05 08:00:06.030593+00:00,PPD42NS,True,4,15000,5996.88,313.83,1514724,90680,10.10,0.60,,,,,,,,,,,,,,,
-2015-05-05 07:59:49.968737+00:00,PPD42NS,True,4,15000,6221.91,91.07,1557544,26124,10.38,0.17,,,,,,,,,,,,,,,
-2015-05-05 07:59:33.918544+00:00,PPD42NS,True,4,15000,16144.50,753.73,2858672,218588,19.06,1.46,,,,,,,,,,,,,,,
-2015-05-05 07:59:17.846155+00:00,PPD42NS,True,4,15000,6196.08,381.87,1552676,110444,10.35,0.74,,,,,,,,,,,,,,,
-2015-05-05 07:59:01.784061+00:00,PPD42NS,True,4,15000,6750.42,264.89,1654572,76476,11.03,0.51,,,,,,,,,,,,,,,
-2015-05-05 07:58:45.723962+00:00,PPD42NS,True,4,15000,6624.26,70.73,1631848,20244,10.88,0.13,,,,,,,,,,,,,,,
-2015-05-05 07:58:29.662149+00:00,PPD42NS,True,4,15000,5878.15,107.78,1491752,30956,9.95,0.21,,,,,,,,,,,,,,,
-2015-05-05 07:58:13.601690+00:00,PPD42NS,True,4,15000,6637.74,944.21,1634288,273912,10.90,1.83,,,,,,,,,,,,,,,
-2015-05-05 07:57:57.541107+00:00,PPD42NS,True,4,15000,5975.25,132.85,1510560,38208,10.07,0.25,,,,,,,,,,,,,,,
-2015-05-05 07:57:41.480988+00:00,PPD42NS,True,4,15000,15823.56,845.16,2827844,245160,18.85,1.63,,,,,,,,,,,,,,,
-2015-05-05 07:57:25.419501+00:00,PPD42NS,True,4,15000,6943.85,494.25,1688900,143116,11.26,0.95,,,,,,,,,,,,,,,
-2015-05-05 07:57:09.357375+00:00,PPD42NS,True,4,15000,5914.70,133.47,1498852,38388,9.99,0.26,,,,,,,,,,,,,,,
-2015-05-05 07:56:53.295739+00:00,PPD42NS,True,4,15000,6631.04,433.62,1633076,125484,10.89,0.84,,,,,,,,,,,,,,,
-2015-05-05 07:56:37.233668+00:00,PPD42NS,True,4,15000,7041.73,543.28,1706040,157376,11.37,1.05,,,,,,,,,,,,,,,
-2015-05-05 07:56:21.171581+00:00,PPD42NS,True,4,15000,6285.36,704.37,1569452,204236,10.46,1.36,,,,,,,,,,,,,,,
-2015-05-05 07:56:05.109987+00:00,PPD42NS,True,4,15000,6583.94,0.62,1624528,0,10.83,0.00,,,,,,,,,,,,,,,
-2015-05-05 07:55:49.050888+00:00,PPD42NS,True,4,15000,15659.83,171.31,2811932,49344,18.75,0.33,,,,,,,,,,,,,,,
-2015-05-05 07:55:32.990231+00:00,PPD42NS,True,4,15000,6434.43,114.96,1597144,33032,10.65,0.22,,,,,,,,,,,,,,,
-2015-05-05 07:55:16.930056+00:00,PPD42NS,True,4,15000,,344.04,1764440,99452,11.76,0.66,,,,,,,,,,,,,,,
-2015-05-05 07:55:00.867301+00:00,PPD42NS,True,4,15000,6918.61,928.67,1684456,269404,11.23,1.80,,,,,,,,,,,,,,,
-2015-05-05 07:54:44.804600+00:00,PPD42NS,True,4,15000,6329.54,155.37,1577700,44728,10.52,0.30,,,,,,,,,,,,,,,
-2015-05-05 07:54:28.742713+00:00,PPD42NS,True,4,15000,6440.02,651.79,1598176,188944,10.65,1.26,,,,,,,,,,,,,,,
-2015-05-05 07:54:12.680415+00:00,PPD42NS,True,4,15000,5768.14,153.61,1470228,44220,9.80,0.29,,,,,,,,,,,,,,,
-2015-05-05 07:53:56.621355+00:00,PPD42NS,True,4,15000,15464.55,474.80,2792784,137460,18.62,0.92,,,,,,,,,,,,,,,
-2015-05-05 07:53:40.558344+00:00,PPD42NS,True,4,15000,6740.11,702.16,1652724,203592,11.02,1.36,,,,,,,,,,,,,,,
-2015-05-05 07:53:24.496260+00:00,PPD42NS,True,4,15000,6398.04,294.21,1590420,84984,10.60,0.57,,,,,,,,,,,,,,,
-2015-05-05 07:53:08.435849+00:00,PPD42NS,True,4,15000,7928.32,550.84,1854640,159576,12.36,1.06,,,,,,,,,,,,,,,
-2015-05-05 07:52:52.374188+00:00,PPD42NS,True,4,15000,7157.45,626.48,1726108,181580,11.51,,,,,,,,,,,,,,,,
-2015-05-05 07:52:36.313871+00:00,PPD42NS,True,4,15000,6812.70,479.60,1665692,138856,11.10,0.93,,,,,,,,,,,,,,,
-2015-05-05 07:52:20.251114+00:00,PPD42NS,True,4,15000,6910.72,0.62,1683064,0,11.22,0.00,,,,,,,,,,,,,,,
-2015-05-05 07:52:04.190615+00:00,PPD42NS,True,4,15000,7221.89,604.41,1737192,175160,11.58,1.17,,,,,,,,,,,,,,,
-2015-05-05 07:51:48.128391+00:00,PPD42NS,True,4,15000,7518.92,531.48,1787464,153944,11.92,1.03,,,,,,,,,,,,,,,
-2015-05-05 07:51:32.068226+00:00,PPD42NS,True,4,15000,7886.83,124.53,1847940,35800,12.32,0.24,,,,,,,,,,,,,,,
-2015-05-05 07:51:16.005486+00:00,PPD42NS,True,4,15000,8371.56,632.61,1924768,183364,12.83,1.22,,,,,,,,,,,,,,,
-2015-05-05 07:50:59.944938+00:00,PPD42NS,True,4,15000,7660.68,201.53,1810996,58100,12.07,0.39,,,,,,,,,,,,,,,
-2015-05-05 07:50:43.883950+00:00,PPD42NS,True,4,15000,7934.05,781.96,1855564,226796,12.37,1.51,,,,,,,,,,,,,,,
-2015-05-05 07:50:27.822111+00:00,PPD42NS,True,4,15000,8512.43,157.14,1946520,45240,12.98,0.30,,,,,,,,,,,,,,,
-2015-05-05 07:50:11.762732+00:00,PPD42NS,True,4,15000,15413.34,290.17,2787732,83812,18.58,0.56,,,,,,,,,,,,,,,
-2015-05-05 07:49:55.699597+00:00,PPD42NS,True,4,15000,7703.73,558.55,1818084,161820,12.12,1.08,,,,,,,,,,,,,,,
-2015-05-05 07:49:39.639496+00:00,PPD42NS,True,4,15000,6874.58,0.62,1676676,0,11.18,0.00,,,,,,,,,,,,,,,
-2015-05-05 07:49:23.578835+00:00,PPD42NS,True,4,15000,7250.78,811.47,1742140,235372,11.61,1.57,,,,,,,,,,,,,,,
diff --git a/r-scripts/installrequire.R b/r-scripts/installrequire.R
deleted file mode 100644
index ba37eb022..000000000
--- a/r-scripts/installrequire.R
+++ /dev/null
@@ -1,10 +0,0 @@
-# function to require packages. Installs them, if necessary
-# @parameter packagelist a vector of character strings with the package names
-installrequire<-function(packagelist=c(),...){
- for (packagename in packagelist){
- if(! packagename %in% installed.packages()[,1]){
- install.packages(packagename,...)
- }
- require(packagename, character.only=TRUE)
- }
-}
diff --git a/r-scripts/luft.R b/r-scripts/luft.R
deleted file mode 100644
index 3fdc3ec61..000000000
--- a/r-scripts/luft.R
+++ /dev/null
@@ -1,195 +0,0 @@
-source("installrequire.R")
-installrequire(c("lubridate","dplyr","ggplot2"))
-# library(xlsx)
-# library(lubridate)
-# library(dplyr)
-# library(ggplot2)
-
-
-###########################################################################
-#####Preparation(only once)################################################
-###########################################################################
-#roh <- read.xlsx(file="table23032015135021029.xlsx", sheetIndex=1)
-#names(roh) <- c("Messstelle", "Datetime", "Agg_Zeitraum", "Agg_Art", "NO2")
-#roh$NO2 <- as.numeric(as.character(roh$NO2))
-#roh$Datetime <- ymd_hm(roh$Datetime)
-#roh <- roh %>% mutate(Woche=week(Datetime)) %>% mutate(Monat=month(Datetime)) %>% mutate(Date=as.Date(Datetime))
-
-# script to read+preprocess (Makefile friendly)
-# loads dataframe dat
-source("readdata.R")
-stop("readddata.R dysfct/not existent/moved to readairdat, stopping here...")
-
-
-## Plots, to pdf
-# pdf("plots.pdf")
-png(width=1200,height=1000)
-
-#Werte fuer PM2.5 im Zeitverlauf
-p1 <- ggplot(filter(dat, type=="PPD42NS"), aes(timestamp2, P2, color=type)) + geom_point() + theme(axis.text.x = element_text(angle=90)) + geom_point(data=filter(dat, type == "GP2Y1010AU0F"), aes(timestamp2, P25, color=type)) + scale_y_log10()
-#+ geom_point(data=filter(dat, type=="GP2Y1010AU0F"), aes(timestamp2, vo_raw, color=type))
-print(p1)
-
-# density plots
-p1<-ggplot(dat, aes(x = P2)) + stat_density() + scale_x_log10()+ labs(title="P2 density (log scaled)")
-print(p1)
-
-p1<-ggplot(dat, aes(x = P1)) + stat_density() + scale_x_log10() + labs(title="P1 density (log scaled)")
-print(p1)
-
-p1<-ggplot(dat, aes(x = P1)) + stat_density() + scale_x_log10() + labs(title="P1 density (log scaled) by location_id")+ facet_wrap(~location_id); print(p1)
-
-p1<-ggplot(dat, aes(x = P1)) + stat_density() + xlim(c(-1000,15645))+ labs(title="P1 density")
-print(p1)
-
-p1<-ggplot(dat, aes(x = P1)) + stat_density() + xlim(c(-1000,15645))+ labs(title="P1 density per location_id")+ facet_wrap(~location_id); print(p1)
-
-p1<-ggplot(dat, aes(x = ratioP1)) + stat_density() + labs(title="ratioP1 density") + xlim(c(0,15))
-print(p1)
-p1<-ggplot(dat, aes(x = ratioP1)) + stat_density() + labs(title="ratioP1 density by location_id") + xlim(c(0,15)) + facet_wrap(~location_id)
-print(p1)
-
-p1<-ggplot(dat, aes(x = ratioP2)) + stat_density() + labs(title="ratioP2 density") + xlim(c(0,2))
-print(p1)
-p1<-ggplot(dat, aes(x = ratioP2)) + stat_density() + labs(title="ratioP2 density by location_id") + xlim(c(0,2)) + facet_wrap(~location_id)
-print(p1)
-
-p1<-ggplot(dat, aes(x = ratioP2)) + stat_density() + labs(title="ratioP2 density") + xlim(c(0,15))
-#+ scale_x_log10()
-print(p1)
-
-p1<-ggplot(dat, aes(x = durP1)) + geom_density(color="red",trim=TRUE) +xlim(c(0,3446407))+ labs(title="durP1/durP2 densities (red/blue)") + geom_density(aes(x = durP2),color="blue",trim=TRUE)
-print(p1)
-
-p1<-ggplot(dat, aes(x = durP1)) + stat_density() +xlim(c(0,3446407))+ labs(title="durP2 density")
-print(p1)
-
-p1<-ggplot(dat, aes(x = P25)) + stat_density() + labs(title="P25 density (log scaled)") + scale_x_log10()
-print(p1)
-
-p1<-ggplot(dat, aes(x = P25)) + stat_density() + labs(title="P25 density") + xlim(c(2000,8000))
-print(p1)
-
-p1<-ggplot(dat, aes(x = P10)) + stat_density() + labs(title="P10 density") + xlim(c(8000,30000))
-print(p1)
-
-p1<-ggplot(dat, aes(x = P25)) + stat_density() + labs(title="P25 density/location_id") + xlim(c(2000,8000))+ facet_wrap(~location_id)
-print(p1)
-
-p1<-ggplot(dat, aes(x = P10)) + stat_density() + labs(title="P10 density/location_id") + xlim(c(8000,30000))+ facet_wrap(~location_id)
-print(p1)
-
-p1<-ggplot(dat, aes(x = P25)) + geom_density(aes(x = durP2),color="black",trim=TRUE) + labs(title="P25 (black), P10 (blue) densities") + xlim(c(0,50000))+ geom_density(aes(x = P10),color="blue",trim=TRUE)
-print(p1)
-
-
-p1<-ggplot(dat, aes(x = dust_density)) + geom_bar()+ labs(title="dust_density histogram") + xlim(c(-0.01,0.08)); print(p1)
-
-p1<-ggplot(dat, aes(x = P10)) + stat_density() + labs(title="P10 density/sensor type") + xlim(c(8000,30000))+ facet_wrap(~type)
-print(p1)
-
-
-p1 <- ggplot(filter(dat, type=="PPD42NS"), aes(P1, P2)) + geom_point() +scale_x_log10() + scale_y_log10() + facet_wrap(~location_id)
-print(p1)
-
-p1 <- ggplot(filter(dat, type=="PPD42NS"), aes(P1, P2,color=as.double(timestamp2))) + scale_colour_continuous(high="yellow") + geom_point() +scale_x_log10() + scale_y_log10() + facet_wrap(~location_id)
-print(p1)
-
-p1 <- ggplot(dat, aes(P25, P10)) + geom_point() +scale_x_log10() + scale_y_log10() + facet_wrap(type~location_id, drop=TRUE,shrink=TRUE)
-print(p1)
-
-p1 <- ggplot(dat, aes(P1, P2)) + geom_point() +scale_x_log10() + scale_y_log10() + facet_wrap(type~location_id, drop=TRUE,shrink=TRUE)
-print(p1)
-
-p1 <- ggplot(dat, aes(ratioP1, ratioP2)) + geom_point() + facet_wrap(type~location_id, drop=TRUE,shrink=TRUE) +scale_x_log10() + scale_y_log10()
-print(p1)
-
-p1 <- ggplot(dat, aes(durP1, durP2)) + geom_point() + facet_wrap(type~location_id, drop=TRUE,shrink=TRUE) #+scale_x_log10() + scale_y_log10()
-print(p1)
-
-p1 <- ggplot(dat, aes(vo_raw, voltage)) + geom_point() + facet_wrap(type~location_id, drop=TRUE,shrink=TRUE) #+scale_x_log10() + scale_y_log10()
-print(p1)
-
-p1 <- ggplot(dat, aes(timestamp2, P1)) + geom_point() + facet_wrap(type~location_id, drop=TRUE,shrink=TRUE) + scale_y_log10()
-print(p1)
-
-p1 <- ggplot(dat) + geom_line(aes(timestamp2, P1)) + geom_line(aes(timestamp2, P2, color="red")) + facet_wrap(type~location_id,ncol=1, drop=TRUE,shrink=TRUE) + scale_y_log10()
-print(p1)
-
-# measurement times
-p1 <- ggplot(dat) + geom_density(aes(x = timestamp2),color="blue",trim=TRUE,kernel="rectangular",width=0.1) + labs(title="Measurement density")
-print(p1)
-
-p1<- ggplot(dat) + geom_point(aes(timestamp2,P2,order = sample(seq_along(timestamp2))))
-print(p1)
-
-# since we do have dplyr and count, plot the "table" data
-# TODO: make this work
-# p1<-ggplot(count(dat,yday=as.POSIXlt(dat$timestamp2)$yday,type),aes(yday,n,col=type)) + geom_point()
-# print(p1)
-
-dev.off() # end plot to pdf
-
-##random sample for histogram
-#rand.ppd <- sample_n(ppd, 1000)
-#p2 <- ggplot(data=filter(dat, type=="PPD42NS"), aes(P2)) + geom_histogram(binwidth=1/10)
-
-##Daten fuer Sensoren anschauen
-#head(dat)
-#sample_n(filter(dat, type=="PPD42NS"), 10)
-#sample_n(filter(dat, type=="GP2Y1010AU0F"), 10)
-
-## some statistics about measurements
-# look with table
-# yday = day of year
-table(dat$type,as.POSIXlt(dat$timestamp2)$yday,useNA = "ifany")
-
-# how many NA's in P2?
-table(dat$type,as.POSIXlt(dat$timestamp2)$yday,sapply(dat$P2,is.na),useNA = "no")
-# how many NA's in P1?
-table(dat$type,as.POSIXlt(dat$timestamp2)$yday,sapply(dat$P1,is.na),useNA = "no")
-
-## official data sets
-
-source("readdata_s_mitte.R")
-
-if(!("sdat" %in% ls())){ # check if we have the data
- warning("data not found, check readdata_s_mitte.R to download")
- }else{ # plot
- pdf("s-mitte.pdf",width=20, height=8)
- for (y in names(sdat)[3:length(names(sdat))]){
- p<-ggplot(sdat)+
- geom_line(aes_string("datelt",y))+
- labs(x="Zeit",
- y=attr(sdat,"ylabel")[attr(sdat,"names")==y])
- print(p)
- }
- # can you see sylvester? PMx > 500
- # lets leave that out
- y="pm25"
- p<-ggplot(sdat[sdat$datelt>as.POSIXlt("2015-01-01 08:00:00"),])+
- geom_line(aes_string("datelt",y))+
- labs(title="Ohne Sylvester",
- x="Zeit",
- y=attr(sdat,"ylabel")[attr(sdat,"names")==y])
-
- # PM10 daily means (Tagesmittelwerte), threshold is 50mug
- sdat.yday<-aggregate(select(sdat,date,pm10),by=list(yday=sdat$datelt$yday),mean)
- sdat.yday$datelt=as.POSIXlt(sdat.yday$date)
- sdat.yday$above50<-factor(sdat.yday$pm10>50)
- print(p)
-
- y="pm10"
- p<-ggplot(sdat[sdat$datelt>as.POSIXlt("2015-01-01 08:00:00"),])+
- geom_line(aes_string("datelt",y))+
- labs(title=paste("Ohne Sylvester, Überschreitungen:",sum(sdat.yday$pm10>50,na.rm=TRUE)),
- x="Zeit",
- y=attr(sdat,"ylabel")[attr(sdat,"names")==y])+
- geom_point(data=sdat.yday,
- aes(datelt,pm10,color=above50),size=5)+
- scale_colour_discrete(h = c(120, 340), c = 100, l = 65, h.start = 30, direction = 1, na.value = "grey50")+
- geom_hline(yintercept=50,lty=2)
-
- print(p)
- dev.off()
-} # end if sdat
diff --git a/r-scripts/plot_sensordata.R b/r-scripts/plot_sensordata.R
deleted file mode 100644
index eafbea85a..000000000
--- a/r-scripts/plot_sensordata.R
+++ /dev/null
@@ -1,332 +0,0 @@
-require("ggplot2")
-require("dplyr")
-require("timeSeries")
-require("forecast")
-require("plotly")
-# require("tsoutliers")
-# require("zoo")
-
-# TODO: use https://stat.ethz.ch/R-manual/R-devel/library/stats/html/decompose.html
-
-usearchive=TRUE # csv data from archive
-sensorid=40
-usearchive=FALSE # timestamp needs fixing (in csv and conversion below)
-usearchive=TRUE # timestamp needs fixing (in csv and conversion below)
-#if(usearchive){require("RCurl");}
-
-# set to dir containing this script
-if(("scriptdir" %in% ls())){
- setwd(scriptdir)
-}
-
-#max values for clipping
-Pclip<-list(P1=list(min=0, max=10000),
- P2=list(min=0.62, max=1000))
-dateinterval<-list(min=as.POSIXct(strptime("2015-12-30", format="%Y-%m-%d")),
- max=as.POSIXct(Sys.Date()))
-plotdir="./output_plots"
-if(!dir.exists(plotdir)){dir.create(plotdir, showWarnings = TRUE, recursive = TRUE, mode = "0755")}
-
-#' function to clip values above/below thresholds
-clipping<-function(x,min=NULL,max=NULL){
- if(is.null(min)){
- min=min(na.omit(x))
- }
- if(is.null(max)){
- max=max(na.omit(x))
- }
- if(is.na(max)||is.na(min)){
- warn("NA for min/max while clipping, no clipping done")
- return(x)
- }
- x[x>max]<-max
- x[xarcdat_filename_mtime]){
- print(paste("reading ", csvfilename))
- rdat<-read.csv(csvfilename, sep=";", dec=".", header=TRUE)
- adddat<-dplyr::bind_rows(adddat,rdat)
- newdat=TRUE
- }
- if(newdat){arcdat<-dplyr::bind_rows(arcdat,adddat)}
- # Detectable range of concentration 0~28,000 pcs/liter (0~8,000pcs/0.01 CF=283ml)
-
- arcdat$timestampct<-as.POSIXct(strptime(arcdat$timestamp,format="%Y-%m-%dT%H:%M:%OS"))
- arctbl<-table(arcdat$sensor_id,as.Date(arcdat$timestamp))#$yday+1000*(as.POSIXlt(arcdat$timestamp)$year+1990))
- save(arcdat, arctbl ,file=arcdat_filename)
- outfilebase="plots_sensordata_overview"
- outfilepath=file.path(plotdir,"plots_sensordata_overview")
- pdf(paste(outfilepath,".pdf",sep=""),width=15,height=9)
- arctbl.df<-as.data.frame(arctbl)
- arctbl.df$Var2<-as.Date(arctbl.df$Var2)
- p<-ggplot(arctbl.df, aes(Var2,Var1,size=Freq, color=as.factor(as.POSIXlt(arctbl.df$Var2)$mon+1))) + geom_point()+
- labs(x="Date", y="sensor id")+
- theme(axis.text.x = element_text(angle=90, vjust=0.5, size=6))+
- scale_x_date(date_labels = "%b %d %Y", date_minor_breaks = "1 day", date_breaks = "1 week")+
- scale_colour_hue(name="Month")
-# scale_colour_brewer(name = "Month")
-# theme(legend.title=element_blank())+
- # months(arctbl.df$Var2)
- print(p)
- plotlyggout(p=p,dir=plotdir,filename=paste(outfilebase,".html",sep=""))
- dev.off()
-
- # Detectable range of concentration 0~28,000 pcs/liter (0~8,000pcs/0.01 CF=283ml)
-
-# iterate sensors
- for (sid in unique(arcdat$sensor_id)){
- print(sid)
- sdat<-as.data.frame(dplyr::filter(arcdat, sensor_id==sid)) # result type is tbl_df, convert to df
- if(0==sum(!is.na(sdat$P1))){print(paste0("no P1 data, skiping sensor ",sid));next;}
- # check for Px sensor data
- sdat<-sdat[order(sdat$timestampct),] # sort by timestampct
- sdat$P2diff1=sdat$P2-sdat$P1
- sdat$durP2diff1=sdat$durP2-sdat$durP1
-
- print(dim(sdat))
- # stats::filter the data
- # create a gaussian smoothing
- sigma=5
- ntaps=10
- gc<-gfcoeffs(sigma,ntaps)
-
- outfilebase=paste("plots_sensor_",sid,sep="")
- pdffilename=paste(plotdir,"/",outfilebase,".pdf",sep="")
-# set width according to timediff
- timespan<-as.double(max(sdat$timestampct)-min(sdat$timestampct))
- print(paste("plotwidth", min(timespan/2,10)))
- pdf(pdffilename, width=max(timespan/2,10), height=10)
- measvalnames=c("P1", "durP1", "ratioP1", "P2", "durP2", "ratioP2", "P2diff1", "durP2diff1")
- # have a timeSeries object and plot it
- print(paste("tsdat plot"))
- tsdat<-timeSeries(sdat[,measvalnames], sdat$timestampct)
- tryCatch({plot(tsdat)}, error = function(e) e)
- tdn<-as.numeric(sdat$timestampct[2:length(sdat$timestampct)]-sdat$timestampct[1:(length(sdat$timestampct)-1)])
- tdn.c<-tdn[tdn<320]
-
- # plot histogram of timediffs
- tryCatch({hist(tdn.c,n=100, main = paste("Histogram of timediffs"))}, error = function(e) e)
-
- # aggregate by year, day, hour
- tstamplt<-as.POSIXlt(sdat$timestampct)# [,c("year","yday")]
- sdat.agg<-aggregate(sdat, by=list(year=tstamplt$year+1900,yday=tstamplt$yday,hour=tstamplt$hour),FUN=mean)
- # order by ymd
- sdat.agg<-sdat.agg[order(sdat.agg$year,sdat.agg$yday,sdat.agg$hour),]
-
- sdat.dagg<-aggregate(sdat, by=list(year=tstamplt$year+1900,yday=tstamplt$yday),FUN=mean)
- sdat.dagg<-sdat.dagg[order(sdat.dagg$year,sdat.dagg$yday),]
-# ggplot(sdat.dagg,aes_string("timestampct",coln))
- for (coln in measvalnames){
- print (coln)
- if(length(sdat[,coln])>ntaps){
- # TODO: identify/handle outliers
- # look at forecast::tsoutliers tsoutliers::tso
- # outlier filter first forecast::tsclean
- sdat$plotdat<-forecast::tsclean(sdat[,coln])
- sdat$plotdat<-as.vector(stats::filter(sdat$plotdat, gfcoeffs(sigma,ntaps)))
- p<-ggplot(sdat.agg,aes_string("timestampct",coln))+geom_bar(stat = "identity")+labs(main="Hourly means")
- print(p)
- plotlyggout(p=p,dir=plotdir,filename=paste(outfilebase,"_hourly.html",sep=""))
- p<-ggplot(sdat.dagg,aes_string("timestampct",coln))+ geom_bar(stat = "identity")+labs(main="Daily means")
- print(p)
- plotlyggout(p=p,dir=plotdir,filename=paste(outfilebase,"_daily.html",sep=""))
- p<-ggplot(sdat, aes(timestampct,plotdat))+geom_line()+geom_smooth(span=0.2)+ labs(x="Time",y=coln)
- print(p)
- plotlyggout(p=p,dir=plotdir,filename=paste(outfilebase,"_.html",sep=""))
- # TODO: gleitende 24-Stunden-Mittelwerte (24h means filtering)
- # maybe possible via zoo forecast::ma its fts tseries timeSeries
- # fts:moving.mean only Date as time?
- # look for functions with timestamp based intervals (24h)
- # z=zoo(sdat,order.by=sdat$timestampct)
- # sdat.fts=as.fts(sdat[,c("timestampct","P1")])
- # idat=irts(sdat$timestampct, sdat$P1)
- # plot(idat)
- # measurement Dates
- # mdts<-as.timeSeries(unique(as.Date(sdat$timestampct)))
- # fts wants chr dates (timestamps possible?) in row names?
- # rownames(sdat)<-as.character(sdat$timestampct)
- }
- }
- dev.off()
- }# sensor_id
- print(paste("total size of data:", dim(arcdat) ,collapse = " "))
-}# usearchive
-
-## calibration function
-ppdcalib<-function(x){1.1*x^3 - 3.8*x^2 + 520*x + 0.62} # calibration function: ratioPx [%] / Concentration [pcs/283ml] = [pcs/0.01cf]
-cf3tom3=0.02831685 # cubic foot to cubic meter ft³=0.02831685m³, m³=ft³/35.315
-# to pcs/m3: /100 /cf3tom3
-# to µg*m^-3
-# https://github.com/intel-iot-devkit/upm/pull/409/files
-# + // All particles are spherical, with a density of 1.65E12 µg/m3
-# + double density = 1.65 * pow (10, 12);
-# + // The radius of a particle in the PM2.5 channel is .44 µm
-# I doubt it, should be 2.5/2 µm
-# + double r25 = 0.44 * pow (10, -6);
-# + double vol25 = (4/3) * pi * pow (r25, 3);
-# + double mass25 = density * vol25; // ug
-# + double K = 3531.5; // per m^3
-# interesting, since with weather correction:
-# http://www.cleanair.org/sites/default/files/Drexel%20Air%20Monitoring_-_Final_Report_-_Team_19_0.pdf
-
-
-pdffilename=file.path(plotdir,paste("ppd_calib.pdf",sep=""))
-pdf(pdffilename)
-p<- ggplot(sdat,aes(ratioP1,P1))+geom_point()+
- stat_function(fun=ppdcalib)+
- labs(title="PPD calibration function")+
- coord_flip()
- #coord_flip to have the same orientation as in the spec sheet curve
-print(p)
-p<- ggplot(sdat[sdat$ratioP1<5,],aes(ratioP1,P1))+geom_point()+
- stat_function(fun=ppdcalib)+
- labs(title="PPD calibration function < 5")
-print(p)
-
-p<- ggplot(arcdat,aes(P2, ..count..))+
- geom_density()+xlim(0.621,3000)+
- facet_wrap(~sensor_id,scales='free_y')
-print(p)
-dev.off()
-
-stop("manual break: archive plots done")
-## the following is legacy code
-
- # dates=seq.Date(from=as.Date(dateinterval$min),to=as.Date(dateinterval$max),by=1)
- # u<-paste('http://archive.madflex.de/',
- # dates,
- # '/',
- # dates,'_ppd42ns_sensor_',
- # sensorid,
- # '.csv')
- # require("RCurl")
- # filelist=urllist
- # csvsep=";"
-
-
-fpattern<-"sensor[0-9]+.csv"
-# get filelist relative to working directory, pattern = glob2rx(fpattern)
-filelist<- dir(path = ".",pattern=fpattern,recursive=FALSE,full.names=FALSE, ignore.case = TRUE) ## files in current directory
-
-for (csvfilename in filelist){
- # get/process the data with scripts from repo feinstaub-monitoring-client-python to sensorXX.csv
- # csvfilename<-paste("sensor",sensorid,".csv",sep="")
- sensorid<-regmatches(csvfilename, regexpr("[0-9]+", csvfilename))
- pdffilename<-paste("plots_sensor",sensorid,".pdf",sep="")
- sendat<-read.csv(csvfilename,sep=csvsep)
-
- # have a proper timestamp POSIXct (never use POSIXlt)
- sendat$timestampct<-as.POSIXct(strptime(sendat$timestamp,format="%Y-%m-%dT%H:%M:%OSZ"))
- sendat$timestamp<-NULL
-
- #sendat<-sendat[sendat$timestampct>strptime("2015-10-24", format="%Y-%m-%d"),]
-
- # select data of latest 2 days measured values
- # nval=2*60*24*2
- # nval=min(nval,dim(sendat)[1])
- # seldat<-sendat[1:nval,]
-
- # filter date interval
- seldat<-sendat[sendat$timestampct>dateinterval$min&
- sendat$timestampct%
- # mutate(timestamp2 = regexpr(pattern, timestamp)) %>%
- # mutate(timestamp2 = regmatches(timestamp, timestamp2)) %>%
- # mutate(timestamp2=ymd_hms(timestamp2))
- airdat$timestamp2<-as.POSIXct(strptime(airdat$timestamp,format="%Y-%m-%d %H:%M:%S"))
- # dat$timestamp2<-strptime(dat$timestamp,format="%d.%m.%y %H:%M:%S+%Z")
-
- # str(dat)
- # 'data.frame': 319836 obs. of 27 variables:
- # $ timestamp : Factor w/ 319831 levels "2015-04-05 23:13:10.759068+00:00",..: 319822 319805 319788 319771 319754 319737 319720 319703 319686 319669 ...
- # sensor type
- # $ type : Factor w/ 3 levels "dsm501a","GP2Y1010AU0F",..: 1 1 1 1 1 1 1 1 1 1 ...
- # $ indoor : Factor w/ 2 levels "False","True": 2 2 2 2 2 2 2 2 2 2 ...
- # $ location_id : int 4 4 4 4 4 4 4 4 4 4 ...
- # $ sampling_rate : int 15000 15000 15000 15000 15000 15000 15000 15000 15000 15000 ...
- #
- # $ P1 : Factor w/ 61894 levels "","017.95","05.06",..: 1 1 1 1 1 1 1 1 1 1 ...
- # $ P2 : num NA NA NA NA NA NA NA NA NA NA ...
- # $ durP1 : num NA NA NA NA NA NA NA NA NA NA ...
- # $ durP2 : int NA NA NA NA NA NA NA NA NA NA ...
- # $ ratioP1 : num NA NA NA NA NA NA NA NA NA NA ...
- # $ ratioP2 : num NA NA NA NA NA NA NA NA NA NA ...
- # $ temperature : logi NA NA NA NA NA NA ...
- # $ humidity : logi NA NA NA NA NA NA ...
- # $ pressure : logi NA NA NA NA NA NA ...
- # $ altitude : logi NA NA NA NA NA NA ...
- # $ pressure_sealevel: logi NA NA NA NA NA NA ...
- # $ brightness : logi NA NA NA NA NA NA ...
- # $ dust_density : Factor w/ 77 levels "","-.00",".00",..: 1 1 1 1 1 1 1 1 1 1 ...
- # $ vo_raw : num NA NA NA NA NA NA NA NA NA NA ...
- # $ voltage : num NA NA NA NA NA NA NA NA NA NA ...
- # $ P10 : num 16656 28523 15669 12731 14018 ...
- # $ P25 : num 3514 4474 3570 3104 3552 ...
- # $ durP10 : int 2906824 3794072 2812860 2503032 2644788 2711264 2342328 2416972 2560024 2548652 ...
- # $ durP25 : int 972924 1198488 986724 870160 982288 969476 902680 850496 924380 968796 ...
- # $ ratioP10 : num 19.4 25.3 18.8 16.7 17.6 ...
- # $ ratioP25 : num 6.49 7.99 6.58 5.8 6.55 6.46 6.02 5.67 6.16 6.46 ...
- # $ timestamp2 : POSIXct, format: "2015-05-05 08:15:59" "2015-05-05 08:15:44" ...
-
- # P1 should be numeric
- # TODO: identify problematic entries
- # DONE with preprocessing (sed)
-# dat$P1num<-as.numeric(as.character(dat$P1))
-# ## dust_density should be numeric
-# dat$dust_density_num=as.numeric(as.character(dat$dust_density))
-
-if(!is.null(datafilename)){
- # save all stuff currently in workspace
- save(airdat,file=datafilename)
-}
-return(airdat)
-}
diff --git a/r-scripts/readdata_s_mitte.R b/r-scripts/readdata_s_mitte.R
deleted file mode 100644
index ec52333d3..000000000
--- a/r-scripts/readdata_s_mitte.R
+++ /dev/null
@@ -1,88 +0,0 @@
-# increase java Heap size, by using:
-options(java.parameters = "-Xmx1000m")
-# BEFORE loading the package/java init
-
-
-require("xlsx")
-# read in Stuttgart data (official)
-# see http://www.stadtklima-stuttgart.de/index.php?luft_messdaten_station_smz
-
-# get the data, unzip:
-# http://www.stadtklima-stuttgart.de/stadtklima_filestorage/download/luft/S-Mitte-SZ-Halbstd-Werte-2015.zip
-# wget http://www.stadtklima-stuttgart.de/stadtklima_filestorage/download/luft/S-Mitte-SZ-Halbstd-Werte-2015.zip
-# unzip -d data/ S-Mitte-SZ-Halbstd-Werte-2015.zip
-# not used: xls2csv -g 6 -q 0 data/Halbstd-Werte-Stuttgart-Mitte-SZ_2015.xls > data/Halbstd-Werte-Stuttgart-Mitte-SZ_2015.csv # crappy, weird xls sheets
-
-# Messstation "Schwabenzentrum" (Amt für Umweltschutz, Abt. Stadtklimatologie)
-
-sdat<-NULL
-sdat.xls<-"data/Halbstd-Werte-Stuttgart-Mitte-SZ_2015.xls"
-sdat.datafile="readdata_s_mitte.RData"
-if (file.exists(sdat.datafile)){
- message(paste("loading from",sdat.datafile))
- load(sdat.datafile)
- }else{
- message(paste("creating",sdat.datafile))
- sdat.colclasses=c("Date",rep("numeric",19))
- sdat.colnames=c(
- "date", # "Datum",
- "hour", # "Uhrzeit",
- "t", # "Temperatur...C.",
- "t.max", # "Temperatur...C..1",
- "t.min", # "Temperatur...C..2",
- "relhum", # "Rel..Feuchte....",
- "windspeed.mean", # "WG..m.s.",
- "windspeed.max", # "WG..m.s..1",
- "widdir", # "WR..Grad.",
- "p", # "Druck..hPa.",
- "precsum", # "Niederschlag..l.m..",
- "rad", # "Globalstr...W.m..",
- "radbalance", # "Str..Bilanz..W.m..",
- "uva", # "UVA.Str...W.m..",
- "uvb", # "UVB.Str...W.m..",
- "no", # "NO..µg.m..",
- "no2", # "NO2..µg.m..",
- "o3", # "O3..µg.m..",
- "pm10", # "PM10..µg.m..",
- "pm25" # "PM2.5..µg.m.."
- )
- # read the first sheet, should be Jan.2015
- message(paste("reading",sdat.xls,"sheet",1))
- sdat.description<-read.xlsx(sdat.xls, sheetIndex=1,as.data.frame=TRUE,startRow=6,endRow=7,colIndex=1:20,header=FALSE,colClasses="character")
- sdat.description=as.data.frame(t(sdat.description))
- names(sdat.description)<-c("aggregation","measurement")
- sdat.description=cbind(sdat.description,sdat.colnames)
- sdat.description[] <- lapply(sdat.description, as.character) # change factor to character
- sdat<-read.xlsx(sdat.xls, sheetIndex=1,as.data.frame=TRUE,startRow=7,colIndex=1:20,colClasses=sdat.colclasses)
-
- for (sheeti in 2:7){ # at time of development only data up to july was present
- message (paste("reading",sdat.xls,"sheet",sheeti))
- sdat.tmp<-read.xlsx(sdat.xls, sheetIndex=sheeti,startRow=7,as.data.frame=TRUE,colIndex=1:20,colClasses=sdat.colclasses)
- if (isTRUE(all.equal(names(sdat.tmp),names(sdat)))){ # check if we have same colnames
- sdat<-rbind(sdat,sdat.tmp)
- }
- }
- names(sdat)<-sdat.colnames
- # convert date and hour to POSIXlt type
- # sdat$datelt<-as.POSIXlt(sdat$date)+sdat$hour*24*60*60
- # timezone might be wrong, so use strptime and explicitly specify
- # dunno about daylight-saving, needs to be looked up deeper in the documentation how this is handled (CEST is Central European Summer Time)
- sdat$datelt<-as.POSIXlt(strptime(sdat$date,format="%Y-%m-%d",tz="Europe/Berlin")+sdat$hour*24*60*60)
- sdat.description<-rbind(sdat.description,c(NA,"Messzeitpunkt","datelt"))
- row.names(sdat.description)<-NULL
- # add as attribute to sdat
- attr(sdat,"ylabel")<-paste(sdat.description$measurement,sdat.description$aggregation)
- print(sdat.description)
- # seems to be off-by one?, wrong TZ? no, weird data: the data sets start at 0:30 and end with 0:00
- # see table(sdat$date,sdat$datelt$hour)
- # 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
- # 2015-01-01 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
- # [...]
- # 2015-08-01 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-
- # clean up intermediary vars, keep .datafile .description
- rm(list=ls()[grep(pattern="^sdat.[^d]",ls())])
- save(sdat,file=sdat.datafile)
-} # end if (file.exists(sdat.datafile)){
-
-
diff --git a/r-scripts/sensorids.md b/r-scripts/sensorids.md
deleted file mode 100644
index 249fa6ed2..000000000
--- a/r-scripts/sensorids.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# sensor id list from django config page
-
-7
-25
-33
-39
-40
-42
-44
-45
-48
-51
-52
-66
-67
-68
-71
-80
-81
-83
-84
-87
-88
-
-
- grep -o 'value="[0-9]*"' ~/Downloads/sensors.html | grep -o '[0-9]*'| sort -n
diff --git a/raspberry-serial/.gitignore b/raspberry-serial/.gitignore
deleted file mode 100644
index 72723e50a..000000000
--- a/raspberry-serial/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*pyc
diff --git a/raspberry-serial/README b/raspberry-serial/README
deleted file mode 100644
index cb9321584..000000000
--- a/raspberry-serial/README
+++ /dev/null
@@ -1,3 +0,0 @@
-# IMPORTANT
-
-the code in this folder is old and unmaintained!
diff --git a/raspberry-serial/config.py b/raspberry-serial/config.py
deleted file mode 100644
index 2eae5b06f..000000000
--- a/raspberry-serial/config.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# set SENSOR_UID to the UID of your sensor
-
-settings = {}
-settings['SENSOR_UID'] = 'FIXME'
-settings['SENSOR_PPD42NS_UID'] = 'TEST'
-settings['SENSOR_SHT10_UID'] = 'TEST2'
diff --git a/raspberry-serial/logtofile.py b/raspberry-serial/logtofile.py
deleted file mode 100644
index 695db0d2c..000000000
--- a/raspberry-serial/logtofile.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Log all sensor data to file for later push to dusti.xyz api
-#
-# requires:
-# apt-get install python-serial
-# pip install pytz
-#
-# Python 2 code!!
-#
-
-import os.path
-import serial
-import uuid
-
-from sensor import (
- SensorDSM501A,
- SensorGP2Y10,
- SensorPPD42NS,
- SensorSHT10,
- SensorBMP180,
-)
-
-dirname = os.path.dirname(os.path.abspath(__file__))
-# different filename on each restart
-# because you may have to change the location of the sensor
-# before uploading the data
-filename = os.path.join(dirname, uuid.uuid4().hex)
-
-import argparse
-parser = argparse.ArgumentParser()
-parser.add_argument("--device", help="device to read from",
- default="/dev/ttyACM0")
-args = parser.parse_args()
-
-classes = (SensorDSM501A, SensorGP2Y10, SensorPPD42NS,
- SensorSHT10, SensorBMP180)
-
-ser = serial.Serial(args.device)
-while True:
- message = ser.readline()
- for cls in classes:
- instance = cls(filename)
- data = instance.parse(message)
- if data:
- instance.log(data)
diff --git a/raspberry-serial/push.py b/raspberry-serial/push.py
deleted file mode 100644
index 2a70d806f..000000000
--- a/raspberry-serial/push.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Push data live to API using Python on a RaspberryPi
-#
-
-import serial
-from utils import parse_data, send_data
-
-ser = serial.Serial('/dev/ttyACM0')
-while True:
- message = ser.readline()
- data = parse_data(message)
- if data:
- send_data(data)
diff --git a/raspberry-serial/raspberry.md b/raspberry-serial/raspberry.md
deleted file mode 100644
index 54be15194..000000000
--- a/raspberry-serial/raspberry.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# Particulates sensor usage with RaspberryPi
-
-
-## Usage
-
-Connect sensor with Arduino via usb to RaspberryPi.
-The Arduino has the serial software for the sensor installed and prints the sensor results.
-A python script is pushing the results to our API endpoint.
-
-
-## Install dependencies
-
-for raspbian
-
-```
-# for push
-sudo apt-get update
-sudo apt-get install -y python-requests python-serial
-# for logtofile
-sudo apt-get install -y python-pip
-sudo pip install pytz
-```
-
-checkout the source repository
-
-```
-cd /home/pi
-git clone https://github.com/opendata-stuttgart/sensors-software.git
-```
-
-
-## IMPORTANT
-
-set SENSOR_UID in push.py !!
-
-## run to log live
-
-```
-python push.py
-```
-
-## run to write to file
-
-```
-python logtofile.py
-```
-
-
-## autorun logotfile.py on startup
-
-add this to your ``/etc/rc.local``:
-
-```
-/bin/sleep 15 && python /home/pi/sensors-software/raspberry-serial/logtofile.py
-```
-
-before the ``exit 0`` line
-
-## send data to server later
-
-```
-python send.py
-```
diff --git a/raspberry-serial/send.py b/raspberry-serial/send.py
deleted file mode 100644
index e807cda4e..000000000
--- a/raspberry-serial/send.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# send file to API
-#
-#
-import json
-import sys
-
-from sensor import (
- SensorDSM501A,
- SensorGP2Y10,
- SensorPPD42NS,
- SensorSHT10,
- SensorBMP180,
-)
-
-if len(sys.argv) != 2:
- print("python send.py ")
-
-# get type from filename
-filename = sys.argv[1]
-for cls in (SensorDSM501A, SensorGP2Y10, SensorPPD42NS,
- SensorSHT10, SensorBMP180):
- if filename.lower().endswith(cls.sensor_type.lower()):
- instance = cls()
- break
-
-assert instance
-
-with open(filename, 'r') as fp:
- for line in fp.readlines():
- timestamp = line.split('|')[0]
-
- data = json.loads(line.split('|')[1])
- data = instance.filter(data)
- if data:
- print(data)
-# instance.send(data, timestamp)
diff --git a/raspberry-serial/sensor.py b/raspberry-serial/sensor.py
deleted file mode 100644
index 08d2e9163..000000000
--- a/raspberry-serial/sensor.py
+++ /dev/null
@@ -1,115 +0,0 @@
-from datetime import datetime
-import requests
-import pytz
-import json
-from config import settings
-
-
-class Sensor(object):
-
- sensor_type = None
- sampling_rate = None
-# url = "http://localhost:8000/v1/push-sensor-data/"
- url = "https://api.dusti.xyz/v1/push-sensor-data/"
- whitelist = []
-
- def __init__(self, filename=None):
- if self.sensor_type:
- self.sensor_uid = 'SENSOR_{}_UID'.format(self.sensor_type)
- else:
- self.sensor_uid = 'SENSOR_UID'
- if filename:
- self.filename = "{}.{}".format(filename, self.sensor_type)
-
- def filter(self, json_data, prefix=False):
- # filter all fields not in whitelist
- data = {}
- for key in json_data.keys():
- if prefix:
- key_prefix = key.split('_')[0]
- if key_prefix.lower() != self.sensor_type.lower():
- continue
- key_suffix = '_'.join(key.split('_')[1:])
- else:
- key_suffix = key
- if key_suffix in self.whitelist:
- data[key_suffix] = json_data[key]
- return data
-
- def check(self, message):
- # some checks to elimanate some of the 400s from the API
- if ':' not in message:
- return False
- if ';' not in message:
- return False
- if len(message.split(':')) != len(message.split(';')) + 1:
- return False
- return True
-
- def parse(self, message):
- if not self.check(message):
- return False
- json_data = dict(map(lambda x: x.split(':'),
- message.strip().split(';')))
- return self.filter(json_data, prefix=True)
-
- def send(self, data, timestamp=None):
- payload = {
- "sampling_rate": self.sampling_rate,
- "sensordatavalues": []
- }
- if timestamp:
- payload['timestamp'] = timestamp
-
- for key, value in data.iteritems():
- d = {'value': value, 'value_type': key}
- payload['sensordatavalues'].append(d)
-
- headers = {'SENSOR': settings.get(self.sensor_uid),
- 'Content-Type': 'application/json'}
- r = requests.post(self.url, data=json.dumps(payload),
- headers=headers, verify=False)
- print(r.status_code)
- print(r.text)
-
- def log(self, data):
- dt = str(pytz.timezone('Europe/Berlin').localize(datetime.now()))
- line = "{}| {}\n".format(dt, json.dumps(data))
- with open(self.filename, "a") as fp:
- print(line.strip())
- fp.write(line)
-
-
-class SensorPPD42NS(Sensor):
-
- sensor_type = 'PPD42NS'
- sampling_rate = '15000'
- whitelist = ['P1', 'P2', 'durP1', 'durP2', 'ratioP1', 'ratioP2']
-
-
-class SensorSHT10(Sensor):
-
- sensor_type = 'SHT10'
- sampling_rate = None
- whitelist = ['temperature', 'humidity']
-
-
-class SensorGP2Y10(Sensor):
-
- sensor_type = 'GP2Y1010AU0F'
- sampling_rate = '40'
- whitelist = ['vo_raw', 'voltage', 'dust_density']
-
-
-class SensorDSM501A(Sensor):
-
- sensor_type = 'dsm501a'
- sampling_rate = '15000'
- whitelist = ['P10', 'P25', 'durP10', 'durP25', 'ratioP10', 'ratioP25']
-
-
-class SensorBMP180(Sensor):
-
- sensor_type = 'BMP180'
- sampling_rate = None
- whitelist = ['temperature', 'pressure', 'altitude', 'pressure_sealevel']
diff --git a/read_delete_file/.gitignore b/read_delete_file/.gitignore
deleted file mode 100644
index 03f4a3c19..000000000
--- a/read_delete_file/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.pio
diff --git a/read_delete_file/.pio/build/nodemcuv2/.sconsign36.dblite b/read_delete_file/.pio/build/nodemcuv2/.sconsign36.dblite
deleted file mode 100644
index f441dfcf3..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/.sconsign36.dblite and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Crypto.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Crypto.cpp.o
deleted file mode 100644
index 2fecf6a41..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Crypto.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Esp-frag.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Esp-frag.cpp.o
deleted file mode 100644
index a17d7d8a3..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Esp-frag.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Esp-version.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Esp-version.cpp.o
deleted file mode 100644
index 0b5a3a489..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Esp-version.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Esp.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Esp.cpp.o
deleted file mode 100644
index ca9162855..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Esp.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/FS.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/FS.cpp.o
deleted file mode 100644
index 21544fea3..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/FS.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/FSnoop.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/FSnoop.cpp.o
deleted file mode 100644
index f1e9e68b8..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/FSnoop.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/FunctionalInterrupt.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/FunctionalInterrupt.cpp.o
deleted file mode 100644
index 4fc9e3649..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/FunctionalInterrupt.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/HardwareSerial.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/HardwareSerial.cpp.o
deleted file mode 100644
index 144787974..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/HardwareSerial.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/IPAddress.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/IPAddress.cpp.o
deleted file mode 100644
index ecdab24fe..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/IPAddress.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/MD5Builder.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/MD5Builder.cpp.o
deleted file mode 100644
index a3f9d81f4..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/MD5Builder.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Print.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Print.cpp.o
deleted file mode 100644
index d3c543413..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Print.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Schedule.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Schedule.cpp.o
deleted file mode 100644
index e30bea182..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Schedule.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/StackThunk.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/StackThunk.cpp.o
deleted file mode 100644
index eb104597a..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/StackThunk.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Stream.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Stream.cpp.o
deleted file mode 100644
index 232c45cff..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Stream.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/StreamString.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/StreamString.cpp.o
deleted file mode 100644
index 699d9c807..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/StreamString.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Tone.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Tone.cpp.o
deleted file mode 100644
index 61df0103a..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Tone.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/TypeConversion.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/TypeConversion.cpp.o
deleted file mode 100644
index 20f87ae5c..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/TypeConversion.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Updater.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Updater.cpp.o
deleted file mode 100644
index 9413284de..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/Updater.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/WMath.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/WMath.cpp.o
deleted file mode 100644
index 65a5b8dc7..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/WMath.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/WString.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/WString.cpp.o
deleted file mode 100644
index bfc7d07ff..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/WString.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/abi.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/abi.cpp.o
deleted file mode 100644
index a92ad4908..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/abi.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/base64.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/base64.cpp.o
deleted file mode 100644
index 1e2b7f79a..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/base64.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/cbuf.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/cbuf.cpp.o
deleted file mode 100644
index 0bfbdf360..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/cbuf.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/cont.S.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/cont.S.o
deleted file mode 100644
index ec434627b..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/cont.S.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/cont_util.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/cont_util.cpp.o
deleted file mode 100644
index 9257a1b24..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/cont_util.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_app_entry_noextra4k.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_app_entry_noextra4k.cpp.o
deleted file mode 100644
index 30b219438..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_app_entry_noextra4k.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_eboot_command.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_eboot_command.cpp.o
deleted file mode 100644
index fba3a0a52..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_eboot_command.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_features.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_features.cpp.o
deleted file mode 100644
index 6c77e2011..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_features.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_flash_quirks.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_flash_quirks.cpp.o
deleted file mode 100644
index a54b5087a..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_flash_quirks.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_flash_utils.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_flash_utils.cpp.o
deleted file mode 100644
index 108730aed..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_flash_utils.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_i2s.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_i2s.cpp.o
deleted file mode 100644
index 8782af6bb..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_i2s.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_main.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_main.cpp.o
deleted file mode 100644
index 73d60b4dc..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_main.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_noniso.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_noniso.cpp.o
deleted file mode 100644
index 1e87cffd8..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_noniso.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_phy.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_phy.cpp.o
deleted file mode 100644
index 7e72420e2..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_phy.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_postmortem.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_postmortem.cpp.o
deleted file mode 100644
index 4821420f9..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_postmortem.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_si2c.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_si2c.cpp.o
deleted file mode 100644
index c660066fe..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_si2c.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_sigma_delta.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_sigma_delta.cpp.o
deleted file mode 100644
index b6c0ef473..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_sigma_delta.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_spi_utils.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_spi_utils.cpp.o
deleted file mode 100644
index 7c6c41c91..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_spi_utils.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_timer.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_timer.cpp.o
deleted file mode 100644
index f181c1e6b..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_timer.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_waveform.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_waveform.cpp.o
deleted file mode 100644
index 9dd5fed43..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_waveform.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring.cpp.o
deleted file mode 100644
index fde6fc56e..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_analog.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_analog.cpp.o
deleted file mode 100644
index 91ced3034..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_analog.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_digital.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_digital.cpp.o
deleted file mode 100644
index 4c34a2695..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_digital.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_pulse.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_pulse.cpp.o
deleted file mode 100644
index 8ec7fbb50..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_pulse.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_pwm.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_pwm.cpp.o
deleted file mode 100644
index 707213aac..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_pwm.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_shift.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_shift.cpp.o
deleted file mode 100644
index 8d78105a8..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/core_esp8266_wiring_shift.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/crc32.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/crc32.cpp.o
deleted file mode 100644
index 55ac8e8e0..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/crc32.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/debug.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/debug.cpp.o
deleted file mode 100644
index 39c541038..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/debug.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/flash_hal.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/flash_hal.cpp.o
deleted file mode 100644
index e6350dc25..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/flash_hal.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/gdb_hooks.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/gdb_hooks.cpp.o
deleted file mode 100644
index d6f12e932..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/gdb_hooks.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/heap.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/heap.cpp.o
deleted file mode 100644
index f1839e8fa..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/heap.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/libb64/cdecode.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/libb64/cdecode.cpp.o
deleted file mode 100644
index 765b4847a..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/libb64/cdecode.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/libb64/cencode.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/libb64/cencode.cpp.o
deleted file mode 100644
index f93e0cba9..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/libb64/cencode.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/libc_replacements.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/libc_replacements.cpp.o
deleted file mode 100644
index d165afb7b..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/libc_replacements.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/sntp-lwip2.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/sntp-lwip2.cpp.o
deleted file mode 100644
index fc14d32aa..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/sntp-lwip2.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_cache.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_cache.cpp.o
deleted file mode 100644
index ba07e9eba..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_cache.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_check.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_check.cpp.o
deleted file mode 100644
index d0db17d94..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_check.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_gc.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_gc.cpp.o
deleted file mode 100644
index ee4628963..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_gc.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_hydrogen.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_hydrogen.cpp.o
deleted file mode 100644
index 5b06d7671..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_hydrogen.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_nucleus.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_nucleus.cpp.o
deleted file mode 100644
index 5e1e73c6b..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs/spiffs_nucleus.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs_api.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs_api.cpp.o
deleted file mode 100644
index 9ac9e58a7..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/spiffs_api.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/sqrt32.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/sqrt32.cpp.o
deleted file mode 100644
index 45ccfd518..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/sqrt32.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/time.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/time.cpp.o
deleted file mode 100644
index 588471c24..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/time.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/uart.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/uart.cpp.o
deleted file mode 100644
index c6fc5ac73..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/uart.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_info.c.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_info.c.o
deleted file mode 100644
index 420cdb284..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_info.c.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_integrity.c.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_integrity.c.o
deleted file mode 100644
index 1b576989d..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_integrity.c.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_local.c.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_local.c.o
deleted file mode 100644
index 502069e71..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_local.c.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_malloc.cpp.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_malloc.cpp.o
deleted file mode 100644
index 6d001eb3f..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_malloc.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_poison.c.o b/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_poison.c.o
deleted file mode 100644
index 008e449a1..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/FrameworkArduino/umm_malloc/umm_poison.c.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/firmware.bin b/read_delete_file/.pio/build/nodemcuv2/firmware.bin
deleted file mode 100644
index c39667d47..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/firmware.bin and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/firmware.elf b/read_delete_file/.pio/build/nodemcuv2/firmware.elf
deleted file mode 100755
index f5a3c67f2..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/firmware.elf and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/ld/local.eagle.app.v6.common.ld b/read_delete_file/.pio/build/nodemcuv2/ld/local.eagle.app.v6.common.ld
deleted file mode 100644
index 616a7d441..000000000
--- a/read_delete_file/.pio/build/nodemcuv2/ld/local.eagle.app.v6.common.ld
+++ /dev/null
@@ -1,265 +0,0 @@
-/* This linker script generated from xt-genldscripts.tpp for LSP . */
-/* Linker Script for ld -N */
-PHDRS
-{
- dport0_0_phdr PT_LOAD;
- dram0_0_phdr PT_LOAD;
- dram0_0_bss_phdr PT_LOAD;
- iram1_0_phdr PT_LOAD;
- irom0_0_phdr PT_LOAD;
-}
-/* Default entry point: */
-ENTRY(app_entry)
-EXTERN(_DebugExceptionVector)
-EXTERN(_DoubleExceptionVector)
-EXTERN(_KernelExceptionVector)
-EXTERN(_NMIExceptionVector)
-EXTERN(_UserExceptionVector)
-EXTERN(core_version)
-PROVIDE(_memmap_vecbase_reset = 0x40000000);
-/* Various memory-map dependent cache attribute settings: */
-_memmap_cacheattr_wb_base = 0x00000110;
-_memmap_cacheattr_wt_base = 0x00000110;
-_memmap_cacheattr_bp_base = 0x00000220;
-_memmap_cacheattr_unused_mask = 0xFFFFF00F;
-_memmap_cacheattr_wb_trapnull = 0x2222211F;
-_memmap_cacheattr_wba_trapnull = 0x2222211F;
-_memmap_cacheattr_wbna_trapnull = 0x2222211F;
-_memmap_cacheattr_wt_trapnull = 0x2222211F;
-_memmap_cacheattr_bp_trapnull = 0x2222222F;
-_memmap_cacheattr_wb_strict = 0xFFFFF11F;
-_memmap_cacheattr_wt_strict = 0xFFFFF11F;
-_memmap_cacheattr_bp_strict = 0xFFFFF22F;
-_memmap_cacheattr_wb_allvalid = 0x22222112;
-_memmap_cacheattr_wt_allvalid = 0x22222112;
-_memmap_cacheattr_bp_allvalid = 0x22222222;
-PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wb_trapnull);
-SECTIONS
-{
- .dport0.rodata : ALIGN(4)
- {
- _dport0_rodata_start = ABSOLUTE(.);
- *(.dport0.rodata)
- *(.dport.rodata)
- _dport0_rodata_end = ABSOLUTE(.);
- } >dport0_0_seg :dport0_0_phdr
- .dport0.literal : ALIGN(4)
- {
- _dport0_literal_start = ABSOLUTE(.);
- *(.dport0.literal)
- *(.dport.literal)
- _dport0_literal_end = ABSOLUTE(.);
- } >dport0_0_seg :dport0_0_phdr
- .dport0.data : ALIGN(4)
- {
- _dport0_data_start = ABSOLUTE(.);
- *(.dport0.data)
- *(.dport.data)
- _dport0_data_end = ABSOLUTE(.);
- } >dport0_0_seg :dport0_0_phdr
- .data : ALIGN(4)
- {
- _data_start = ABSOLUTE(.);
- *(.data)
- *(.data.*)
- *(.gnu.linkonce.d.*)
- *(.data1)
- *(.sdata)
- *(.sdata.*)
- *(.gnu.linkonce.s.*)
- *(.sdata2)
- *(.sdata2.*)
- *(.gnu.linkonce.s2.*)
- *(.jcr)
- . = ALIGN(4);
- _Pri_3_HandlerAddress = ABSOLUTE(.);
- _data_end = ABSOLUTE(.);
- } >dram0_0_seg :dram0_0_phdr
- .noinit : ALIGN(4)
- {
- *(.noinit)
- } >dram0_0_seg :dram0_0_phdr
- /* IRAM is split into .text and .text1 to allow for moving specific */
- /* functions into IRAM that would be matched by the irom0.text matcher */
- .text : ALIGN(4)
- {
- _stext = .;
- _text_start = ABSOLUTE(.);
- *(.UserEnter.text)
- . = ALIGN(16);
- *(.DebugExceptionVector.text)
- . = ALIGN(16);
- *(.NMIExceptionVector.text)
- . = ALIGN(16);
- *(.KernelExceptionVector.text)
- LONG(0)
- LONG(0)
- LONG(0)
- LONG(0)
- . = ALIGN(16);
- *(.UserExceptionVector.text)
- LONG(0)
- LONG(0)
- LONG(0)
- LONG(0)
- . = ALIGN(16);
- *(.DoubleExceptionVector.text)
- LONG(0)
- LONG(0)
- LONG(0)
- LONG(0)
- . = ALIGN (16);
- *(.entry.text)
- *(.init.literal)
- *(.init)
- *(.text.app_entry*) /* The main startup code */
- *(.text.gdbstub*, .text.gdb_init) /* Any GDB hooks */
- /* all functional callers are placed in IRAM (including SPI/IRQ callbacks/etc) here */
- *(.text._ZNKSt8functionIF*EE*) /* std::function::operator()() const */
- } >iram1_0_seg :iram1_0_phdr
- .irom0.text : ALIGN(4)
- {
- _irom0_text_start = ABSOLUTE(.);
- *(.ver_number)
- *.c.o(.literal*, .text*)
- *.cpp.o(EXCLUDE_FILE (umm_malloc.cpp.o) .literal*, EXCLUDE_FILE (umm_malloc.cpp.o) .text*)
- *.cc.o(.literal*, .text*)
- *(.rodata._ZTV*) /* C++ vtables */
- *libgcc.a:unwind-dw2.o(.literal .text .rodata .literal.* .text.* .rodata.*)
- *libgcc.a:unwind-dw2-fde.o(.literal .text .rodata .literal.* .text.* .rodata.*)
- *libc.a:(.literal .text .literal.* .text.*)
- *libm.a:(.literal .text .literal.* .text.*)
- *libgcc.a:_umoddi3.o(.literal .text)
- *libgcc.a:_udivdi3.o(.literal .text)
- *libstdc++.a:( .literal .text .literal.* .text.*)
- *libstdc++-exc.a:( .literal .text .literal.* .text.*)
- *libsmartconfig.a:(.literal .text .literal.* .text.*)
- *liblwip_gcc.a:(.literal .text .literal.* .text.*)
- *liblwip_src.a:(.literal .text .literal.* .text.*)
- *liblwip2-536.a:(.literal .text .literal.* .text.*)
- *liblwip2-1460.a:(.literal .text .literal.* .text.*)
- *liblwip2-536-feat.a:(.literal .text .literal.* .text.*)
- *liblwip2-1460-feat.a:(.literal .text .literal.* .text.*)
- *liblwip6-536-feat.a:(.literal .text .literal.* .text.*)
- *liblwip6-1460-feat.a:(.literal .text .literal.* .text.*)
- *libbearssl.a:(.literal .text .literal.* .text.*)
- *libaxtls.a:(.literal .text .literal.* .text.*)
- *libat.a:(.literal.* .text.*)
- *libcrypto.a:(.literal.* .text.*)
- *libespnow.a:(.literal.* .text.*)
- *libjson.a:(.literal.* .text.*)
- *liblwip.a:(.literal.* .text.*)
- *libmesh.a:(.literal.* .text.*)
- *libnet80211.a:(.literal.* .text.*)
- *libsmartconfig.a:(.literal.* .text.*)
- *libssl.a:(.literal.* .text.*)
- *libupgrade.a:(.literal.* .text.*)
- *libwpa.a:(.literal.* .text.*)
- *libwpa2.a:(.literal.* .text.*)
- *libwps.a:(.literal.* .text.*)
- *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom0.text.* .irom.text .irom.text.*)
- /* Constant strings in flash (PSTRs) */
- *(.irom0.pstr.*)
- /* __FUNCTION__ locals */
- *(.rodata._ZZ*__FUNCTION__)
- *(.rodata._ZZ*__PRETTY_FUNCTION__)
- *(.rodata._ZZ*__func__)
- /* std::* exception strings, in their own section to allow string coalescing */
- *(.irom.exceptiontext)
- /* c++ typeof IDs, etc. */
- *(.rodata._ZTIN* .rodata._ZTSN10* .rodata._ZTISt* .rodata._ZTSSt*)
- /* Fundamental type info */
- *(.rodata._ZTIPKc .rodata._ZTIc .rodata._ZTIv .rodata._ZTSv .rodata._ZTSc .rodata._ZTSPKc .rodata._ZTSi .rodata._ZTIi)
- . = ALIGN(4);
- *(.gcc_except_table .gcc_except_table.*)
- . = ALIGN(4);
- __eh_frame = ABSOLUTE(.);
- KEEP(*(.eh_frame))
- . = (. + 7) & ~ 3; /* Add a 0 entry to terminate the list */
- _irom0_text_end = ABSOLUTE(.);
- _flash_code_end = ABSOLUTE(.);
- } >irom0_0_seg :irom0_0_phdr
- .text1 : ALIGN(4)
- {
- *(.literal .text .iram.literal .iram.text .iram.text.* .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
- *(.fini.literal)
- *(.fini)
- *(.gnu.version)
- _text_end = ABSOLUTE(.);
- _etext = .;
- } >iram1_0_seg :iram1_0_phdr
- .rodata : ALIGN(4)
- {
- _rodata_start = ABSOLUTE(.);
- *(.sdk.version)
- *(.rodata)
- *(.rodata.*)
- *(.gnu.linkonce.r.*)
- *(.rodata1)
- __XT_EXCEPTION_TABLE__ = ABSOLUTE(.);
- *(.xt_except_table)
- *(.gcc_except_table)
- *(.gnu.linkonce.e.*)
- *(.gnu.version_r)
- *(.eh_frame)
- . = (. + 3) & ~ 3;
- /* C++ constructor and destructor tables, properly ordered: */
- __init_array_start = ABSOLUTE(.);
- KEEP (*crtbegin.o(.ctors))
- KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
- KEEP (*(SORT(.ctors.*)))
- KEEP (*(.ctors))
- __init_array_end = ABSOLUTE(.);
- KEEP (*crtbegin.o(.dtors))
- KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
- KEEP (*(SORT(.dtors.*)))
- KEEP (*(.dtors))
- /* C++ exception handlers table: */
- __XT_EXCEPTION_DESCS__ = ABSOLUTE(.);
- *(.xt_except_desc)
- *(.gnu.linkonce.h.*)
- __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.);
- *(.xt_except_desc_end)
- *(.dynamic)
- *(.gnu.version_d)
- . = ALIGN(4); /* this table MUST be 4-byte aligned */
- _bss_table_start = ABSOLUTE(.);
- LONG(_bss_start)
- LONG(_bss_end)
- _bss_table_end = ABSOLUTE(.);
- _rodata_end = ABSOLUTE(.);
- } >dram0_0_seg :dram0_0_phdr
- .bss ALIGN(8) (NOLOAD) : ALIGN(4)
- {
- . = ALIGN (8);
- _bss_start = ABSOLUTE(.);
- *(.dynsbss)
- *(.sbss)
- *(.sbss.*)
- *(.gnu.linkonce.sb.*)
- *(.scommon)
- *(.sbss2)
- *(.sbss2.*)
- *(.gnu.linkonce.sb2.*)
- *(.dynbss)
- *(.bss)
- *(.bss.*)
- *(.gnu.linkonce.b.*)
- *(COMMON)
- . = ALIGN (8);
- _bss_end = ABSOLUTE(.);
- _heap_start = ABSOLUTE(.);
-/* _stack_sentry = ALIGN(0x8); */
- } >dram0_0_seg :dram0_0_bss_phdr
-/* __stack = 0x3ffc8000; */
- .lit4 : ALIGN(4)
- {
- _lit4_start = ABSOLUTE(.);
- *(*.lit4)
- *(.lit4.*)
- *(.gnu.linkonce.lit4.*)
- _lit4_end = ABSOLUTE(.);
- } >iram1_0_seg :iram1_0_phdr
-}
-/* get ROM code address */
-INCLUDE "../ld/eagle.rom.addr.v6.ld"
diff --git a/read_delete_file/.pio/build/nodemcuv2/libFrameworkArduino.a b/read_delete_file/.pio/build/nodemcuv2/libFrameworkArduino.a
deleted file mode 100644
index 8085c273c..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/libFrameworkArduino.a and /dev/null differ
diff --git a/read_delete_file/.pio/build/nodemcuv2/libFrameworkArduinoVariant.a b/read_delete_file/.pio/build/nodemcuv2/libFrameworkArduinoVariant.a
deleted file mode 100644
index 8b277f0dd..000000000
--- a/read_delete_file/.pio/build/nodemcuv2/libFrameworkArduinoVariant.a
+++ /dev/null
@@ -1 +0,0 @@
-!
diff --git a/read_delete_file/.pio/build/nodemcuv2/src/main.cpp.o b/read_delete_file/.pio/build/nodemcuv2/src/main.cpp.o
deleted file mode 100644
index b8f53bf29..000000000
Binary files a/read_delete_file/.pio/build/nodemcuv2/src/main.cpp.o and /dev/null differ
diff --git a/read_delete_file/.pio/build/project.checksum b/read_delete_file/.pio/build/project.checksum
deleted file mode 100644
index b8676bad9..000000000
--- a/read_delete_file/.pio/build/project.checksum
+++ /dev/null
@@ -1 +0,0 @@
-f5c5265a818737e5fe189c29b844411f6d03628b
\ No newline at end of file
diff --git a/read_delete_file/include/README b/read_delete_file/include/README
deleted file mode 100644
index 194dcd432..000000000
--- a/read_delete_file/include/README
+++ /dev/null
@@ -1,39 +0,0 @@
-
-This directory is intended for project header files.
-
-A header file is a file containing C declarations and macro definitions
-to be shared between several project source files. You request the use of a
-header file in your project source file (C, C++, etc) located in `src` folder
-by including it, with the C preprocessing directive `#include'.
-
-```src/main.c
-
-#include "header.h"
-
-int main (void)
-{
- ...
-}
-```
-
-Including a header file produces the same results as copying the header file
-into each source file that needs it. Such copying would be time-consuming
-and error-prone. With a header file, the related declarations appear
-in only one place. If they need to be changed, they can be changed in one
-place, and programs that include the header file will automatically use the
-new version when next recompiled. The header file eliminates the labor of
-finding and changing all the copies as well as the risk that a failure to
-find one copy will result in inconsistencies within a program.
-
-In C, the usual convention is to give header files names that end with `.h'.
-It is most portable to use only letters, digits, dashes, and underscores in
-header file names, and at most one dot.
-
-Read more about using header files in official GCC documentation:
-
-* Include Syntax
-* Include Operation
-* Once-Only Headers
-* Computed Includes
-
-https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
diff --git a/read_delete_file/lib/README b/read_delete_file/lib/README
deleted file mode 100644
index 6debab1e8..000000000
--- a/read_delete_file/lib/README
+++ /dev/null
@@ -1,46 +0,0 @@
-
-This directory is intended for project specific (private) libraries.
-PlatformIO will compile them to static libraries and link into executable file.
-
-The source code of each library should be placed in a an own separate directory
-("lib/your_library_name/[here are source files]").
-
-For example, see a structure of the following two libraries `Foo` and `Bar`:
-
-|--lib
-| |
-| |--Bar
-| | |--docs
-| | |--examples
-| | |--src
-| | |- Bar.c
-| | |- Bar.h
-| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
-| |
-| |--Foo
-| | |- Foo.c
-| | |- Foo.h
-| |
-| |- README --> THIS FILE
-|
-|- platformio.ini
-|--src
- |- main.c
-
-and a contents of `src/main.c`:
-```
-#include
-#include
-
-int main (void)
-{
- ...
-}
-
-```
-
-PlatformIO Library Dependency Finder will find automatically dependent
-libraries scanning project source files.
-
-More information about PlatformIO Library Dependency Finder
-- https://docs.platformio.org/page/librarymanager/ldf.html
diff --git a/read_delete_file/platformio.ini b/read_delete_file/platformio.ini
deleted file mode 100644
index 6bb127a4f..000000000
--- a/read_delete_file/platformio.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-; PlatformIO Project Configuration File
-;
-; Build options: build flags, source filter
-; Upload options: custom upload port, speed and extra flags
-; Library options: dependencies, extra library storages
-; Advanced options: extra scripting
-;
-; Please visit documentation for the other options and examples
-; https://docs.platformio.org/page/projectconf.html
-
-[env:nodemcuv2]
-platform = espressif8266
-board = nodemcuv2
-framework = arduino
diff --git a/read_delete_file/src/main.cpp b/read_delete_file/src/main.cpp
deleted file mode 100644
index 908efa250..000000000
--- a/read_delete_file/src/main.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Blink
- *
- * Turns on an LED on for one second,
- * then off for one second, repeatedly.
- */
-#include
-
-static void writeDataFile(String data) {
- File dataFile = SPIFFS.open(F("/data1.json"), "w");
- if (dataFile) {
- dataFile.println(data);
- dataFile.close();
- }
- // debug_outln_info(F("Data written successfully."));
- // } else {
- // debug_outln_error(F("failed to open data file for writing"));
- // }
-}
-
-void setup()
-{
- // initialize LED digital pin as an output.
- SPIFFS.begin();
- Serial.begin(9600);
-}
-
-void loop()
-{
- // turn the LED on (HIGH is the voltage level)
- // File f = SPIFFS.open(F("/data1.json"), "w");
-
- // wait for a second
- delay(1000);
- // String kk = "hello";
- // // f.println(kk);
- // // f.close();
- // writeDataFile(String("hello"));
-
- File f1 = SPIFFS.open(F("/data.json"), "r");
- Serial.println(F("Reading Data from File:"));
- //Data from file
- int i;
- char st;
- Serial.println(String(f1.size()));
- for(i=0;i> Creation date: Sa 20 Jun 2015 21:03:56 CEST
-#Cmp ( order = Reference )
-| 1mF1 C ; ~ ; ; ; ; ; ; ; ;
-| K1 DHT11 ; ; ; ; ; ; ; ; ;
-| P1 5V ; ~ ; ; ; ; ; ; ; ;
-| P2 3.3V ; ~ ; ; ; ; ; ; ; ;
-| P3 3.3V ; ~ ; ; ; ; ; ; ; ;
-| P4 CONN_5 ; ; ; ; ; ; ; ; ;
-| P5 A4 ; ~ ; ; ; ; ; ; ; ;
-| P6 A5 ; ~ ; ; ; ; ; ; ; ;
-| P7 D2 ; ~ ; ; ; ; ; ; ; ;
-| P8 A0 ; ~ ; ; ; ; ; ; ; ;
-| P9 GND ; ~ ; ; ; ; ; ; ; ;
-| R1 10k ; ~ ; ; ; ; ; ; ; ;
-| R2 18K ; ~ ; ; ; ; ; ; ; ;
-| R3 PHOTO ; ~ ; ; ; ; ; ; ; ;
-#End Cmp
-
-#Cmp ( order = Value )
-| C 1mF1 ; ~ ; ; ; ; ; ; ; ;
-| DHT11 K1 ; ; ; ; ; ; ; ; ;
-| 3.3V P2 ; ~ ; ; ; ; ; ; ; ;
-| 3.3V P3 ; ~ ; ; ; ; ; ; ; ;
-| CONN_5 P4 ; ; ; ; ; ; ; ; ;
-| 5V P1 ; ~ ; ; ; ; ; ; ; ;
-| A4 P5 ; ~ ; ; ; ; ; ; ; ;
-| A5 P6 ; ~ ; ; ; ; ; ; ; ;
-| D2 P7 ; ~ ; ; ; ; ; ; ; ;
-| A0 P8 ; ~ ; ; ; ; ; ; ; ;
-| GND P9 ; ~ ; ; ; ; ; ; ; ;
-| 10k R1 ; ~ ; ; ; ; ; ; ; ;
-| 18K R2 ; ~ ; ; ; ; ; ; ; ;
-| PHOTO R3 ; ~ ; ; ; ; ; ; ; ;
-#End Cmp
-
-#End List
diff --git a/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.net b/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.net
deleted file mode 100644
index 554a19201..000000000
--- a/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.net
+++ /dev/null
@@ -1,172 +0,0 @@
-(export (version D)
- (design
- (source /home/mfa/git/sensors-software/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.sch)
- (date "Sa 20 Jun 2015 21:01:27 CEST")
- (tool "eeschema (2013-jul-07)-stable"))
- (components
- (comp (ref P8)
- (value A0)
- (libsource (lib device) (part CONNECTOR))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585A973))
- (comp (ref P4)
- (value CONN_5)
- (libsource (lib conn) (part CONN_5))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585AB0F))
- (comp (ref K1)
- (value DHT11)
- (libsource (lib conn) (part CONN_3))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585AB1E))
- (comp (ref R1)
- (value 10k)
- (libsource (lib device) (part R))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585AB3B))
- (comp (ref R2)
- (value 18K)
- (libsource (lib device) (part R))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585AB4A))
- (comp (ref 1mF1)
- (value C)
- (libsource (lib device) (part C))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585AB59))
- (comp (ref P7)
- (value D2)
- (libsource (lib device) (part CONNECTOR))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585AEBA))
- (comp (ref P6)
- (value A5)
- (libsource (lib device) (part CONNECTOR))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585AF63))
- (comp (ref P5)
- (value A4)
- (libsource (lib device) (part CONNECTOR))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585AF70))
- (comp (ref P3)
- (value 3.3V)
- (libsource (lib device) (part CONNECTOR))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585AFF6))
- (comp (ref P2)
- (value 3.3V)
- (libsource (lib device) (part CONNECTOR))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585B008))
- (comp (ref P1)
- (value 5V)
- (libsource (lib device) (part CONNECTOR))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585B00E))
- (comp (ref P9)
- (value GND)
- (libsource (lib device) (part CONNECTOR))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585B019))
- (comp (ref R3)
- (value PHOTO)
- (libsource (lib device) (part R))
- (sheetpath (names /) (tstamps /))
- (tstamp 5585B733)))
- (libparts
- (libpart (lib device) (part C)
- (description "Condensateur non polarise")
- (footprints
- (fp SM*)
- (fp C?)
- (fp C1-1))
- (fields
- (field (name Reference) C)
- (field (name Value) C)
- (field (name Footprint) ~)
- (field (name Datasheet) ~))
- (pins
- (pin (num 1) (name ~) (type passive))
- (pin (num 2) (name ~) (type passive))))
- (libpart (lib device) (part CONNECTOR)
- (fields
- (field (name Reference) P)
- (field (name Value) CONNECTOR)
- (field (name Footprint) ~)
- (field (name Datasheet) ~))
- (pins
- (pin (num 1) (name W) (type passive))))
- (libpart (lib device) (part R)
- (description Resistance)
- (footprints
- (fp R?)
- (fp SM0603)
- (fp SM0805)
- (fp R?-*)
- (fp SM1206))
- (fields
- (field (name Reference) R)
- (field (name Value) R)
- (field (name Footprint) ~)
- (field (name Datasheet) ~))
- (pins
- (pin (num 1) (name ~) (type passive))
- (pin (num 2) (name ~) (type passive))))
- (libpart (lib conn) (part CONN_3)
- (description "Symbole general de connecteur")
- (fields
- (field (name Reference) K)
- (field (name Value) CONN_3))
- (pins
- (pin (num 1) (name P1) (type passive))
- (pin (num 2) (name PM) (type passive))
- (pin (num 3) (name P3) (type passive))))
- (libpart (lib conn) (part CONN_5)
- (description "Symbole general de connecteur")
- (fields
- (field (name Reference) P)
- (field (name Value) CONN_5))
- (pins
- (pin (num 1) (name ~) (type passive))
- (pin (num 2) (name ~) (type passive))
- (pin (num 3) (name ~) (type passive))
- (pin (num 4) (name ~) (type passive))
- (pin (num 5) (name ~) (type passive)))))
- (libraries
- (library (logical device)
- (uri /usr/share/kicad/library/device.lib))
- (library (logical conn)
- (uri /usr/share/kicad/library/conn.lib)))
- (nets
- (net (code 1) (name "")
- (node (ref P4) (pin 3))
- (node (ref P6) (pin 1)))
- (net (code 2) (name "")
- (node (ref P4) (pin 2))
- (node (ref P5) (pin 1)))
- (net (code 3) (name "")
- (node (ref P7) (pin 1))
- (node (ref R1) (pin 2))
- (node (ref K1) (pin 1)))
- (net (code 4) (name GND)
- (node (ref 1mF1) (pin 2))
- (node (ref K1) (pin 3))
- (node (ref P4) (pin 5))
- (node (ref P4) (pin 4))
- (node (ref R3) (pin 2))
- (node (ref P9) (pin 1)))
- (net (code 5) (name +3.3V)
- (node (ref P3) (pin 1))
- (node (ref P2) (pin 1))
- (node (ref P4) (pin 1)))
- (net (code 6) (name +5V)
- (node (ref P1) (pin 1))
- (node (ref K1) (pin 2))
- (node (ref R1) (pin 1))
- (node (ref R2) (pin 1)))
- (net (code 7) (name "")
- (node (ref P8) (pin 1))
- (node (ref R3) (pin 1))
- (node (ref R2) (pin 2))
- (node (ref 1mF1) (pin 1)))))
\ No newline at end of file
diff --git a/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.pro b/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.pro
deleted file mode 100644
index 6f0964ba5..000000000
--- a/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.pro
+++ /dev/null
@@ -1,86 +0,0 @@
-update=Sa 20 Jun 2015 20:41:09 CEST
-version=1
-last_client=pcbnew
-[cvpcb]
-version=1
-NetIExt=net
-[cvpcb/libraries]
-EquName1=devcms
-[eeschema]
-version=1
-LibDir=
-NetFmtName=
-RptD_X=0
-RptD_Y=100
-RptLab=1
-LabSize=60
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=valves
-[general]
-version=1
-[pcbnew]
-version=1
-LastNetListRead=arduino--sht11-dht11-bmp180-photoresistor.net
-UseCmpFile=0
-PadDrill=" 0,600000"
-PadDrillOvalY=" 0,600000"
-PadSizeH=" 1,000000"
-PadSizeV=" 1,000000"
-PcbTextSizeV=" 1,000000"
-PcbTextSizeH=" 1,000000"
-PcbTextThickness=" 0,300000"
-ModuleTextSizeV=" 1,000000"
-ModuleTextSizeH=" 1,000000"
-ModuleTextSizeThickness=" 0,150000"
-SolderMaskClearance=" 0,000000"
-SolderMaskMinWidth=" 0,000000"
-DrawSegmentWidth=" 0,200000"
-BoardOutlineThickness=" 0,150000"
-ModuleOutlineThickness=" 0,150000"
-[pcbnew/libraries]
-LibDir=
-LibName1=sockets
-LibName2=connect
-LibName3=discret
-LibName4=pin_array
-LibName5=divers
-LibName6=smd_capacitors
-LibName7=smd_resistors
-LibName8=smd_crystal&oscillator
-LibName9=smd_dil
-LibName10=smd_transistors
-LibName11=libcms
-LibName12=display
-LibName13=led
-LibName14=dip_sockets
-LibName15=pga_sockets
-LibName16=valves
diff --git a/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.sch b/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.sch
deleted file mode 100644
index e9f08e0bf..000000000
--- a/schematics/arduino--sht11-dht11-bmp180-photoresistor/arduino--sht11-dht11-bmp180-photoresistor.sch
+++ /dev/null
@@ -1,337 +0,0 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 27 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date "20 jun 2015"
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L CONNECTOR P8
-U 1 1 5585A973
-P 5500 2050
-F 0 "P8" H 5850 2150 70 0000 C CNN
-F 1 "A0" H 5850 1950 70 0000 C CNN
-F 2 "~" H 5500 2050 60 0000 C CNN
-F 3 "~" H 5500 2050 60 0000 C CNN
- 1 5500 2050
- 1 0 0 -1
-$EndComp
-$Comp
-L +3.3V #PWR01
-U 1 1 5585A9C5
-P 2300 2400
-F 0 "#PWR01" H 2300 2360 30 0001 C CNN
-F 1 "+3.3V" H 2300 2510 30 0000 C CNN
-F 2 "" H 2300 2400 60 0000 C CNN
-F 3 "" H 2300 2400 60 0000 C CNN
- 1 2300 2400
- 1 0 0 -1
-$EndComp
-$Comp
-L +5V #PWR02
-U 1 1 5585A9D4
-P 3100 1650
-F 0 "#PWR02" H 3100 1740 20 0001 C CNN
-F 1 "+5V" H 3100 1740 30 0000 C CNN
-F 2 "" H 3100 1650 60 0000 C CNN
-F 3 "" H 3100 1650 60 0000 C CNN
- 1 3100 1650
- 1 0 0 -1
-$EndComp
-$Comp
-L GND #PWR03
-U 1 1 5585A9E3
-P 6050 3400
-F 0 "#PWR03" H 6050 3400 30 0001 C CNN
-F 1 "GND" H 6050 3330 30 0001 C CNN
-F 2 "" H 6050 3400 60 0000 C CNN
-F 3 "" H 6050 3400 60 0000 C CNN
- 1 6050 3400
- 1 0 0 -1
-$EndComp
-$Comp
-L CONN_5 P4
-U 1 1 5585AB0F
-P 1900 3300
-F 0 "P4" V 1850 3300 50 0000 C CNN
-F 1 "CONN_5" V 1950 3300 50 0000 C CNN
-F 2 "" H 1900 3300 60 0000 C CNN
-F 3 "" H 1900 3300 60 0000 C CNN
- 1 1900 3300
- -1 0 0 -1
-$EndComp
-$Comp
-L CONN_3 K1
-U 1 1 5585AB1E
-P 3950 2250
-F 0 "K1" V 3900 2250 50 0000 C CNN
-F 1 "DHT11" V 4000 2250 40 0000 C CNN
-F 2 "" H 3950 2250 60 0000 C CNN
-F 3 "" H 3950 2250 60 0000 C CNN
- 1 3950 2250
- 1 0 0 -1
-$EndComp
-$Comp
-L R R1
-U 1 1 5585AB3B
-P 3450 1800
-F 0 "R1" V 3530 1800 40 0000 C CNN
-F 1 "10k" V 3457 1801 40 0000 C CNN
-F 2 "~" V 3380 1800 30 0000 C CNN
-F 3 "~" H 3450 1800 30 0000 C CNN
- 1 3450 1800
- 0 -1 -1 0
-$EndComp
-$Comp
-L R R2
-U 1 1 5585AB4A
-P 4950 1800
-F 0 "R2" V 5030 1800 40 0000 C CNN
-F 1 "18K" V 4957 1801 40 0000 C CNN
-F 2 "~" V 4880 1800 30 0000 C CNN
-F 3 "~" H 4950 1800 30 0000 C CNN
- 1 4950 1800
- 1 0 0 -1
-$EndComp
-$Comp
-L C 1mF1
-U 1 1 5585AB59
-P 5150 2750
-F 0 "1mF1" H 5150 2850 40 0000 L CNN
-F 1 "C" H 5156 2665 40 0000 L CNN
-F 2 "~" H 5188 2600 30 0000 C CNN
-F 3 "~" H 5150 2750 60 0000 C CNN
- 1 5150 2750
- 1 0 0 -1
-$EndComp
-$Comp
-L CONNECTOR P7
-U 1 1 5585AEBA
-P 3700 1800
-F 0 "P7" H 4050 1900 70 0000 C CNN
-F 1 "D2" H 4050 1700 70 0000 C CNN
-F 2 "~" H 3700 1800 60 0000 C CNN
-F 3 "~" H 3700 1800 60 0000 C CNN
- 1 3700 1800
- 1 0 0 -1
-$EndComp
-$Comp
-L CONNECTOR P6
-U 1 1 5585AF63
-P 1800 2950
-F 0 "P6" H 2150 3050 70 0000 C CNN
-F 1 "A5" H 2150 2850 70 0000 C CNN
-F 2 "~" H 1800 2950 60 0000 C CNN
-F 3 "~" H 1800 2950 60 0000 C CNN
- 1 1800 2950
- -1 0 0 -1
-$EndComp
-$Comp
-L CONNECTOR P5
-U 1 1 5585AF70
-P 1800 2650
-F 0 "P5" H 2150 2750 70 0000 C CNN
-F 1 "A4" H 2150 2550 70 0000 C CNN
-F 2 "~" H 1800 2650 60 0000 C CNN
-F 3 "~" H 1800 2650 60 0000 C CNN
- 1 1800 2650
- -1 0 0 -1
-$EndComp
-$Comp
-L CONNECTOR P3
-U 1 1 5585AFF6
-P 1750 2100
-F 0 "P3" H 2100 2200 70 0000 C CNN
-F 1 "3.3V" H 2100 2000 70 0000 C CNN
-F 2 "~" H 1750 2100 60 0000 C CNN
-F 3 "~" H 1750 2100 60 0000 C CNN
- 1 1750 2100
- -1 0 0 -1
-$EndComp
-$Comp
-L CONNECTOR P2
-U 1 1 5585B008
-P 1750 1850
-F 0 "P2" H 2100 1950 70 0000 C CNN
-F 1 "3.3V" H 2100 1750 70 0000 C CNN
-F 2 "~" H 1750 1850 60 0000 C CNN
-F 3 "~" H 1750 1850 60 0000 C CNN
- 1 1750 1850
- -1 0 0 -1
-$EndComp
-$Comp
-L CONNECTOR P1
-U 1 1 5585B00E
-P 1800 1600
-F 0 "P1" H 2150 1700 70 0000 C CNN
-F 1 "5V" H 2150 1500 70 0000 C CNN
-F 2 "~" H 1800 1600 60 0000 C CNN
-F 3 "~" H 1800 1600 60 0000 C CNN
- 1 1800 1600
- -1 0 0 -1
-$EndComp
-$Comp
-L CONNECTOR P9
-U 1 1 5585B019
-P 6500 3400
-F 0 "P9" H 6850 3500 70 0000 C CNN
-F 1 "GND" H 6850 3300 70 0000 C CNN
-F 2 "~" H 6500 3400 60 0000 C CNN
-F 3 "~" H 6500 3400 60 0000 C CNN
- 1 6500 3400
- 1 0 0 -1
-$EndComp
-$Comp
-L PWR_FLAG #FLG04
-U 1 1 5585B45F
-P 4650 3250
-F 0 "#FLG04" H 4650 3345 30 0001 C CNN
-F 1 "PWR_FLAG" H 4650 3430 30 0000 C CNN
-F 2 "" H 4650 3250 60 0000 C CNN
-F 3 "" H 4650 3250 60 0000 C CNN
- 1 4650 3250
- 1 0 0 -1
-$EndComp
-$Comp
-L PWR_FLAG #FLG05
-U 1 1 5585B4E2
-P 2550 2000
-F 0 "#FLG05" H 2550 2095 30 0001 C CNN
-F 1 "PWR_FLAG" H 2550 2180 30 0000 C CNN
-F 2 "" H 2550 2000 60 0000 C CNN
-F 3 "" H 2550 2000 60 0000 C CNN
- 1 2550 2000
- 1 0 0 -1
-$EndComp
-$Comp
-L PWR_FLAG #FLG06
-U 1 1 5585B50E
-P 2600 2450
-F 0 "#FLG06" H 2600 2545 30 0001 C CNN
-F 1 "PWR_FLAG" H 2600 2630 30 0000 C CNN
-F 2 "" H 2600 2450 60 0000 C CNN
-F 3 "" H 2600 2450 60 0000 C CNN
- 1 2600 2450
- 1 0 0 -1
-$EndComp
-$Comp
-L R R3
-U 1 1 5585B733
-P 6050 1650
-F 0 "R3" V 6130 1650 40 0000 C CNN
-F 1 "PHOTO" V 6057 1651 40 0000 C CNN
-F 2 "~" V 5980 1650 30 0000 C CNN
-F 3 "~" H 6050 1650 30 0000 C CNN
- 1 6050 1650
- 1 0 0 -1
-$EndComp
-Wire Wire Line
- 4950 1550 3100 1550
-Wire Wire Line
- 3100 1550 3100 1650
-Wire Wire Line
- 5150 1400 5150 2550
-Connection ~ 5150 2050
-Wire Wire Line
- 6050 3400 6050 1900
-Connection ~ 6050 3400
-Wire Wire Line
- 3100 1600 3100 2250
-Wire Wire Line
- 3100 2250 3600 2250
-Connection ~ 3100 1600
-Wire Wire Line
- 3600 2350 3600 3500
-Wire Wire Line
- 2300 3400 6500 3400
-Wire Wire Line
- 3200 1800 3100 1800
-Connection ~ 3100 1800
-Wire Wire Line
- 3700 1800 3700 1950
-Wire Wire Line
- 3700 1950 3600 1950
-Wire Wire Line
- 3600 1950 3600 2150
-Wire Wire Line
- 2300 2400 2300 3100
-Connection ~ 3600 3400
-Wire Wire Line
- 2400 2650 2400 3200
-Wire Wire Line
- 2400 3200 2300 3200
-Wire Wire Line
- 2500 2950 2500 3300
-Wire Wire Line
- 2500 3300 2300 3300
-Wire Wire Line
- 1800 1850 1800 2450
-Wire Wire Line
- 1800 2450 2600 2450
-Connection ~ 2300 2450
-Wire Wire Line
- 1800 1600 3100 1600
-Wire Wire Line
- 4650 3250 4650 3400
-Connection ~ 4650 3400
-Wire Wire Line
- 2550 2000 3100 2000
-Connection ~ 3100 2000
-Connection ~ 6050 2550
-Wire Wire Line
- 3600 3500 2300 3500
-Wire Wire Line
- 5150 2950 6050 2950
-Connection ~ 6050 2950
-Wire Wire Line
- 6050 1400 5150 1400
-Wire Wire Line
- 4950 2050 5500 2050
-Wire Wire Line
- 1800 1850 1750 1850
-Wire Wire Line
- 1750 2100 1800 2100
-Connection ~ 1800 2100
-Wire Wire Line
- 2500 2950 1800 2950
-Wire Wire Line
- 2400 2650 1800 2650
-$EndSCHEMATC
diff --git a/schematics/readme.md b/schematics/readme.md
deleted file mode 100644
index 7e25b3d60..000000000
--- a/schematics/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Info
-
-Software used: Fritzing
-
-## Ubuntu
-
-```sudo apt-get install fritzing```
diff --git a/schematics/voltage-divider.fzz b/schematics/voltage-divider.fzz
deleted file mode 100644
index becc1505d..000000000
Binary files a/schematics/voltage-divider.fzz and /dev/null differ
diff --git a/airrohr-firmware/sps30_i2c.cpp b/sps30_i2c.cpp
similarity index 100%
rename from airrohr-firmware/sps30_i2c.cpp
rename to sps30_i2c.cpp
diff --git a/airrohr-firmware/sps30_i2c.h b/sps30_i2c.h
similarity index 100%
rename from airrohr-firmware/sps30_i2c.h
rename to sps30_i2c.h
diff --git a/airrohr-firmware/utils.cpp b/utils.cpp
similarity index 100%
rename from airrohr-firmware/utils.cpp
rename to utils.cpp
diff --git a/airrohr-firmware/utils.h b/utils.h
similarity index 100%
rename from airrohr-firmware/utils.h
rename to utils.h
diff --git a/utils/README.md b/utils/README.md
deleted file mode 100644
index 3c603b8c7..000000000
--- a/utils/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Utils
-
-Here are some utils, which may be used to do tasks around the fine dust sensor project.
-
-## External utils
-
-[Stress Test Scripts for MQTT using Python and Ansible](https://github.com/bluewindthings/mqtt-stress)
-
diff --git a/utils/analysis/geodata/README.md b/utils/analysis/geodata/README.md
deleted file mode 100644
index 54b1c5570..000000000
--- a/utils/analysis/geodata/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-This dataset is part of the Open Data Initiative datasets of LGL,
-
-https://www.lgl-bw.de/lgl-internet/opencms/de/07_Produkte_und_Dienstleistungen/Open_Data_Initiative/index.html
-
-Copyright/License: CC BY 3.0 (http://creativecommons.org/licenses/by/3.0/deed.de)
-Datenquelle: LGL, www.lgl-bw.de
-
-[Gemeinden (ZIP-Archiv mit SHAPE-Dateien, Stand 30.06.2015) (ZIP, 7.616 KB)](https://www.lgl-bw.de/lgl-internet/web/sites/default/de/07_Produkte_und_Dienstleistungen/Open_Data_Initiative/Galerien/Dokumente/Gemeindegrenzen.zip)
-
-
diff --git a/utils/analysis/plotmeans.R b/utils/analysis/plotmeans.R
deleted file mode 100644
index 75e5d35e2..000000000
--- a/utils/analysis/plotmeans.R
+++ /dev/null
@@ -1,57 +0,0 @@
-# plot the meansfiles created via subsample.py
-require(ggplot2)
-require(reshape2)
-require(plotly)
-source("read_sampled.R")
-
-ymax=200
-
-if (!"datadir"%in%ls()){datadir=""}
-if (!dir.exists(datadir)){
- print ("set datadir to valid dir, using .")
- datadir="."
-}
-
-measnames=c("P1","P2","temperature","humidity","numobs")
-legdata=data.frame("P1"=c("PM 10","[µm/m³]"),"P2"=c("PM 2.5","[µm/m³]"),"temperature"=c("Temperatur","[°C]"),"humidity"=c("Luftfeuchtigkeit","[%]"))
-
-for (meas in measnames){
- for (dh in c("daily","hourly")){
-
-# csvfn<-paste("all_",dh,"_",meas,".csv", sep="")
-# infilename<-file.path(datadir, csvfn)
-# if (!file.exists(infilename)){next;}
-# dat<-read.csv(infilename)
- dat<-read_sampled(meas,dh,datadir)
-
- # have the time parsed
- if (dh=="hourly"){
- # and add 30 minutes
- dat$ts<-as.POSIXct(strptime(as.character(dat$timestamp),"%Y-%m-%d %H:%M:%S")+30*60) # 2017-02-28 00:00:00
- }else{
- dat$ts<-as.POSIXct(strptime(as.character(dat$timestamp),"%Y-%m-%d")) # 2017-02-28
- }
- # deslect timestamp and
- d<-subset(dat, select=-timestamp)
- # melt data into long form
- m<-melt(d, id.vars="ts")
- # plot max value
- mx<-max(m[,"value"], na.rm=TRUE)
- if (mx>ymax){
- plotmax=ymax
- }else{
- plotmax=mx
- }
- pdffilen=paste(infilename,".pdf",sep="")
- pdf(pdffilen, width=40, height=10)
- p<-ggplot(m,aes(ts,value,color=variable))+geom_line()+ylim(0,plotmax)+ theme(legend.position="none")+labs(title=paste("Alle Sensoren:",legdata[1,meas]),x="Zeit",y=paste(legdata[1,meas],legdata[2,meas]))
- print(p)
- dev.off()
-
- htmlfilen=paste(csvfn,".html",sep="")
- oldwd=getwd()
- setwd(datadir)
- try(htmlwidgets::saveWidget(widget=ggplotly(p),file=htmlfilen, selfcontained = FALSE, libdir="html_libs"))
- setwd(oldwd)
- }
-}
\ No newline at end of file
diff --git a/utils/analysis/subsample.py b/utils/analysis/subsample.py
deleted file mode 100755
index 69998c085..000000000
--- a/utils/analysis/subsample.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env python3
-
-# subsample luftdaten.info data from archive.luftdaten.info
-# to hourly and daily means
-
-import pandas as pd
-import numpy as np
-import matplotlib.pyplot as plt
-import argparse
-import sys
-import os
-import csv
-# import ggplot # for plots, currently install borken
-
-# files are given on commandline
-
-parser = argparse.ArgumentParser(description='Process csv from archive,dljf API')
-parser.add_argument(metavar='J', type=str, nargs='+', dest='csvfilenames',
- help='csv files to be processed')
-parser.add_argument('-o', '--outdir', default='.', type=str, dest='outdir',
- help='outdir where files (.csv) are stored')
-
-args = parser.parse_args()
-
-# result dict hourly
-rdh={}
-# result dict daily
-rdd={}
-cnt=np.size(args.csvfilenames)
-for csvfilename in args.csvfilenames:
- with open(csvfilename) as f:
- cnt-=1;
- sys.stderr.write(str(cnt)+'.')
- sys.stderr.flush()
- try:
- dat=pd.read_csv(csvfilename, sep=";")
- if dat.size < 1:
- sys.stderr.write("no data in "+csvfilename)
- continue
- # Explicitly set utc after parsing
- dat.index=pd.DatetimeIndex(dat["timestamp"]).tz_localize('utc')
- # hourly
- h=dat.resample('H').mean()
- n=dat["timestamp"].resample('H').count()
- n.name='numobs'
- h=pd.concat([h,n],axis=1)
- sid=np.int(h["sensor_id"][0])
- rdh[sid]=pd.concat([rdh.get(sid),h])
- # daily
- d=dat.resample('D').mean()
- n=dat["timestamp"].resample('D').count()
- n.name='numobs'
- d=pd.concat([d,n],axis=1)
- rdd[sid]=pd.concat([rdd.get(sid),d])
- except Exception as e:
- sys.stderr.write("error processing "+csvfilename+"\n")
- # do this properly one day
- sys.stderr.write(str(e.args))
- sys.stderr.flush()
- continue
-
-if not os.path.exists(args.outdir):
- os.makedirs(args.outdir)
-
-# sort all dfs and write out to csv files
-for k in rdd.keys():
- ofilen=os.path.join(args.outdir, "sensor_hourly_"+str(k)+".csv")
- with open(ofilen, 'w') as o:
- rdh[k].sort_index().to_csv(o)
-
- ofilen=os.path.join(args.outdir, "sensor_daily_"+str(k)+".csv")
- with open(ofilen, 'w') as o:
- rdd[k].sort_index().to_csv(o)
-
-# dict of all sensors
-dasd={} # daily
-dash={} # hourly
-dasdc={} # daily counts
-dashc={} # hourly counts
-measurements=['P1','P2','temperature','humidity','numobs']
-for k in rdd.keys():
- for m in measurements:
- if m in rdd[k]:
- s=rdd[k][m]
- s.name=k
- dasd[m]=pd.concat([dasd.get(m),s],axis=1)
- if m in rdh[k]:
- s=rdh[k][m]
- s.name=k
- dash[m]=pd.concat([dash.get(m),s],axis=1)
-
-for m in measurements:
- ofilen=os.path.join(args.outdir, "all_hourly_"+str(m)+".csv")
- if m not in dash.keys():
- continue
- with open(ofilen, 'w') as o:
- dash[m].sort_index().to_csv(o)
- ofilen=os.path.join(args.outdir, "all_daily_"+str(m)+".csv")
- with open(ofilen, 'w') as o:
- dasd[m].sort_index().to_csv(o)
-
-
diff --git a/utils/android/README.md b/utils/android/README.md
deleted file mode 100644
index faa2e0b5f..000000000
--- a/utils/android/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# MobileFeinstaub App
-
-Die App MobileFeinstaub für Android erlaubt es, einen SDS011 Sensor mit einem Usb2serial Adapter per USB [OTG](https://de.wikipedia.org/wiki/Universal_Serial_Bus#USB_On-the-go)-Kabel direkt am Smartphone zu betreiben.
-
diff --git a/utils/downloadtools/README.md b/utils/downloadtools/README.md
deleted file mode 100644
index e9870cc92..000000000
--- a/utils/downloadtools/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Data download tools
-
-Please see this project for advanced downloads:
-https://pypi.org/project/luftdatenpumpe/
-
-
diff --git a/utils/flash/.gitignore b/utils/flash/.gitignore
deleted file mode 100644
index f24afa42d..000000000
--- a/utils/flash/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-mailconfig.sh
diff --git a/utils/flash/README.md b/utils/flash/README.md
deleted file mode 100644
index 43227ba54..000000000
--- a/utils/flash/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# Flashing firmware for luftdaten.info airrohr sensors
-
-## Airrohr Firmware Flasher
-
-
-Since 2019 there is a dedicated software for easy flashing of the firmware.
-It can be run on different operating systems and provides a GUI.
-On github you can find the [source code repository](https://github.com/opendata-stuttgart/airrohr-firmware-flasher) with [binary releases](https://github.com/opendata-stuttgart/airrohr-firmware-flasher/releases).
-It is an alternative to the script provided here.
-
-
-## Flash script for Linux
-
-[Here](https://github.com/opendata-stuttgart/sensors-software/tree/master/utils/flash) you find a tool for flashing an ESP8266 with the most recent firmware release of the fine dust measuring station.
-
-The script asks some more info, which is required by the admins to let the sensors data into the database.
-Usally, the device should be available on `/dev/ttyUSB0` (if you have no other usb2serial attached).
-The script makes use of two tools, both named esptool(.py):
-
-* one comes with the ESP8266 plugin for the the Android development IDE https://github.com/esp8266/arduino-esp8266fs-plugin
-* the other is a python script from https://github.com/themadinventor/esptool
-
-The script tries to find them in standard paths. You can set variables to point to them.
-
-## transcript of a flash session with the script (2016-11-26)
-
- export gitlocation=/path/to/gitrepoparent # change path here, or just cd into the right location
- cd $gitlocation/sensors-software/utils/flash
- ./flashlatest.sh
-
- usage: [esptool=/path/to/esptool] [esptoolpy=/path/to/esptool.py] [devserial=/dev/ttyUSB0] ./flashlatest.sh
- writes output to listofflashed.csv
- devserial=/dev/ttyUSB0 # define to change
-
- ask more infos? [Y/n]Y
- PM sensor revision (on back/flat side top left corner)? [default: ]V2-006
- PM sensor serial number (SN on sticker, besides fan, below barcode)? [default: ]5000-C537
- Adress? [like: 70000 Stuttgart, Staubweg 00]70000 Stuttgart, Staubweg 00
- Email? [like: unknown@example.com]
- latitude? [like: 00.0000]48.000
- longitude? [like: 00.0000]9.000
- DBID esp8266-2331040 0x002391a0 5c:cf:7f:23:91:a0 V2-006:5000-C537 @ 48.000 9.000 70000 Stuttgart, Staubweg 00 SID1 SNAME1 SID2 SNAME2
- patch Freifunk to XXXXXXXX? [y/N] N
- --2016-11-26 18:19:28-- https://www.madavi.de/sensor/update/data/latest.bin
- Auflösen des Hostnamen »www.madavi.de (www.madavi.de)«... 2a01:238:4202:e00:342a:970a:ad33:75fd, 85.214.240.94
- Verbindungsaufbau zu www.madavi.de (www.madavi.de)|2a01:238:4202:e00:342a:970a:ad33:75fd|:443... verbunden.
- HTTP-Anforderung gesendet, warte auf Antwort... 416 Requested Range Not Satisfiable
-
- Download der Datei schon vollständig; kein Download notwendig.
- flash now? [y/N] y
- esptool v0.4.9 - (c) 2014 Ch. Klippel
- setting board to nodemcu
- [...]
- writing flash
- [...]
- ................................................................................ [ 90% ]
- ........................................ [ 100% ]
- starting app without reboot
- espcomm_send_command: sending command header
- espcomm_send_command: sending command payload
- espcomm_send_command: receiving 2 bytes of data
- closing bootloader
- to erase SPIFF (config data) use arduino IDE and https://github.com/esp8266/arduino-esp8266fs-plugin
- see https://github.com/esp8266/arduino-esp8266fs-plugin
-
- to erase SPIFF (config data) use arduino IDE and https://github.com/esp8266/arduino-esp8266fs-plugin
- see https://github.com/esp8266/arduino-esp8266fs-plugin
- or overwrite SPIFFS now? [y/N] N
-
-Now the information about your sensor is added at the end of file listofflashed.csv
-
diff --git a/utils/flash/empty.spiffs.bin.bz2 b/utils/flash/empty.spiffs.bin.bz2
deleted file mode 100644
index 9dc1cfba2..000000000
Binary files a/utils/flash/empty.spiffs.bin.bz2 and /dev/null differ
diff --git a/utils/flash/flashlatest.sh b/utils/flash/flashlatest.sh
deleted file mode 100755
index 9fedba038..000000000
--- a/utils/flash/flashlatest.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-
-binfile="latest_de.bin"
-binfile="latest_en.bin"
-outappendfile=listofflashed.csv
-echo "usage: [esptool=/path/to/esptool] [esptoolpy=/path/to/esptool.py] [devserial=/dev/ttyUSB0] $0"
-echo "writes output to $outappendfile"
-
-if [ -z "$esptool" ] ; then
- esptool="$(ls $HOME/.arduino*/packages/esp8266/tools/esptool/*/esptool | sort | tail -1)"
- if [ -z "$esptool" ] ; then
- echo esptool not found, please define esptool="/path/to/esptool"
- echo "https://github.com/igrr/esptool-ck/"
- exit 1
- fi
-fi
-if [ -z "$esptoolpy" ] ; then
- esptoolpy="$(which esptool.py)"
- if [ -z "$esptoolpy" ] ; then
- echo esptool.py not found in PATH, please define esptoolpy="/path/to/esptool.py"
- echo "https://github.com/themadinventor/esptool"
- exit 1
- fi
-fi
-
-if [ -z "$devserial" ] ; then
- devserial=/dev/ttyUSB0
- echo devserial="$devserial" \# define to change
-fi
-if [ ! -w "$devserial" ] ; then
- echo "no write access to $devserial"
- if [ ! -d "/dev/serial/" ] ; then
- echo "no serial devices found in /dev/serial/, exiting"
- exit 1
- fi
- read -p "list all serial devices? [Y/n]" ans
- if [ "$ans" != "n" ] ; then
- ls -l /dev/serial/by-id/
- fi
- exit 1
-fi
-
-
-if [ ! -f "$outappendfile" ] ; then
- echo "nodemcuID sensorname hexchipID MAC revision:serial email lat lon locationaddress sensorID1 sensorname1 sensorID2 sensorname2" |tee -a "$outappendfile"
-fi
-
-# get info
-chipid="$($esptoolpy chip_id)"
-chid=$($esptoolpy chip_id| grep -io '0x[0-9a-fA-F]*\b')
-chiddec=$(python -c "print (\"%d\"%($chid))")
-mac="$($esptoolpy read_mac| grep -io '[0-9a-f:]\{17\}')"
-locadr="LOCADRESS"
-email="@"
-lat="LAT"
-lon="LON"
-echo ""
-echo "$chipid $chid $chiddec"
-
-read -p "ask more infos? [y/N]" ans
-
-if [ "$ans" == "y" ] ; then
- #examplestr="V0-000"
- #read -p "PM sensor revision (on back/flat side top left corner)? [default: $examplestr]" ans
- #if [ -n "$ans" ] ; then
-# srevision="$ans"
- #fi
- #examplestr="0000-0000"
- #read -p "PM sensor serial number (SN on sticker, besides fan, below barcode)? [default: $examplestr]" ans
- #if [ -n "$ans" ] ; then
-# sserial="$ans"
- #fi
-
- examplestr="70000 Stuttgart, Staubweg 00"
- read -p "Adress? [like: $examplestr]" ans
- if [ -n "$ans" ] ; then
- locadr="$ans"
- fi
- examplestr="unknown@example.com"
- read -p "Email? [like: $examplestr]" ans
- if [ -n "$ans" ] ; then
- email="$ans"
- fi
- examplestr="00.0000"
- read -p "latitude? [like: $examplestr]" ans
- if [ -n "$ans" ] ; then
- lat="$ans"
- fi
- examplestr="00.0000"
- read -p "longitude? [like: $examplestr]" ans
- if [ -n "$ans" ] ; then
- lon="$ans"
- fi
-fi
-
-info="DBID\tesp8266-$chiddec\t$chid\t$mac\t$srevision:$sserial\t$email\t$lat\t$lon\t$locadr\tSID1\tSNAME1\tSID2\tSNAME2"
-echo -e "$info" | tee -a "$outappendfile"
-
-
-#esptool.py write_flash -vv -cb 57600 -ca 0x00000 -cp /dev/ttyUSB0 -cf latest.bin
-
-#read -p "patch Freifunk to XXXXXXXX? [y/N] " ans
-
-wget -c "https://www.madavi.de/sensor/update/data/$binfile"
-
-#if [ "$ans" == "y" ]
-#then
-# patchedbinfile="${binfile}.patched"
-# hexdump -ve '1/1 "%.2X"' "$binfile" | sed "s/4672656966756E6B/5858585858585858/g" | xxd -r -p > "$patchedbinfile"
-# binfile="$patchedbinfile"
-#fi
-
-# flash
-# esptool.py write_flash 0x00000 "$binfile" "$@"
-
-
-read -p "flash now? [Y/n] " ans
-if [ "$ans" == "Y" -o -z "$ans" ]
-then
- $esptool -vv -cd nodemcu -cb 57600 -ca 0x00000 -cp "$devserial" -cf "$binfile"
-fi
-
-
-echo "to erase SPIFF (config data) use arduino IDE and https://github.com/esp8266/arduino-esp8266fs-plugin"
-echo "see https://github.com/esp8266/arduino-esp8266fs-plugin"
-#[SPIFFS] data : /home/martin/hft/applications/finedust/sensors-software/esp8266-arduino/ppd42ns-wificonfig-ppd-sds-dht/data
-#[SPIFFS] size : 3052
-#[SPIFFS] page : 256
-#[SPIFFS] block : 8192
-#[SPIFFS] upload : /tmp/buildae19241fabc98f54562c84b5c3712165.spiffs/ppd42ns-wificonfig-ppd-sds-dht.spiffs.bin
-#[SPIFFS] address: 0x100000
-#[SPIFFS] reset : nodemcu
-#[SPIFFS] port : /dev/ttyUSB0
-#[SPIFFS] speed : 115200
-
-read -p "or overwrite SPIFFS now? [y/N] " ans
-
-if [ "$ans" == "y" ] ; then
-
- spiffbin=empty.spiffs.bin
- if [ ! -f "$spiffbin" ] ; then
- bunzip2 -k "${spiffbin}.bz2"
- fi
-
- $esptool -vv -cd nodemcu -cb 115200 -ca 0x100000 -cp "$devserial" -cf "$spiffbin"
-fi
-
diff --git a/utils/flash/infomail.sh b/utils/flash/infomail.sh
deleted file mode 100755
index 8078d5d08..000000000
--- a/utils/flash/infomail.sh
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/bash
-
-
-source "$(dirname $0)/mailconfig.sh"
-if [ -z "$lfile" ] ; then
- lfile=listofflashed.csv
-else
- if [ ! -f "$lfile" ] ; then
- echo "lfile=$lfile not found"
- fi
-fi
-#testlist.csv
-echo "using input file: $lfile"
-
-subject="[luftdaten.info] Sensor in der Datenbank, es kann losgehen"
-while [ -z "$sender" ]
-do
- read -p "email to send from: " sender
-done
-while [ -z "$smtpserver" ]
-do
- read -p "SMTP server to send from: " smtpserver
-done
-
-bodyfixedcontent="
-Hallo,
-
-hier kommen ein paar Infos zu deiner Sensorstation (Feinstaubmessstation).
-* Die Station ist jetzt in unserer Datenbank eingetragen und wird daher, sobald sie online ist, Daten aufzeichnen.
-* Anleitung zum Konfigurieren des eigenen WLAN: https://github.com/opendata-stuttgart/meta/wiki/Konfiguration-der-Sensoren
-* Ich habe die Koordinaten nach Adresse herausgesucht, sie sind in der Datenbank (aber evtl. nicht hier in der Mail)
-* Wer da Bedenken hat und das anonymisiert haben will, sage mir Bescheid. Die personenbezogenen Daten (Adresse, Email) werden nicht weitergegeben und sind nicht 'Open Data'. Koordinaten (lat/lon) werden auf 3 Stellen gerundet, das entspricht etwa Rechtecken von ca 70x110m (wen das genauer interessiert: hier ist eine Visualisierung des Punkterasters: https://github.com/Marwe/particlemap/blob/master/static/grid001.json und https://github.com/Marwe/particlemap/blob/master/static/raster_0.001_degree.png )
-* Es wäre gut, wenn ich (sofern nicht schon vorhanden) noch eine kurze Beschreibung haben könnte, wie die Sensorumgebung ist, ich habe für meinen Sensor z.B. recht ausführlich geschrieben: 'Sensor an Außenwand, Höhe über Grund: 7m, Dachüberstand in + 2m darüber. Straßenseite mit keinem Verkehr nachts, tagsüber besonders zu rush hours.'
-* Die Angaben enthalten IDs, mit denen die eigenen Sensordaten identifiziert werden können: die erste Zahl (vor esp8266-xxxx) ist die Node-ID (für das Rechnermodul), hinten folgen noch einmal zwei IDs für die Sensoren, die wichtiger sind, da diese in der Karte und in den Exportdaten auftauchen, z.B. im Dateinamen und in den CSV-Dateiexporten http://archive.luftdaten.info/2017-01-10/
-* Die Karten:
- * SDS011 https://www.madavi.de/sensor/feinstaub-map-sds/
- * DHT22 https://www.madavi.de/sensor/feinstaub-map-dht/
-* Für Updates zum Projekt schau bei mal wieder bei http://luftdaten.info/ vorbei
-
-
-Hier die Infos zu deinem Sensor in einer Zeile:
-
-$(head -1 $lfile)
-
-"
-
-
-
-read -s -p "Password for smtp for $sender: " smtpw
-
-if [ -z "$smtpw" ] ; then
- echo "pw empty, exiting"
- exit 1
-fi
-
-maxcnt=200
-cnt=0
-tmpmail=$(mktemp -d)
-
-#for rec in $(grep -E -o "\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b" $lfile )
-# \t does not work properly, replace with |
-
-sed -e 's#\t#|#g' $lfile | while IFS="|" read nodemcuID sensorname hexchipID MAC revisionserial email lat lon locationaddress sensorID1 sensorname1 sensorID2 sensorname2
-do
- cnt=$((cnt+1))
- if [ $cnt -gt $maxcnt ] ; then
- echo "maxcnt=$maxcnt reached, stopping."
- exit 0
- fi
- # check, if there is a mail in the line
- #if [ -z "$(echo "$sinfo" | grep -E -o "\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")" ] ; then
- if [ -z "(echo $email| grep -E -o '\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b')" ] ; then
- echo "no mail in line $cnt, skipping"
- continue
- fi
-
- subject="[luftdaten.info] Sensorstation $sensorname ist in der Datenbank, es kann losgehen"
- bodypre="Bcc:<$sender>
-Subject:${subject}"
-
- rec="$email"
- sinfo="$nodemcuID $sensorname $hexchipID $MAC $revisionserial $email $lat $lon $locationaddress $sensorID1 $sensorname1 $sensorID2 $sensorname2"
- #nodeid=$(awk -F "\t" "/$rec/{print $2}" $lfile)
- #sensorid1=$(awk -F "\t" "/$rec/{print $10}" $lfile)
- #sensorid2=$(awk -F "\t" "/$rec/{print $12}" $lfile)
- lats=$(echo "$lat"| grep -o '[0-9-]*\.[0-9][0-9][0-9]'}
- lons=$(echo "$lon"| grep -o '[0-9-]*\.[0-9][0-9][0-9]'}
-
- customlinks="
-
-Ob der Sensor funktioniert und Daten liefert, kann auf https://www.madavi.de/sensor/graph.php eingesehen werden, wahrscheinlich sind deine Sensorseiten:
-https://www.madavi.de/sensor/graph.php?sensor=${sensorname}-sds011
-https://www.madavi.de/sensor/graph.php?sensor=${sensorname}-dht
-
-Sollten die Daten nur unregelmäßig erscheinen, kann es am WLAN liegen, checke bitte die Signalseite:
-https://www.madavi.de/sensor/signal.php?sensor=${sensorname}
-
-In den Karten und Exporten haben die Sensoren die Nummern:
-$sensorname1 $sensorID1
-$sensorname2 $sensorID2
-
-Die eingetragene Position ist:
-http://www.openstreetmap.org/?mlat=$lat&mlon=$lon#map=18/$lat/$lon
-herausgegeben wird nur die gerundete Position:
-http://www.openstreetmap.org/?mlat=$lats&mlon=$lons#map=18/$lats/$lons
-
-Viel Spaß und neue Einsichten
-Martin Weis
-"
-
- body="To:<${rec}>
-$bodypre
-$bodyfixedcontent"
- mailtextfile="$tmpmail/$rec"
- echo "$body" "$sinfo" "$customlinks" | tee "$mailtextfile"
-
-done
-
-for mailtextfile in "$tmpmail"/*@*
-do
-
- cat "$mailtextfile"
- echo "$mailtextfile"
-
- read -p "send? [y/N]" ans
- if [ "$ans" == "y" ] ; then
- cat "$mailtextfile" | s-nail -v \
- -r "$sender" \
- -S smtp="$smtpserver" \
- -S smtp-use-starttls \
- -S smtp-auth=login \
- -S smtp-auth-user="$sender" \
- -S smtp-auth-password="$smtpw" \
- -S ssl-verify=ignore \
- -t # specify To: Cc: Bcc: on body
- #"$sender;$rec"
- # -s "$subject" \
-
- success="$?"
- if [ "$success" != "0" ] ; then
- read -p "sending of message failed ($success), continue? [n/y]" ans
- if [ "$ans" != "y" ] ; then
- echo "exiting"
- exit 2
- fi
- fi
- fi
-
-done
-
-echo tmpfiles in $tmpmail
diff --git a/utils/flash/mailconfig.sh.template b/utils/flash/mailconfig.sh.template
deleted file mode 100644
index 3f1928981..000000000
--- a/utils/flash/mailconfig.sh.template
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# name this file mailconfig.sh to set your parameters for infomail.sh
-
-export sender=""
-export smtpserver="mail.example.com:587"
-#export lfile="testlist.csv"
-
-
diff --git a/utils/raspiflashstation/README.md b/utils/raspiflashstation/README.md
deleted file mode 100644
index 3da501a4b..000000000
--- a/utils/raspiflashstation/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Create Sensor Flash Station on Raspbian
-
-
-## Install necessary software
-
-Install on the raspberry (raspbian here) as root:
-
- aptitude install python-pip
- pip install -U platformio
-
-* create /etc/udev/rules.d/95-nodemcu.rules
-
- # CP210X USB UART
- SUBSYSTEMS=="usb", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", MODE:="0666", SYMLINK+="ttyUSBnodemcu$attr{port_number}"
-
-
-Necessary software
-
- if [ -z "$rsroot" ] ; then rsroot="/src/raspistation"; echo "rsroot=$rsroot" ;fi
- mkdir -p "$rsroot"
- if [ "$?" != "0" ] ; then echo "cannot create dir /src/raspistation, exiting"; exit 1 ; fi
- pushd "$rsroot"
- git clone https://github.com/paulbarber/raspi-gpio.git
- git clone https://github.com/themadinventor/esptool
-
- # enable i2c
- for modl in snd-bcm2835 i2c-dev
- do
- if [ -z "$(grep ^$modl /etc/modules)" ] ; then
- echo "$modl" >> /etc/modules
- fi
- done
-
-
- popd
diff --git a/utils/raspiflashstation/vm/README.md b/utils/raspiflashstation/vm/README.md
deleted file mode 100644
index f63146acb..000000000
--- a/utils/raspiflashstation/vm/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Virtual machine as flashstation and debugging tool for luftdaten.info
-
-Goal: create a small virtual machine with all necessary drivers and tools to flash and debug sensor stations of [luftdaten.info](https://luftdaten.info).
-Many systems lack driver support or make it overly complex to install a simple usb2serial chip device (affected systems: Windows, OSX).
-Idea is to start a virtual machine, hand over the USB and everyhing is fine.
-
-
-Necessary:
-* support for esp8266 nodmcu platforms
-* git, esptool(s)
- https://github.com/igrr/esptool-ck
-
-* scripts for flashing and debugging
-
-
-git clone https://github.com/themadinventor/esptool
-git clone
-
-
-# System install
-
-* https://wiki.alpinelinux.org/wiki/Installation
-* https://wiki.alpinelinux.org/wiki/VirtualBox_guest_additions
-
-
- apk add git
- apk add virtualbox-additions-grsec
diff --git a/utils/sds011/readme.md b/utils/sds011/readme.md
deleted file mode 100644
index 85376172f..000000000
--- a/utils/sds011/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# A logger script for the SDS011
-
-This is a small logger script for the SDS011 particle sensor.
-Connect the device via serial to your computer (e.g. via USB2serial) and run the python program.
-To change the device, have the path/name as first argument, like:
-
- ./sds011logger.py /dev/ttyUSB0
-
-To log on console and into a file just use redirection or tee:
-
- ./sds011logger.py /dev/ttyUSB0 | tee -a ~/sdslog_0.csv
-
-Three values per reading are the output, they are TAB separated.
-With a header the output would be like:
-
- datetime[UTC] PM2.5[μg/m3] PM10[μg/m3]
- 2016-08-03 22:08:28.293635 12.6 9.4
-
-Time is always in time zone UTC, to avoid time zone offsets and resulting errors or misinterpretations.
-
-The class code was adapted from [FriskByBergen](https://github.com/FriskByBergen/RPiParticle/blob/master/lib/sds011.py).
-See [spec sheet](https://github.com/opendata-stuttgart/meta/blob/master/files/SDS011-V1.3.pdf) for details.
-
-
diff --git a/utils/sds011/sds011logger.py b/utils/sds011/sds011logger.py
deleted file mode 100755
index dece115c1..000000000
--- a/utils/sds011/sds011logger.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-import serial
-import datetime, time
-import sys
-
-# class adapted from https://github.com/FriskByBergen/RPiParticle/blob/master/lib/sds011.py
-
-class SDS011(object):
- msg_start = 170
- msg_cmd = 192
- msg_end = 171
- sleep_time = 0.01
- device = None
-
- def __init__(self,serialdevice="/dev/cu.wchusbserial1420"):
- self.device=serial.Serial(serialdevice, baudrate=9600, stopbits=1, parity="N", timeout=2)
-
- def read(self):
-
- # Read in loop until message start: AAC0
- while True:
- s = self.device.read(1)
- if ord(s) == SDS011.msg_start:
- s = self.device.read(1)
- if ord(s) == SDS011.msg_cmd:
- break
- time.sleep( SDS011.sleep_time )
-
- s = self.device.read(8)
-
- pm25hb = ord(s[0])
- pm25lb = ord(s[1])
- pm10hb = ord(s[2])
- pm10lb = ord(s[3])
- d5 = ord(s[4])
- d6 = ord(s[5])
-
- cs = ord(s[6])
- tail = ord(s[7])
-
- cs_expected = (pm25hb + pm25lb + pm10hb + pm10lb + d5 + d6) % 256
- if cs != cs_expected:
- raise Exception("Checksum test failed")
-
- if tail != SDS011.msg_end:
- raise Exception("Message was not correctly terminated?")
-
- pm25 = float(pm25hb + pm25lb*256)/10.0
- pm10 = float(pm10hb + pm10lb*256)/10.0
-
- return (pm10 , pm25)
-
-def main():
- serialdevice="/dev/cu.wchusbserial1420"
- if len(sys.argv) > 1:
- serialdevice=sys.argv[1]
- sdslog=SDS011(serialdevice)
- # init datetime object
- dt=datetime.datetime.now()
- print ("%s\tPM10\tPM2.5"%(dt.utcnow()))
- while True:
- try:
- pm10,pm25=sdslog.read()
- print ("%s\t%.1f\t%.1f"%(dt.utcnow(),pm10,pm25))
- except Exception as e:
- print (e.message)
-if __name__ == '__main__':
- main()
diff --git a/utils/serialwatch/serialwatch.sh b/utils/serialwatch/serialwatch.sh
deleted file mode 100755
index 5d10392b7..000000000
--- a/utils/serialwatch/serialwatch.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# TODO
-# auto discover device?
-# check device? No, since it will appear suddenly
-
-serialdev="/dev/ttyUSB0"
-if [ -n "$1" ] ; then
- # it should be safe to call with any given filename
- serialdev="$1"
-fi
-
-if [ -z "$(which screen)" ] ; then
- echo "screen not found, please install it"
- exit 2
-fi
-
-while true
-do
- screen "$serialdev"
- # little delay, so script can be stopped with ^C
- sleep 0.1
-done
-
