tanner/tireinflator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve docs and logging

Browse Source
This commit is contained in:
Tanner Collin 2023-02-15 17:45:02 -07:00
parent ba96c67893
commit e29aac17ca
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/main/hardware.cpp
View File

@ -4,7 +4,7 @@
#include "hardware.h"
#include "XGZP.h"
bool simulating = false;
bool simulating = true;
double simulatedPressure = 0.0;
double inflatePSIPerSecond = 0.0;
double deflatePSIPerSecond = 0.0;

43
firmware/main/main.ino
View File

@ -1,11 +1,20 @@
// Tire Inflation Firmware
//
// Board: Adafruit Feather nRF52832
// Setup: https://learn.adafruit.com/bluefruit-nrf52-feather-learning-guide/arduino-bsp-setup
#include <Wire.h>
#include <Adafruit_GFX.h>
#include <Adafruit_SSD1306.h>
#include <Adafruit_FeatherOLED.h>
#include <Adafruit_FeatherOLED.h> // make sure to add:
// #define VBATPIN 0
// #define VBAT_MULTIPLIER 0
// to Adafruit_FeatherOLED.cpp
// or Adafruit_FeatherOLED_SH110X.cpp
#include "hardware.h"
//#define SIMULATE 1
#define SIMULATE 1
#define DEBUG 0
#define TIMEOUT_TIME 7000
@ -130,8 +139,8 @@ void logData() {
static unsigned long lastLogTime = millis();
if (millis() > lastLogTime + 100) {
Serial.print("millis: ");
Serial.print(millis());
//Serial.print("millis: ");
//Serial.print(millis());
Serial.print(", pressure: ");
Serial.print(pressureValue);
#ifdef SIMULATE
@ -140,8 +149,8 @@ void logData() {
#endif
Serial.print(", sampled: ");
Serial.print(sampledPressure);
Serial.print(", rate (inv): ");
Serial.print(runningRateInv);
//Serial.print(", rate (inv): ");
//Serial.print(runningRateInv);
Serial.print(", setpoint: ");
Serial.print(pressureSetPoint);
Serial.print(", state: ");
@ -309,17 +318,17 @@ void runStateMachine() {
runningRateInv = (stopTime - startTime) / (sampledPressure - initialPressure);
Serial.print("stopTime: ");
Serial.print(stopTime);
Serial.print(", startTime: ");
Serial.print(startTime);
Serial.print(", sampledPressure: ");
Serial.print(sampledPressure);
Serial.print(", initialPressure: ");
Serial.print(initialPressure);
Serial.print(", rate: ");
Serial.print(runningRateInv);
Serial.println("");
//Serial.print("stopTime: ");
//Serial.print(stopTime);
//Serial.print(", startTime: ");
//Serial.print(startTime);
//Serial.print(", sampledPressure: ");
//Serial.print(sampledPressure);
//Serial.print(", initialPressure: ");
//Serial.print(initialPressure);
//Serial.print(", rate: ");
//Serial.print(runningRateInv);
//Serial.println("");
initialPressure = sampledPressure;