Skip to content

Commit

Permalink
Merge pull request #22 from fiurin/topic/review-text
Browse files Browse the repository at this point in the history
Fix multiple text issues
  • Loading branch information
Emantor committed May 25, 2023
2 parents 8232cf2 + 9af7286 commit 3be950e
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 19 deletions.
12 changes: 6 additions & 6 deletions openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ openapi: 3.0.3

info:
title: LXA TAC HTTP API
description: Control and view inputs and outputs of you LXA TAC
description: Control and view inputs and outputs of your LXA TAC
version: 0.1.0

paths:
Expand Down Expand Up @@ -129,7 +129,7 @@ paths:

/v1/dut/powered:
get:
summary: Get the current Power Switch state
summary: Get the current power switch state
tags: [DUT Power]
responses:
'200':
Expand All @@ -141,7 +141,7 @@ paths:
put:
summary: Try to set the power switch state
description: >
While the request will return immediately with a sucessful response, this does not mean
While the request will return immediately with a successful response, this does not mean
that the switch is actually on at this or a later point in time.
You will always have to check with e.g. a GET request if you really want to know, as an
error state could always take precedence.
Expand Down Expand Up @@ -259,7 +259,7 @@ paths:

/v1/tac/setup_mode:
get:
summary: Check if the TAC has completed the set up or still in setup mode
summary: Check if the TAC has completed the set up or is still in setup mode
tags: [System]
responses:
'200':
Expand Down Expand Up @@ -366,7 +366,7 @@ paths:
/v1/output/{out_n}/asserted:
parameters:
- name: out_n
description: The name of the output to get or modify
description: The name of the output, that shall be asserted
required: true
schema:
type: string
Expand Down Expand Up @@ -710,7 +710,7 @@ paths:
'204':
description: The value was parsed as string and will be tried
'400':
description: The value could not be parsed as boolean
description: The value could not be parsed as string

/v1/tac/network/hostname:
get:
Expand Down
2 changes: 1 addition & 1 deletion src/ui/screens/reboot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fn rly(draw_target: &mut FramebufferDrawTarget) {
let text_style: MonoTextStyle<BinaryColor> = MonoTextStyle::new(&UI_TEXT_FONT, BinaryColor::On);

Text::with_alignment(
"Really reboot?\nLong press to confirm",
"Really reboot?\nLong press lower\nbutton to confirm.",
Point::new(120, 120),
text_style,
Alignment::Center,
Expand Down
2 changes: 1 addition & 1 deletion src/ui/screens/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl MountableScreen for SetupScreen {
Point::new(120, 55),
Box::new(|connectivity| match connectivity {
Connectivity::Nothing => {
"Welcome to your TAC!\n\n\nPlease connect\nto a network\nto continue\n the setup".into()
"Welcome to your TAC!\n\n\nPlease connect\nto a network\nto continue\nthe setup".into()
}
Connectivity::HostnameOnly(c) | Connectivity::IpOnly(c) => {
format!("Welcome to your TAC!\n\nPlease continue the\nsetup at:\n\n\nhttp://{c}")
Expand Down
16 changes: 10 additions & 6 deletions web/src/DashboardDut.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export default function DashboardDut() {
header={
<Header
variant="h2"
description="Set bootmodes or reset the DUT via jumper pins"
description="Set boot modes or reset the DUT via jumper pins"
>
Isolated Outputs
</Header>
Expand Down Expand Up @@ -202,11 +202,15 @@ export default function DashboardDut() {
<>
<p>
The OUT_{port} voltage is measured between the two OUT_
{port} pins. As the two pins can generally be used
interchangeably, you will most likely not care about the
polarity of this voltage. This is why the absolute is
shown in the bar graph and the text representation. If
you want to see the polarity you can refer to the plots.
{port} pins. The bar graph and the text representation
show the absolute voltage, because the two pins can
generally be used interchangeably and we assume, that
you will most likely not care about the polarity of this
voltage.
</p>
<p>
However, if you want to see the polarity you can refer
to the plots.
</p>
<p>
The voltages on the OUT_{port} pins is isolated from the
Expand Down
2 changes: 1 addition & 1 deletion web/src/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default function LandingPage() {
{
name: "Settings / Labgrid",
href: "/#/settings/labgrid",
description: "Modify the Labgrid exporter config",
description: "Modify the labgrid exporter config",
},
{
name: "Documentation / REST API",
Expand Down
2 changes: 1 addition & 1 deletion web/src/SettingsLabgrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default function SettingsLabgrid() {
header={
<Header
variant="h2"
description="Restart the Labgrid exporter service and view its log"
description="Restart the labgrid exporter service and view its log"
>
Labgrid Exporter Status
</Header>
Expand Down
4 changes: 2 additions & 2 deletions web/src/Setup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ function SshWizard(props: WizardProps) {
},
{
title: "Configure Labgrid",
description: "Configure your Labgrid Exporter",
description: "Configure your labgrid Exporter",
isOptional: true,
content: (
<Container>
Expand All @@ -227,7 +227,7 @@ function SshWizard(props: WizardProps) {
},
{
title: "Test Labgrid",
description: "Make sure your Labgrid Exporter Service looks healty",
description: "Make sure your labgrid Exporter Service looks healty",
isOptional: true,
content: (
<Container>
Expand Down
2 changes: 1 addition & 1 deletion web/src/TacComponents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export function RaucSlotStatus() {
header={
<Header
variant="h3"
description="The root filesystem contains your applications and settings"
description="The root file system contains your applications and settings"
>
Root Filesystem Slots
</Header>
Expand Down

0 comments on commit 3be950e

Please sign in to comment.