2026 remote: tabbed Nextion UI, robot telemetry, servo centre calibration
Protocol v4: CmdPacket grows to 26 bytes (cal_cmd, cal_servo, cal_value); new 30-byte Telemetry rides back on the nRF24 ack payload (robot state, IMU, battery, 18 joint angles, packets/s, servo-cal echo). Each end drops wrong-length packets, so version mismatches still fail closed. Robot (owner-approved): SERVO_CAL state while disarmed, per-servo centre trims (+-200 us) in EEPROM, telemetry, battery reading; the IMU estimate now always runs (leveling still gated by ROBOT GYRO). Remote: generated HMI (scripts/make_remote_hmi.py) with pages splash, drive, status, servos, cal, setup, upload; page-aware NextionUI that only writes the showing page and only what changed; servo calibration and UPDATE DISPLAY on the touchscreen and serial console; battery module. The display is on Serial2 (pins 7/8), found on the real remote; the old sketch's Serial1 was never connected to it. Sim: RF24 shim supports ack payloads, API version 8 (hxsim_get_ack_payload); sim_smoke checks telemetry and every CAL command. Unity CmdPacket mirror updated. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
481610c9fd
commit
0b836af8de
40 files changed
+1463
-281
No files matched your search
@@ -17,8 +17,9 @@ public:
|
||||
// rejections leave an explanation in message().
|
||||
bool handle(const UiEvent& e, Sticks& sticks, RemoteIMU& imu, uint32_t now_ms);
|
||||
|
||||
// Advances smoothers and link-loss handling. Call once per TX tick.
|
||||
void update(float dt, bool link_ok, uint32_t now_ms);
|
||||
// Advances smoothers and link-loss handling, and reads the servo trim back
|
||||
// from the robot's telemetry. Call once per TX tick.
|
||||
void update(float dt, bool link_ok, bool tele_fresh, const Telemetry& tele, uint32_t now_ms);
|
||||
|
||||
bool armed() const { return armed_; }
|
||||
bool standRequested() const { return stand_; }
|
||||
@@ -33,6 +34,17 @@ public:
|
||||
uint8_t speedCurrent() const { return (uint8_t)lroundf(speed_.current); }
|
||||
float remoteTiltBlend() const { return tilt_blend_.current; } // 0..1, fades on the gyro toggle
|
||||
|
||||
// Servo centre calibration (CAL page) -> CmdPacket.cal_*
|
||||
uint8_t servoCalCmd(uint32_t now_ms) const;
|
||||
uint8_t servoSel() const { return servo_sel_; } // leg * 3 + joint
|
||||
int16_t trimTarget() const { return trim_target_; }
|
||||
bool servoCal() const { return servo_cal_; }
|
||||
bool trimSynced() const { return trim_synced_; }
|
||||
|
||||
uint8_t page() const { return page_; }
|
||||
// UPDATE DISPLAY was confirmed: remote.ino enters the upload passthrough.
|
||||
bool takeUploadRequest() { bool r = upload_go_; upload_go_ = false; return r; }
|
||||
|
||||
const char* message(uint32_t now_ms) const { return now_ms < message_until_ms_ ? message_ : ""; }
|
||||
void setMessage(const char* msg, uint32_t now_ms);
|
||||
|
||||
@@ -53,9 +65,23 @@ private:
|
||||
SmoothedValue speed_{SPEED_SCALE_RATE_PER_SEC};
|
||||
SmoothedValue tilt_blend_{REMOTE_TILT_FADE_PER_SEC};
|
||||
|
||||
uint8_t page_ = PAGE_UNKNOWN;
|
||||
|
||||
bool servo_cal_ = false;
|
||||
uint8_t servo_sel_ = 0;
|
||||
int16_t trim_target_ = 0;
|
||||
bool trim_synced_ = false; // trim_target_ was read back from the robot for servo_sel_
|
||||
uint8_t cal_op_ = CAL_NONE; // CAL_SAVE / CAL_REVERT while it's being sent
|
||||
uint32_t cal_op_until_ms_ = 0;
|
||||
|
||||
uint32_t upload_confirm_until_ms_ = 0;
|
||||
bool upload_go_ = false;
|
||||
|
||||
bool link_was_ok_ = false;
|
||||
const char* message_ = "";
|
||||
uint32_t message_until_ms_ = 0;
|
||||
|
||||
void disarm();
|
||||
void stopServoCal();
|
||||
void selectServo(uint8_t servo);
|
||||
};
|
||||
Reference in new issue
Block a user