martin/swimtracker-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Native tests run again

Browse Source
This commit is contained in:
Martin Bauer
2020-06-07 10:59:16 +02:00
parent d895d85273
commit 5558151c91
13 changed files with 95 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/src/ConfigHardware.h
View File

@@ -3,10 +3,10 @@
#include <cstdint>
//#define _HW_V_20
#define _HW_V_20
// HX711 load cell
#ifdef USE_ESP32
#ifdef PLATFORM_ESP32
#ifdef _HW_V_20
const int CONFIG_SCALE_DOUT_PIN = 23;
@@ -20,10 +20,10 @@ const int CONFIG_SCALE_SCK_PIN = 23;
const int CONFIG_SCALE_DOUT_PIN = D2;
const int CONFIG_SCALE_SCK_PIN = D3;
#endif
const uint8_t CONFIG_MEASUREMENT_AVG_COUNT = 1; // number of measurements in normal phase
const uint8_t CONFIG_TARE_AVG_COUNT = 6; // number of measurements in tare-phase (to find 0 )
const int CONFIG_MEASURE_DELAY = 100; // interval in ms between measurements
const uint8_t CONFIG_MEASUREMENT_AVG_COUNT = 1; // number of measurements in normal phase
const uint8_t CONFIG_TARE_AVG_COUNT = 6; // number of measurements in tare-phase (to find 0 )
const int CONFIG_MEASURE_DELAY = 100; // interval in ms between measurements
//const int CONFIG_VALUE_DIVIDER = 8; // uint32 measurements are divided by this factor, before stored in uint16_t
const int CONFIG_VALUE_DIVIDER = 256; // uint32 measurements are divided by this factor, before stored in uint16_t
const int CONFIG_VALUE_DIVIDER = 128; // uint32 measurements are divided by this factor, before stored in uint16_t
const uint32_t CONFIG_SESSION_CHUNK_SIZE = 1024; //1024*8 - 16 * sizeof(uint32_t);

13
firmware/src/firmware_main.cpp
View File

@@ -1,8 +1,8 @@
#define USE_ESP32
// Arduino & ESP headers
#include <Arduino.h>
#ifdef USE_ESP32
#include "Dtypes.h"
#ifdef PLATFORM_ESP32
#include <WiFi.h>
#else
#include <ESP8266WiFi.h>
@@ -13,7 +13,6 @@
#include <NTPClient.h> // for NTP
// Own libs
#include "Dtypes.h"
#include "MockScale.h"
#include "Scale.h"
#include "MeasurementSession.h"
@@ -207,7 +206,7 @@ void setup()
// WiFi
WiFi.mode(WIFI_STA);
WiFi.begin(CONFIG_WIFI_SSID, CONFIG_WIFI_PASSWORD);
#ifdef USE_ESP32
#ifdef PLATFORM_ESP32
WiFi.setHostname(CONFIG_HOSTNAME);
#else
WIFI.hostname(CONFIG_HOSTNAME);
@@ -232,6 +231,10 @@ void setup()
Serial.println("Spiffs listing:");
listDir(SPIFFS, "/", 3);
//
Serial.print("Free Heap");
Serial.println(ESP.getFreeHeap());
}
void loop() {