Skip to content

Commit a3047e8

Browse files
committed
Addressed linting warnings
Addressed linting warnings
1 parent c1c9c0d commit a3047e8

File tree

14 files changed

+33
-37
lines changed

14 files changed

+33
-37
lines changed

Ev3LangScala/src/ev3dev4s/actuators/Ev3Led.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package ev3dev4s.actuators
22

3+
import ev3dev4s.scala2measure.Conversions._
4+
import ev3dev4s.scala2measure.LedIntensity
35
import ev3dev4s.sysfs.ChannelRewriter
46

57
import java.nio.file.Path
6-
import ev3dev4s.scala2measure.LedIntensity
7-
import ev3dev4s.scala2measure.Conversions._
88

99
/**
1010
*
@@ -14,7 +14,7 @@ import ev3dev4s.scala2measure.Conversions._
1414

1515
sealed case class Ev3Led(side: Int) extends AutoCloseable {
1616

17-
import ev3dev4s.actuators.Ev3Led.{Color, brightest, darkest, Off, Red, Green, Yellow}
17+
import ev3dev4s.actuators.Ev3Led.{Color, Off, Red, Green, Yellow} // brightest, darkest
1818

1919
val rootName = "/sys/class"
2020
//noinspection SpellCheckingInspection

Ev3LangScala/src/ev3dev4s/lego/Gyroscope.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package ev3dev4s.lego
22

33
import ev3dev4s.scala2measure.Degrees
44
import ev3dev4s.sensors.{Ev3Gyroscope, SensorPort, SensorPortScanner}
5-
import ev3dev4s.sysfs.UnpluggedException
65

76
/**
87
*

Ev3LangScala/src/ev3dev4s/lego/Motors.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ev3dev4s.lego
22

3-
import ev3dev4s.actuators.{Motor, MotorCommand, MotorPort, MotorPortScanner, MotorState, MotorStopCommand}
3+
import ev3dev4s.actuators.{Motor, MotorCommand, MotorPort, MotorPortScanner, MotorStopCommand}
44
import ev3dev4s.scala2measure.{Degrees, DegreesPerSecond, MilliSeconds}
55
import ev3dev4s.scala2measure.Conversions._
66
import ev3dev4s.os.Time

Ev3LangScala/src/ev3dev4s/scala2measure/Measured.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ trait Measured[M <: Measured[M]] extends Any {
1616
//noinspection
1717
def toString(): String // todo figure out def toString(): String
1818

19-
def unary_-(): M = create(-this.v) // todo add type annotation when allowed
19+
def unary_- : M = create(-this.v)
2020

2121
def +(m: M): M = create(this.v + m.v)
2222

Ev3LangScala/src/ev3dev4s/sensors/Ev3Battery.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object Ev3Battery extends AutoCloseable {
1818
private lazy val currentRereader: ChannelRereader = ChannelRereader(Path.of(batteryDir.getAbsolutePath, "current_now"))
1919

2020
def readMicrovolts(): Microvolts = voltageRereader.readAsciiInt().microvolts
21-
21+
2222
def readMicoramps(): Int = currentRereader.readString().toInt
2323

2424
override def close(): Unit = {

Ev3LangScala/src/ev3dev4s/sensors/Ev3Gyroscope.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import scala.collection.immutable.ArraySeq
1616
* @author David Walend
1717
* @since v0.0.0
1818
*/
19+
//noinspection ScalaUnnecessaryParentheses
1920
case class Ev3Gyroscope(override val port: SensorPort, initialSensorDir: Option[Path])
2021
extends MultiModeSensor(port, initialSensorDir.map(MultiModeSensorFS.Value0SensorFS)) { //todo change to Value01SensorFS to support GYRO-G&A
2122

@@ -46,7 +47,7 @@ case class Ev3Gyroscope(override val port: SensorPort, initialSensorDir: Option[
4647
sealed case class HeadingMode() extends Mode {
4748
val name = "GYRO-ANG"
4849

49-
@volatile var offset: Degrees = 0.degrees
50+
@volatile private var offset: Degrees = 0.degrees
5051
zero()
5152

5253
/**
@@ -75,6 +76,7 @@ case class Ev3Gyroscope(override val port: SensorPort, initialSensorDir: Option[
7576
/**
7677
* Angle change rate in degrees per second
7778
*/
79+
//noinspection ScalaUnusedSymbol
7880
sealed case class RateMode() extends Mode {
7981
val name = "GYRO-RATE"
8082

@@ -179,13 +181,14 @@ TILT-ANG [24] Angle (2nd axis) deg (degrees) 0 1 value0: Angle (-32768 to 32767)
179181

180182
while ( {
181183
try {
184+
//noinspection ZeroIndexToHead
182185
reportProgress(0)()
183186
val legoPortDir: Path = scanForPortDir()
184187
Log.log(s"legoPortDir is $legoPortDir")
185188
reportProgress(1)()
186189
restartSensorSoftBoot(legoPortDir)
187190
reportProgress(2)()
188-
!scanForSensor(port) //keep looking if no sensor found
191+
!scanForSensor(port) // keep looking if no sensor found
189192
} catch {
190193
case GadgetUnplugged(_) => true
191194
}
@@ -197,7 +200,7 @@ TILT-ANG [24] Angle (2nd axis) deg (degrees) 0 1 value0: Angle (-32768 to 32767)
197200

198201
reportProgress(3)()
199202

200-
Log.log(s"Successfully despun")
203+
Log.log(s"Successfully de-spun")
201204
}
202205
}
203206

Ev3LangScala/src/ev3dev4s/sysfs/ChannelRewriter.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package ev3dev4s.sysfs
33
import java.nio.ByteBuffer
44
import java.nio.channels.FileChannel
55
import java.nio.charset.StandardCharsets
6-
import java.nio.file.{AccessDeniedException, Path, StandardOpenOption}
7-
import scala.annotation.tailrec
6+
import java.nio.file.{Path, StandardOpenOption}
87

98
/**
109
*

Ev3LangScala/src/ev3dev4s/sysfs/GadgetPortScanner.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import scala.collection.immutable.ArraySeq
1010
* @author David Walend
1111
* @since v0.0.0
1212
*/
13+
//noinspection ScalaUnnecessaryParentheses
1314
abstract class GadgetPortScanner[P <: Port](gadgetDir: File, ports: Array[P]) {
1415

1516
val namesToPorts: Map[Char, P] = ports.map { p => p.name -> p }.toMap

Ev3LangScalaExample/src/ev3dev4s/sensors/gyroscope/examples/GyroDriveStraight.scala

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package ev3dev4s.sensors.gyroscope.examples
22

3-
import ev3dev4s.actuators.{Motor, MotorCommand, MotorPort, MotorStopCommand, MotorState}
3+
import ev3dev4s.actuators.{Motor, MotorCommand, MotorPort, MotorStopCommand}
44
import ev3dev4s.sensors.{Ev3Gyroscope, Ev3KeyPad}
55
import ev3dev4s.{Ev3System, Log}
6-
import ev3dev4s.scala2measure.Degrees
6+
import ev3dev4s.scala2measure.{Degrees, DegreesPerSecond, DutyCycle, MilliMeters}
77
import ev3dev4s.scala2measure.Conversions._
8-
import ev3dev4s.scala2measure.DegreesPerSecond
9-
import ev3dev4s.scala2measure.DutyCycle
108

119
/**
1210
*
@@ -100,15 +98,15 @@ object GyroDriveStraight extends Runnable {
10098
val leftIdeal = ((dutyCycle + steerAdjust) / 10.unitless).dutyCyclePercent
10199
val rightIdeal = ((dutyCycle - steerAdjust) / 10.unitless).dutyCyclePercent
102100
(leftIdeal, rightIdeal)
103-
//todo for fractions
104-
//val (leftSteering, rightSteering) = (leftIdeal,rightIdeal)
105-
//todo for fractions
106-
//if(leftIdeal != rightIdeal) (leftIdeal,rightIdeal)
107-
//else if(steerAdjust.v > 0) (leftIdeal+1,rightIdeal)
108-
//else if(steerAdjust.v < 0) (leftIdeal,rightIdeal+1)
109-
//else (leftIdeal,rightIdeal)
110-
//todo speed up very slow movement by 10. Not sure this is usefulif(leftSteering >= 10 && rightSteering >= 10) (leftSteering,rightSteering)
111-
//todo speed up very slow movement by 10. Not sure this is useful else (leftSteering+10,rightSteering+10)
101+
// todo for fractions
102+
// val (leftSteering, rightSteering) = (leftIdeal,rightIdeal)
103+
// todo for fractions
104+
// if(leftIdeal != rightIdeal) (leftIdeal,rightIdeal)
105+
// else if(steerAdjust.v > 0) (leftIdeal+1,rightIdeal)
106+
// else if(steerAdjust.v < 0) (leftIdeal,rightIdeal+1)
107+
// else (leftIdeal,rightIdeal)
108+
// todo speed up very slow movement by 10. Not sure this is useful: if(leftSteering >= 10 && rightSteering >= 10) (leftSteering,rightSteering)
109+
// todo speed up very slow movement by 10. Not sure this is useful else (leftSteering+10,rightSteering+10)
112110
}
113111

114112
val (leftDutyCycle, rightDutyCycle) = dutyCyclesFromAdjust()
@@ -211,7 +209,7 @@ object GyroDriveStraight extends Runnable {
211209
212210
/**
213211
* Adjust the speed based on the current gyro heading to drive in an arc.
214-
* This method assumes the goal absolute postions have already been written
212+
* This method assumes the goal absolute positions have already been written
215213
*
216214
* @param goalHeading that the gyroscope should read during this traverse
217215
* @param averageSpeed degrees/second for moving the robot quickly
@@ -273,12 +271,12 @@ object GyroDriveStraight extends Runnable {
273271
//noinspection ScalaUnusedSymbol
274272
object Robot {
275273

276-
val driveWheelDiameter = 11.studs
277-
val driveWheelCircumference = (driveWheelDiameter.v * Math.PI.toFloat).mm
274+
val driveWheelDiameter: MilliMeters = 11.studs
275+
val driveWheelCircumference: MilliMeters = (driveWheelDiameter.v * Math.PI.toFloat).mm
278276

279-
val robotWheelbase = 18.studs
277+
val robotWheelbase: MilliMeters = 18.studs
280278

281-
val keypad = Ev3System.keyPad
279+
val keypad: Ev3KeyPad.type = Ev3System.keyPad
282280

283281
val gyroscope: Ev3Gyroscope = Ev3System.portsToSensors.values.collectFirst { case gyro: Ev3Gyroscope => gyro }.get
284282
val headingMode: gyroscope.HeadingMode = gyroscope.headingMode()

Ev3LangScalaExample/src/ev3dev4s/timing/GyroFeedbackLoop.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ import ev3dev4s.scala2measure.Conversions._
1010
import ev3dev4s.sensors.Ev3KeyPad
1111
import ev3dev4s.scala2measure.DutyCycle
1212

13+
1314
/**
1415
* A test of time to run a reasonable control loop for various comparisons
1516
*
1617
* Baseline - before messing with unit-based numbers in controls
1718
* 1638416904531 13929 loop closures in 60000 for 4.30756 milliseconds per loop closure
1819
*
19-
* With my own units for Degrees and Percent (duty cyle)
20+
* With my own units for Degrees and Percent (duty cycle)
2021
* 1639715964387 14436 loop closures in 60000 for 4.1562757 milliseconds per loop closure
2122
*
2223
* With my own universal trait for the arithmetic operations

0 commit comments

Comments
 (0)