azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed interfaces according to new SonarRequest format

Browse Source
This commit is contained in:
MaximZaitsev
2016-08-29 12:10:01 +03:00
parent dc16f3e480
commit e828a1e0f1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
car_srv/kotlinSrv/src/Test.kt
+5 -5
View File
@@ -7,7 +7,7 @@ fun runTests() {
private fun testCarEmulator() { private fun testCarEmulator() {
val controller = ControllerEmulator() val controller = ControllerEmulator()
var sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(2, { x -> x * 90 })).build() var sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(2, { x -> x * 90 }), IntArray(0), 0, SonarRequest.Smoothing.NONE).build()
var sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build() var sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build()
controller.executeRequestSensorData(sonarRequest, { bytes -> controller.executeRequestSensorData(sonarRequest, { bytes ->
sonarResponse.mergeFrom(CodedInputStream(bytes)) sonarResponse.mergeFrom(CodedInputStream(bytes))
@@ -18,7 +18,7 @@ private fun testCarEmulator() {
}) })
println("--------------------") println("--------------------")
sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(2, { 120 + 60 * it })).build() sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(2, { 120 + 60 * it }), IntArray(0), 0, SonarRequest.Smoothing.NONE).build()
sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build() sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build()
controller.executeRequestSensorData(sonarRequest, { bytes -> controller.executeRequestSensorData(sonarRequest, { bytes ->
sonarResponse.mergeFrom(CodedInputStream(bytes)) sonarResponse.mergeFrom(CodedInputStream(bytes))
@@ -32,7 +32,7 @@ private fun testCarEmulator() {
CarState.instance.x = 50 CarState.instance.x = 50
CarState.instance.y = 50 CarState.instance.y = 50
CarState.instance.angle = 90 CarState.instance.angle = 90
sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(3, { x -> x * 90 })).build() sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(3, { x -> x * 90 }), IntArray(0), 0, SonarRequest.Smoothing.NONE).build()
sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build() sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build()
controller.executeRequestSensorData(sonarRequest, { bytes -> controller.executeRequestSensorData(sonarRequest, { bytes ->
sonarResponse.mergeFrom(CodedInputStream(bytes)) sonarResponse.mergeFrom(CodedInputStream(bytes))
@@ -48,7 +48,7 @@ private fun testCarEmulator() {
CarState.instance.x = 50 CarState.instance.x = 50
CarState.instance.y = 50 CarState.instance.y = 50
CarState.instance.angle = 720 + 45 CarState.instance.angle = 720 + 45
sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(1, { x -> 90 })).build() sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(1, { x -> 90 }), IntArray(0), 0, SonarRequest.Smoothing.NONE).build()
sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build() sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build()
controller.executeRequestSensorData(sonarRequest, { bytes -> controller.executeRequestSensorData(sonarRequest, { bytes ->
sonarResponse.mergeFrom(CodedInputStream(bytes)) sonarResponse.mergeFrom(CodedInputStream(bytes))
@@ -60,7 +60,7 @@ private fun testCarEmulator() {
CarState.instance.x = 150 CarState.instance.x = 150
CarState.instance.y = 50 CarState.instance.y = 50
CarState.instance.angle = 0 CarState.instance.angle = 0
sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(7, { it*5 })).build() sonarRequest = SonarRequest.BuilderSonarRequest(IntArray(7, { it * 5 }), IntArray(0), 0, SonarRequest.Smoothing.NONE).build()
sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build() sonarResponse = SonarResponse.BuilderSonarResponse(IntArray(0)).build()
controller.executeRequestSensorData(sonarRequest, { bytes -> controller.executeRequestSensorData(sonarRequest, { bytes ->
sonarResponse.mergeFrom(CodedInputStream(bytes)) sonarResponse.mergeFrom(CodedInputStream(bytes))
car_srv/kotlinSrv/src/net/server/handlers/main/GetSonarData.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import encodeProtoBuf
import net.server.handlers.AbstractHandler import net.server.handlers.AbstractHandler
class GetSonarData(val controller: Controller) : AbstractHandler() { class GetSonarData(val controller: Controller) : AbstractHandler() {
val fromServerObjectBuilder = SonarRequest.BuilderSonarRequest(IntArray(0)) val fromServerObjectBuilder = SonarRequest.BuilderSonarRequest(IntArray(0), IntArray(0), 0, SonarRequest.Smoothing.NONE)
val toServerObjectBuilder = SonarResponse.BuilderSonarResponse(IntArray(0)) val toServerObjectBuilder = SonarResponse.BuilderSonarResponse(IntArray(0))
override fun getBytesResponse(data: ByteArray, callback: (ByteArray) -> Unit) { override fun getBytesResponse(data: ByteArray, callback: (ByteArray) -> Unit) {