@@ -9,6 +9,14 @@ import {
99 NativeSelect ,
1010 NativeSelectOption ,
1111} from "@/components/ui/native-select" ;
12+ import {
13+ Sidebar ,
14+ SidebarFooter ,
15+ SidebarHeader ,
16+ SidebarMenu ,
17+ SidebarMenuButton ,
18+ SidebarMenuItem ,
19+ } from "@/components/ui/sidebar" ;
1220import { apiErrorSchema , requestJson } from "./api.js" ;
1321import hebbianLogo from "./hebbian-logo.svg" ;
1422import { MotorIds } from "./motor-ids.js" ;
@@ -107,8 +115,8 @@ const labels: Record<string, string> = {
107115} ;
108116const calibrationCameraPosition : [ number , number , number ] = [ 0.9 , - 0.9 , 0.75 ] ;
109117const calibrationCameraTarget : [ number , number , number ] = [ 0.1 , 0 , 0.25 ] ;
110- const previewCameraPosition : [ number , number , number ] = [ 0.61 , - 0.62 , 0.48 ] ;
111- const previewCameraTarget : [ number , number , number ] = [ 0.16 , 0 , 0.17 ] ;
118+ const restingCameraPosition : [ number , number , number ] = [ 0.43 , - 0.46 , 0.32 ] ;
119+ const restingCameraTarget : [ number , number , number ] = [ 0.03 , 0 , 0.08 ] ;
112120
113121async function submitCalibrationAction (
114122 action : Action ,
@@ -243,33 +251,49 @@ function App() {
243251 const showReference =
244252 stage === "reference" ||
245253 Boolean ( view ?. can_recalibrate_joint && jointToRecalibrate ) ;
254+ const showRestingPose = previewingModel || showReference ;
246255 const softGripper = view ?. model_variant === "soft-gripper-camera" ;
247256 const measuredAngles = new Map (
248257 view ?. joints . map ( ( joint ) => [ joint . name , joint . position_radians ] ) ,
249258 ) ;
250259 return (
251- < main >
252- < header className = "app-bar" >
253- < div className = "brand" >
254- < img src = { hebbianLogo } alt = "" />
255- < span >
256- Hebbian < strong > Robot Use</ strong >
257- </ span >
258- </ div >
260+ < div className = "setup-layout" >
261+ < Sidebar className = "setup-sidebar" >
262+ < SidebarHeader className = "p-0" >
263+ < div className = "brand" >
264+ < img src = { hebbianLogo } alt = "" />
265+ < span >
266+ Hebbian < strong > Robot Use</ strong >
267+ </ span >
268+ </ div >
269+ </ SidebarHeader >
259270 < nav className = "setup-navigation" aria-label = "SO-101 setup" >
260- < a href = "/" aria-current = { programmingMotorIds ? undefined : "page" } >
261- < SlidersHorizontal aria-hidden = "true" />
262- Calibrate arm
263- </ a >
264- < a
265- href = "/motor-ids"
266- aria-current = { programmingMotorIds ? "page" : undefined }
267- >
268- < Cpu aria-hidden = "true" />
269- Program motor IDs
270- </ a >
271+ < SidebarMenu >
272+ < SidebarMenuItem >
273+ < SidebarMenuButton asChild isActive = { ! programmingMotorIds } >
274+ < a
275+ href = "/"
276+ aria-current = { programmingMotorIds ? undefined : "page" }
277+ >
278+ < SlidersHorizontal aria-hidden = "true" />
279+ Calibrate arm
280+ </ a >
281+ </ SidebarMenuButton >
282+ </ SidebarMenuItem >
283+ < SidebarMenuItem >
284+ < SidebarMenuButton asChild isActive = { programmingMotorIds } >
285+ < a
286+ href = "/motor-ids"
287+ aria-current = { programmingMotorIds ? "page" : undefined }
288+ >
289+ < Cpu aria-hidden = "true" />
290+ Program motor IDs
291+ </ a >
292+ </ SidebarMenuButton >
293+ </ SidebarMenuItem >
294+ </ SidebarMenu >
271295 </ nav >
272- < div className = "app-tools" >
296+ < SidebarFooter className = "app-tools flex-row p-0 " >
273297 < a
274298 className = "github-link"
275299 href = "https://github.com/Hebbian-Robotics/so101"
@@ -281,10 +305,10 @@ function App() {
281305 < span className = "visually-hidden" > SO-101 GitHub repository</ span >
282306 </ a >
283307 < ThemeMenu theme = { theme } onThemeChange = { setTheme } />
284- </ div >
285- </ header >
308+ </ SidebarFooter >
309+ </ Sidebar >
286310
287- < div className = "setup-content" >
311+ < main className = "setup-content" >
288312 < header className = "page-heading" >
289313 < div >
290314 < h1 > { programmingMotorIds ? "Program motor IDs" : "Calibration" } </ h1 >
@@ -788,13 +812,15 @@ function App() {
788812 >
789813 { stage === "sweep" ? (
790814 < p role = "status" > The model appears after the sweep.</ p >
815+ ) : ! view ? (
816+ < p role = "status" > Waiting for the calibration server…</ p >
791817 ) : (
792818 < Suspense fallback = { < p role = "status" > Loading SO-101 model…</ p > } >
793819 < RobotScene
794820 darkMode = { darkMode }
795821 title = {
796822 previewingModel
797- ? "Robot preview"
823+ ? "Resting pose preview"
798824 : showReference
799825 ? "Resting pose reference"
800826 : stage === "saved" || stage === "error"
@@ -807,28 +833,26 @@ function App() {
807833 : "robot/so101/robot.urdf"
808834 }
809835 cameraPosition = {
810- previewingModel
811- ? previewCameraPosition
836+ showRestingPose
837+ ? restingCameraPosition
812838 : calibrationCameraPosition
813839 }
814840 cameraTarget = {
815- previewingModel
816- ? previewCameraTarget
841+ showRestingPose
842+ ? restingCameraTarget
817843 : calibrationCameraTarget
818844 }
819845 jointNames = { jointNames }
820846 measuredJoints = {
821- previewingModel
822- ? jointNames . map ( ( ) => 0 )
823- : showReference
824- ? ( view ?. home_joints_radians ?? [ ] )
825- : jointNames . map (
826- ( name ) => measuredAngles . get ( name ) ?? null ,
827- )
847+ showRestingPose
848+ ? view . home_joints_radians
849+ : jointNames . map (
850+ ( name ) => measuredAngles . get ( name ) ?? null ,
851+ )
828852 }
829853 gripperAngleRadians = {
830- showReference
831- ? view ? .home_gripper_radians
854+ showRestingPose
855+ ? view . home_gripper_radians
832856 : measuredAngles . get ( "gripper" )
833857 }
834858 />
@@ -928,8 +952,8 @@ function App() {
928952 </ section >
929953 </ div >
930954 ) }
931- </ div >
932- </ main >
955+ </ main >
956+ </ div >
933957 ) ;
934958}
935959
0 commit comments