6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-30 04:50:08 +00:00
Code Issues Projects Releases Wiki Activity

Renames motor_is_on_ to motor_input_is_on_ to start to disambiguate the two things.

Browse Source
This commit is contained in:
Thomas Harte 2020-01-15 23:16:25 -05:00
parent 91fae86e73
commit 30e856b9e4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Storage/Disk/Drive.cpp
View File

@ -68,7 +68,7 @@ bool Drive::has_disk() const {
} }
ClockingHint::Preference Drive::preferred_clocking() { ClockingHint::Preference Drive::preferred_clocking() {
return (!motor_is_on_ || !has_disk_) ? ClockingHint::Preference::None : ClockingHint::Preference::JustInTime; return (!motor_input_is_on_ || !has_disk_) ? ClockingHint::Preference::None : ClockingHint::Preference::JustInTime;
} }
bool Drive::get_is_track_zero() const { bool Drive::get_is_track_zero() const {
@ -146,13 +146,13 @@ bool Drive::get_is_ready() const {
} }
void Drive::set_motor_on(bool motor_is_on) { void Drive::set_motor_on(bool motor_is_on) {
if(motor_is_on_ != motor_is_on) { if(motor_input_is_on_ != motor_is_on) {
motor_is_on_ = motor_is_on; motor_input_is_on_ = motor_is_on;
if(observer_) { if(observer_) {
observer_->set_drive_motor_status(drive_name_, motor_is_on_); observer_->set_drive_motor_status(drive_name_, motor_input_is_on_);
if(announce_motor_led_) { if(announce_motor_led_) {
observer_->set_led_status(drive_name_, motor_is_on_); observer_->set_led_status(drive_name_, motor_input_is_on_);
} }
} }
@ -165,7 +165,7 @@ void Drive::set_motor_on(bool motor_is_on) {
} }
bool Drive::get_motor_on() const { bool Drive::get_motor_on() const {
return motor_is_on_; return motor_input_is_on_;
} }
bool Drive::get_index_pulse() const { bool Drive::get_index_pulse() const {
@ -185,7 +185,7 @@ void Drive::run_for(const Cycles cycles) {
// Assumed: the index pulse pulses even if the drive has stopped spinning. // Assumed: the index pulse pulses even if the drive has stopped spinning.
index_pulse_remaining_ = std::max(index_pulse_remaining_ - cycles, Cycles(0)); index_pulse_remaining_ = std::max(index_pulse_remaining_ - cycles, Cycles(0));
if(motor_is_on_) { if(motor_input_is_on_) {
if(has_disk_) { if(has_disk_) {
Time zero(0); Time zero(0);
@ -407,11 +407,11 @@ void Drive::set_activity_observer(Activity::Observer *observer, const std::strin
drive_name_ = name; drive_name_ = name;
observer->register_drive(drive_name_); observer->register_drive(drive_name_);
observer->set_drive_motor_status(drive_name_, motor_is_on_); observer->set_drive_motor_status(drive_name_, motor_input_is_on_);
if(add_motor_led) { if(add_motor_led) {
observer->register_led(drive_name_); observer->register_led(drive_name_);
observer->set_led_status(drive_name_, motor_is_on_); observer->set_led_status(drive_name_, motor_input_is_on_);
} }
} }
} }

4
Storage/Disk/Drive.hpp
View File

@ -75,7 +75,7 @@ class Drive: public ClockingHint::Source, public TimedEventLoop {
void set_motor_on(bool); void set_motor_on(bool);
/*! /*!
@returns @c true if the motor is on; @c false otherwise. @returns @c true if the motor on input is active; @c false otherwise. This does not necessarily indicate whether the drive is spinning, due to momentum.
*/ */
bool get_motor_on() const; bool get_motor_on() const;
@ -213,7 +213,7 @@ class Drive: public ClockingHint::Source, public TimedEventLoop {
int available_heads_ = 0; int available_heads_ = 0;
// Motor control state. // Motor control state.
bool motor_is_on_ = false; bool motor_input_is_on_ = false;
// Current state of the index pulse output. // Current state of the index pulse output.
Cycles index_pulse_remaining_; Cycles index_pulse_remaining_;