Skip to content

Commit

Permalink
Rename files
Browse files Browse the repository at this point in the history
  • Loading branch information
lbussy committed Mar 15, 2020
1 parent 8287079 commit f04016d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
13 changes: 5 additions & 8 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
[common_env_data]
upload_speed = 460800
monitor_speed = 74880
monitor_rts = 0
monitor_dtr = 1
framework = arduino
platform = espressif8266
build_unflags =
Expand All @@ -29,11 +27,12 @@ build_flags =
; -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_LOW_MEMORY ; v2 IPv6 Lower Memory
; -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH ; v2 IPv6 Higher Bandwidth
; -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH ; v1.4 Higher Bandwidth
extra_scripts = pre:python tools\name_firmware.py
extra_scripts = ; pre:python tools\name_firmware.py
lib_deps =
ArduinoJson
https://github.com/lbussy/OneWire.git
DS18B20
; 5544 ; DS18B20
DallasTemperature
ArduinoLog
DoubleResetDetect
CircularBuffer
Expand All @@ -46,13 +45,11 @@ build_type = release
[env:d1_mini]
upload_speed = ${common_env_data.upload_speed}
monitor_speed = ${common_env_data.monitor_speed}
monitor_rts = ${common_env_data.monitor_rts}
monitor_dtr = ${common_env_data.monitor_dtr}
framework = ${common_env_data.framework}
platform = ${common_env_data.platform}
; build_unflags = ${common_env_data.build_unflags}
build_unflags = ${common_env_data.build_unflags}
build_flags = ${common_env_data.build_flags}
; extra_scripts = ${common_env_data.extra_scripts}
extra_scripts = ${common_env_data.extra_scripts}
lib_deps = ${common_env_data.lib_deps}
build_type = ${common_env_data.build_type}
board = d1_mini
9 changes: 6 additions & 3 deletions src/bubserial.cpp → src/serial_setup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. */

#include "bubserial.h"
#include "serial_setup.h"

#ifndef DISABLE_LOGGING

Expand All @@ -35,12 +35,15 @@ void serial() { // Start serial with auto-detected rate (default to BAUD)
}

void printTimestamp(Print* _logOutput) {
time_t now;
time_t rawtime = time(&now);
struct tm ts;
ts = *localtime(&rawtime);
char locTime[22] = {'\0'};
strlcpy(locTime, getDTS().c_str(), getDTS().length());
strftime(locTime, sizeof(locTime), "%FT%TZ ", &ts);
_logOutput->print(locTime);
}


#else // DISABLE_LOGGING

void serial(){}
Expand Down
File renamed without changes.

0 comments on commit f04016d

Please sign in to comment.