MASSAGE mode is now useable again for now.
(no more random driving and unexpected shaking)
A full rework is still planned.
- Fix setFade method (did not change anything when not writing to nvs)
- joystick/massage:
- reverse motor direction every 2nd cycle to preving driving
- simplify modes (now only FW/REV and LEFT/RIGHT)
- use joystick angle to vary the duty cycle
- optimize delay and duty calculation (min max config)
- drop hysteresis (not much use, just much code)
- fix deceleration being overwritten in nvs at massage mode change (as accel before)
- handle deadlock when handle-loop does not give back mutex (rare but had that once -> restart)
- clear display when changing to mode-select
- clear display when switching status page
- adjust fan time (less on)
- slightly adjust accel/decel/max duty (needs testing)
Tested newly implemented menu on armchair and made several Fixes:
- reduce long delay when changing to menu modes (control handle)
- add unused line to mode select menu, also drop "click to confirm"
- fix and optimize getNextSelectableModeIndex function to get n next (recursive, offset)
- button: clear encoder queue before changing to menu mode
- fix menu immediately exiting on x5 press (missing break)
General:
- Rename control mode MENU to MENU_SETTINGS
- Add new control mode MENU_MODE_SELECT
Button menu:
- change 'long press' to: 'switch to menu mode-select'
- move 'open settings menu' to 5x press
Display:
- display_task: outsource statusScreen to local function
- display_task: also handle MENU_MODE_SELECT control mode
- show display startup message for 2600ms instead of 2000ms
Menu:
- Add functions to handle modeSelect menu to select from a list of allowed modes
(similar to settings main menu)
Briefly tested this - brake works as intended
- Add config options brakeDecel and brakePauseBefureResume
- control: update brakeStartThresholdDuty at startup
and maxDuty change for each motor
- motorctl: drop/simplify decel boost to brake
(faster deceleration at certain threshold)
Revert change where massage commands were only generated at
joystick change, since it has to be handled
frequently in any case for motors to actually stop after certain time.
Not tested yet
sdkconfig:
- increase encoder dead-time to fix bug where encoder triggered multiple
short pressed events at one press.
E.g. instantly submitted value when entering a menu page sometimes
button:
- decrease input-timeout (long press time) to 500ms same as encoder long-press
- empty encoder queue when changing to MENU
- re-enable or increase joystick scaling to have more resolution at
slower speeds
Add mutex to fix bug motors stay on when mode-change while driving
due to race condition when handle() still executing while mode change
Change joystick scaling parameters
control:
- add mutex to handle() and changemode() to prevent race condition
- outsource handle() method from createHandleLoop()
- change joystick scaling (reduce 'more detail in slower area')
- comments, formatting
Rework joystick command generation
Fix timeout no commands received in motorctl
Successfully tested this state on actual hardware:
turning behavior is significantly improved - does not get slower when turning anymore
joystick:
- add boost of inner tire when turning
- add threshold where ratio snaps to 1
- optimize structure, logging
control:
- rename maxDuty to maxDutyStraight to be more clear
- add methods to change and get new variable RelativeBoostPer for menu item
menu:
- add new item to set maxRelativeBoost config parameter
motorctl:
- fix timeout not working:
previously when not receiving commands for 15s the duty was set to 0 for 1 handle cycle only
As initially planned starting wifi only when needed, at change to HTTP mode.
Tested this on breakout board: ESP32 is not getting hot anymore!
Also optimized timeout: only notify "forgot to turn off" when battery is below certain
threshold (e.g. disable when charger is connected over night)
main:
- dont start wifi at startup anymore
- remove double-initialization of nvs
already initialized in wifi.c, thus removed some code
- optimize comments, logging
control:
- timeout "forgot to turn off": Add battery threshold
- start/stop wifi when switching to/from HTTP mode
wifi:
- split init function to separate functions for NVS and NETIF (more clear in main)
- optimize log output at nvs init (moved from main)
- rename start/stop functions, formatting
control:
- reset timeout on user input only
-> drop reset on changed motor duty
- add timeoutNotifyPowerStillOnMs
-> when forgotten to turn off the power the buzzer
beeps a few times every 30 minutes
- Add/fix JOYSTICK_LOG_IN_IDLE option
remove empty config.hpp
motorctl, currentsensor:
- add config option for inverted current sensor
- adjust loglevels
config:
- Adjust gpio pins to actual wiring (not breakout board for testing)
- Add min pulse durations for speedsensors (measurements with scope)
- Adjust config to currently mounted encoders
control, buzzer:
- adjust beeping
- Add feature for optinal delay to buzzer class:
have some pause after beeps instead of immediately
continuing with next queued sequence
Major changes in motorctl and control to optimize performance
by freeing unnecessary cpu usage by motorctl task
Needs testing on actual hardware!
motorctl:
- slow down handle loop when duty is at target (wait for new command)
- create separate task for each motor
- setTarget method also accepts motorCommand directly now
control.cpp:
- redurce stress on motorctl by removing unnecessary commands
- set motors to idle at mode change only, instead of every iteration (IDLE, MENU, ADJUST)
- HTTP, JOYSTICK: only update motors when stick data actually changed
- simplify code
- add method for idling both motors
- use motorcommands directly in setTarget()
http:cpp:
- dont block control task with getData() method
- handle timeout independent of one queue event
- prevents unresponsive system for http-timeout when changing mode from HTTP
- All files:
Modify almost all files to adjust functions and classes to
work with pointers to objects passed at task creation
instead of global variables from config.hpp
- Remove/clear config.hpp to get rid of all global variables
- main.cpp
- Create pointer to all shared (used in multiple tasks) objects in main
- remove evaluatedSwitch button object,
since joystick library is used to get switch events
- changes HTTP-mode
- always init http-server (do not enable/disable at mode change)
- pass url-handle function to init-htpp function
- add lambda function to pass method of instance for thatMajor Rework all files - Remove global variables, pass pointers to tasks
- All files:
Modify almost all files to adjust functions and classes to
work with pointers to objects passed at task creation
instead of global variables from config.hpp
- Remove/clear config.hpp to get rid of all global variables
- main.cpp
- Create pointer to all shared (used in multiple tasks) objects in main
- remove evaluatedSwitch button object,
since joystick library is used to get switch events
- changes HTTP-mode
- always init http-server (do not enable/disable at mode change)
- pass url-handle function to init-htpp function
- add lambda function to pass method of instance for that
NOTES: - tested on breakoutboard only
- known issue that slow encoder events are not recognized
(especially in menu) - slowing down motorctl helps
Armchair functions as before (all tasks enabled).
Note: probably wrong encoder pin set in encoder.hpp
Old button menu works as usual (opimized code).
You can switch to new MENU state with 1x long press
and exit the menu with 1x long press
button.cpp: - use encoder queue instead of evaluated switch
- simplify code, rework actions
control.cpp: Add MENU state/mode
-> control task: turns motors off and idles
-> button task idles (button menu disabled)
-> display task switches state to handle menu
control.cpp: Optimize structure:
Add methods to freeze stick and toggle stick mapping
display.cpp: show status screen or handle menu depending on mode, simpilfy task
main.cpp: re-enable button task, disable buzzer logging
menu.cpp: Change events, Add menu exit condition
- complete rework of chairAdjust.cpp/.hpp
created a class cControlledRest which is more readable
and saves a lot of duplicate code
- joystick.cpp: move chair control via joystick to
chairAdjust.cpp (prevents dependency loop)
- button.cpp: fix bug instant idle when changing to ADJUST_CHAIR
Note: briefly tested this state on a breakout board:
Mode change and call of new class methods works.
New controller will be run with single controller at first...
get single board version from V2.0 and create new folder
(two boards version is kept)
-> copied firmware from e6e586e5855d81ee726bb9a0fbe8ab12def5eeef
