Skip to content

Commit ebe76b4

Browse files
MichaelLesirgeMichaelLesirge
authored
Controls update #2, and launch calculator offsets tuning option (#82)
* controls update, and launch calc offsets * split up launch reverse command * add javadoc comments, helps when skimming * format --------- Co-authored-by: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
1 parent c9e1f35 commit ebe76b4

File tree

6 files changed

+299
-158
lines changed

6 files changed

+299
-158
lines changed

‎src/main/deploy/elastic-layout.json‎

Lines changed: 146 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"x": 384.0,
1212
"y": 256.0,
1313
"width": 256.0,
14-
"height": 384.0,
14+
"height": 320.0,
1515
"type": "List Layout",
1616
"properties": {
1717
"label_position": "TOP"
@@ -350,20 +350,6 @@
350350
"false_icon": "None"
351351
}
352352
},
353-
{
354-
"title": "AbsolutePositionRad",
355-
"x": 128.0,
356-
"y": 512.0,
357-
"width": 256.0,
358-
"height": 128.0,
359-
"type": "Text Display",
360-
"properties": {
361-
"topic": "/AdvantageKit/Intake/Slapdown/AbsolutePositionRad",
362-
"period": 0.06,
363-
"data_type": "double",
364-
"show_submit_button": false
365-
}
366-
},
367353
{
368354
"title": "isReady",
369355
"x": 640.0,
@@ -397,6 +383,34 @@
397383
"true_icon": "None",
398384
"false_icon": "None"
399385
}
386+
},
387+
{
388+
"title": "HoodPositionOffset",
389+
"x": 512.0,
390+
"y": 576.0,
391+
"width": 128.0,
392+
"height": 128.0,
393+
"type": "Text Display",
394+
"properties": {
395+
"topic": "/AdvantageKit/RealOutputs/LaunchCalculator/HoodPositionOffset",
396+
"period": 0.06,
397+
"data_type": "double",
398+
"show_submit_button": false
399+
}
400+
},
401+
{
402+
"title": "WheelRadPerSecOffset",
403+
"x": 384.0,
404+
"y": 576.0,
405+
"width": 128.0,
406+
"height": 128.0,
407+
"type": "Text Display",
408+
"properties": {
409+
"topic": "/AdvantageKit/RealOutputs/LaunchCalculator/WheelRadPerSecOffset",
410+
"period": 0.06,
411+
"data_type": "double",
412+
"show_submit_button": false
413+
}
400414
}
401415
]
402416
}
@@ -2070,53 +2084,84 @@
20702084
]
20712085
},
20722086
{
2073-
"title": "Hopper",
2074-
"x": 1152.0,
2075-
"y": 0.0,
2076-
"width": 384.0,
2077-
"height": 128.0,
2087+
"title": "LauncherTuning",
2088+
"x": 256.0,
2089+
"y": 128.0,
2090+
"width": 256.0,
2091+
"height": 384.0,
20782092
"type": "List Layout",
20792093
"properties": {
20802094
"label_position": "TOP"
20812095
},
20822096
"children": [
20832097
{
2084-
"title": "mode",
2098+
"title": "DesiredWheelRadPerSec",
20852099
"x": 0.0,
20862100
"y": 0.0,
20872101
"width": 128.0,
20882102
"height": 128.0,
2089-
"type": "Large Text Display",
2103+
"type": "Text Display",
20902104
"properties": {
2091-
"topic": "/AdvantageKit/RealOutputs/Hopper/mode",
2105+
"topic": "/SmartDashboard/LauncherTuning/DesiredWheelRadPerSec",
20922106
"period": 0.06,
2093-
"data_type": "string"
2107+
"data_type": "double",
2108+
"show_submit_button": true
20942109
}
2095-
}
2096-
]
2097-
},
2098-
{
2099-
"title": "Intake",
2100-
"x": 768.0,
2101-
"y": 0.0,
2102-
"width": 384.0,
2103-
"height": 128.0,
2104-
"type": "List Layout",
2105-
"properties": {
2106-
"label_position": "TOP"
2107-
},
2108-
"children": [
2110+
},
21092111
{
2110-
"title": "mode",
2112+
"title": "DesiredHoodPosition",
21112113
"x": 0.0,
21122114
"y": 0.0,
21132115
"width": 128.0,
21142116
"height": 128.0,
2115-
"type": "Large Text Display",
2117+
"type": "Text Display",
2118+
"properties": {
2119+
"topic": "/SmartDashboard/LauncherTuning/DesiredHoodPosition",
2120+
"period": 0.06,
2121+
"data_type": "double",
2122+
"show_submit_button": true
2123+
}
2124+
},
2125+
{
2126+
"title": "CalculatorDistance",
2127+
"x": 0.0,
2128+
"y": 0.0,
2129+
"width": 128.0,
2130+
"height": 128.0,
2131+
"type": "Text Display",
21162132
"properties": {
2117-
"topic": "/AdvantageKit/RealOutputs/Intake/mode",
2133+
"topic": "/SmartDashboard/LauncherTuning/CalculatorDistance",
21182134
"period": 0.06,
2119-
"data_type": "string"
2135+
"data_type": "double",
2136+
"show_submit_button": false
2137+
}
2138+
},
2139+
{
2140+
"title": "MeasuredWheelRadPerSec",
2141+
"x": 0.0,
2142+
"y": 0.0,
2143+
"width": 128.0,
2144+
"height": 128.0,
2145+
"type": "Text Display",
2146+
"properties": {
2147+
"topic": "/SmartDashboard/LauncherTuning/MeasuredWheelRadPerSec",
2148+
"period": 0.06,
2149+
"data_type": "double",
2150+
"show_submit_button": false
2151+
}
2152+
},
2153+
{
2154+
"title": "CalculatorDistanceAdjustedInches",
2155+
"x": 384.0,
2156+
"y": 512.0,
2157+
"width": 128.0,
2158+
"height": 128.0,
2159+
"type": "Text Display",
2160+
"properties": {
2161+
"topic": "/SmartDashboard/LauncherTuning/CalculatorDistanceAdjustedInches",
2162+
"period": 0.06,
2163+
"data_type": "double",
2164+
"show_submit_button": false
21202165
}
21212166
}
21222167
]
@@ -2208,89 +2253,106 @@
22082253
}
22092254
},
22102255
{
2211-
"title": "mode",
2212-
"x": 0.0,
2256+
"title": "Scheduler",
2257+
"x": 512.0,
22132258
"y": 0.0,
2214-
"width": 128.0,
2215-
"height": 128.0,
2216-
"type": "Text Display",
2259+
"width": 256.0,
2260+
"height": 512.0,
2261+
"type": "Scheduler",
22172262
"properties": {
2218-
"topic": "/AdvantageKit/RealOutputs/Launcher/mode",
2219-
"period": 0.06,
2220-
"data_type": "string",
2221-
"show_submit_button": false
2263+
"topic": "/SmartDashboard/Scheduler",
2264+
"period": 0.06
22222265
}
22232266
},
22242267
{
2225-
"title": "preferredMode",
2226-
"x": 128.0,
2268+
"title": "intake mode",
2269+
"x": 768.0,
22272270
"y": 0.0,
2228-
"width": 128.0,
2271+
"width": 384.0,
22292272
"height": 128.0,
2230-
"type": "Text Display",
2273+
"type": "Large Text Display",
22312274
"properties": {
2232-
"topic": "/AdvantageKit/RealOutputs/Launcher/preferredMode",
2275+
"topic": "/AdvantageKit/RealOutputs/Intake/mode",
22332276
"period": 0.06,
2234-
"data_type": "string",
2235-
"show_submit_button": false
2277+
"data_type": "string"
22362278
}
22372279
},
22382280
{
2239-
"title": "DesiredVelocity",
2240-
"x": 256.0,
2241-
"y": 128.0,
2242-
"width": 128.0,
2281+
"title": "hopper mode",
2282+
"x": 1152.0,
2283+
"y": 0.0,
2284+
"width": 384.0,
22432285
"height": 128.0,
2244-
"type": "Text Display",
2286+
"type": "Large Text Display",
22452287
"properties": {
2246-
"topic": "/AdvantageKit/RealOutputs/Launcher/DesiredVelocity",
2288+
"topic": "/AdvantageKit/RealOutputs/Hopper/mode",
22472289
"period": 0.06,
2248-
"data_type": "double",
2249-
"show_submit_button": false
2290+
"data_type": "string"
22502291
}
22512292
},
22522293
{
2253-
"title": "manualMode",
2254-
"x": 256.0,
2294+
"title": "isReady",
2295+
"x": 128.0,
22552296
"y": 0.0,
2256-
"width": 256.0,
2297+
"width": 128.0,
22572298
"height": 128.0,
2258-
"type": "Text Display",
2299+
"type": "Boolean Box",
22592300
"properties": {
2260-
"topic": "/AdvantageKit/RealOutputs/Launcher/manualMode",
2301+
"topic": "/AdvantageKit/RealOutputs/Launcher/isReady",
22612302
"period": 0.06,
2262-
"data_type": "string",
2263-
"show_submit_button": false
2303+
"data_type": "boolean",
2304+
"true_color": 4283215696,
2305+
"false_color": 4294198070,
2306+
"true_icon": "None",
2307+
"false_icon": "None"
22642308
}
22652309
},
22662310
{
2267-
"title": "Scheduler",
2268-
"x": 512.0,
2311+
"title": "isReadyDebounced",
2312+
"x": 256.0,
22692313
"y": 0.0,
2270-
"width": 256.0,
2271-
"height": 512.0,
2272-
"type": "Scheduler",
2314+
"width": 128.0,
2315+
"height": 128.0,
2316+
"type": "Boolean Box",
22732317
"properties": {
2274-
"topic": "/SmartDashboard/Scheduler",
2275-
"period": 0.06
2318+
"topic": "/AdvantageKit/RealOutputs/Launcher/isReadyDebounced",
2319+
"period": 0.06,
2320+
"data_type": "boolean",
2321+
"true_color": 4283215696,
2322+
"false_color": 4294198070,
2323+
"true_icon": "None",
2324+
"false_icon": "None"
22762325
}
22772326
},
22782327
{
2279-
"title": "isReady",
2280-
"x": 384.0,
2281-
"y": 128.0,
2328+
"title": "isRunning",
2329+
"x": 0.0,
2330+
"y": 0.0,
22822331
"width": 128.0,
22832332
"height": 128.0,
22842333
"type": "Boolean Box",
22852334
"properties": {
2286-
"topic": "/AdvantageKit/RealOutputs/Launcher/isReady",
2335+
"topic": "/AdvantageKit/RealOutputs/Launcher/isRunning",
22872336
"period": 0.06,
22882337
"data_type": "boolean",
22892338
"true_color": 4283215696,
22902339
"false_color": 4294198070,
22912340
"true_icon": "None",
22922341
"false_icon": "None"
22932342
}
2343+
},
2344+
{
2345+
"title": "runMode",
2346+
"x": 384.0,
2347+
"y": 0.0,
2348+
"width": 128.0,
2349+
"height": 128.0,
2350+
"type": "Large Text Display",
2351+
"properties": {
2352+
"topic": "/AdvantageKit/RealOutputs/Launcher/runMode",
2353+
"period": 0.06,
2354+
"data_type": "string"
2355+
}
22942356
}
22952357
]
22962358
}

0 commit comments

Comments
 (0)