Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dualpid/src/outputdrv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ void UnitSSRDriver::_off() { _ssr.setRelay(_inverted); };
#endif // OUTPUTDRV_M5UNIT_SSR_ENABLED

#ifdef OUTPUTDRV_M5UNIT_HBRIDGE_ENABLED
#include <M5UnitHbridge.h>
#include <M5UnitHBridge.h>
bool M5UnitHbridgeDriver::begin(const output_driver_config_t &cfg, const int32_t channel_id)
{
uint8_t addr = cfg.m5unit_hbridge.i2c_addr ? (uint8_t)cfg.m5unit_hbridge.i2c_addr : M5UNIT_HBRIDGE_ADDRESS_DEFAULT;
Expand Down
4 changes: 2 additions & 2 deletions dualpid/src/outputdrv.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class UnitSSRDriver : public SlowPWMBase
#endif // OUTPUTDRV_M5UNIT_SSR_ENABLED

#ifdef OUTPUTDRV_M5UNIT_HBRIDGE_ENABLED
#include <M5UnitHbridge.h>
#include <M5UnitHBridge.h>
class M5UnitHbridgeDriver : public SlowPWMBase
{
public:
Expand All @@ -200,4 +200,4 @@ class M5UnitHbridgeDriver : public SlowPWMBase
};
#endif // OUTPUTDRV_M5UNIT_HBRIDGE_ENABLED

#endif // __OUTPUT_H
#endif // __OUTPUT_H
2 changes: 1 addition & 1 deletion dualpid/src/pidloop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ void PIDLoop::do_input()
return;
};

double read = _inputdrv->read();
double read = _inputdrv->read() + _settings.input_offset;

// reset filter if previous was NaN
if(isnan(_input_value))
Expand Down
4 changes: 3 additions & 1 deletion dualpid/src/pidloop.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,11 @@ class PIDLoop: private NonCopyable
int32_t _reserved; // left from previous double lock_window
int32_t lock_time;
double input_filter;
double input_offset;
int32_t input_drv;
// input_driver_config_t input_cfg;
int32_t fixed_output_value;
double temp_offset_c;
} settings_t;

PIDLoop(uint32_t id, PIDLoop::settings_t& s);
Expand Down Expand Up @@ -109,4 +111,4 @@ class PIDLoop: private NonCopyable
bool _outputdrv_ok;
};

#endif // __PIDLOOP_H
#endif // __PIDLOOP_H
1 change: 1 addition & 0 deletions dualpid/src/screens/menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ MenuScreen::MenuScreen(SooghGUI& g) : Screen(g)
sub->addSeparator("Input");
sub->addSelector("Sensor", &set.input_drv, input_drivers)->onChange(set_need_reboot);
sub->addSpinbox("Input Filter", &set.input_filter, 0, 1, 2);
sub->addSpinbox("Input Offset", &set.input_offset, -99, 99, 2);
sub->addSeparator("PID");
sub->addSelector("Looptime", &set.looptime, pid_loop_times);
sub->addSelector("Lock Time", &set.lock_time, lock_times);
Expand Down