Skip to content

Commit

Permalink
Merge branch 'main' into playwright
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-pratt committed Feb 12, 2025
2 parents e075ee5 + 3638071 commit 802f550
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@
</v-toolbar>
<v-card-text class="mt-6">
Warning: Command {{ hazardousCommand }} is Hazardous. Send?
<br />
<span class="openc3-yellow"> Description: {{ commandDescription }} </span>
</v-card-text>
<v-card-actions class="px-2">
<v-spacer />
Expand Down Expand Up @@ -281,6 +283,7 @@ export default {
editor: null,
targetName: '',
commandName: '',
commandDescription: '',
paramList: '',
lastTargetName: '',
lastCommandName: '',
Expand Down Expand Up @@ -617,6 +620,7 @@ export default {
}
this.screenCount += 1
}
this.commandDescription = command.description
this.sendDisabled = false
this.status = ''
},
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<import-map-overrides-full
show-when-local-storage="devtools"
></import-map-overrides-full>
<script src="/js/fixImoStyle.js"></script>
<script>
;(function () {
Object.getPrototypeOf(System).firstGlobalProp = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<import-map-overrides-full
show-when-local-storage="devtools"
></import-map-overrides-full>
<script src="/js/fixImoStyle.js"></script>
<script>
;(function () {
Object.getPrototypeOf(System).firstGlobalProp = true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
# Copyright 2025, OpenC3, Inc.
# All Rights Reserved.
#
# This program is free software; you can modify and/or redistribute it
# under the terms of the GNU Affero General Public License
# as published by the Free Software Foundation; version 3 with
# attribution addendums as found in the LICENSE.txt
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# This file may also be used under the terms of a commercial license
# if purchased from OpenC3, Inc.
*/

;(function () {
const css = `
.imo-module-dialog {
color: black;
}
`

const style = document.createElement('style')
style.appendChild(document.createTextNode(css))
const imo = document.getElementsByTagName('import-map-overrides-full')
if (imo.length) {
imo[0].shadowRoot.appendChild(style)
}
})()
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,3 @@ input {
.v-list-item-action {
margin-right: 15px !important;
}

// Fix the single spa debug panel so the text is readable
.imo-modal-container form,
.imo-modal-container input {
color: black;
}
.imo-module-dialog tr {
background-color: white;
}
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<v-col :cols="colSize" style="max-width: 140px"> </v-col>
</v-row>
<v-row no-gutters class="pa-3">
<v-col v-if="hazardous" :cols="colSize" class="openc3-yellow"
>Description: {{ description }} (HAZARDOUS)</v-col
>
<v-col v-else :cols="colSize">Description: {{ description }} </v-col>
<v-col :cols="colSize" :class="{ 'openc3-yellow': hazardous }">
Description: {{ description }}
<template v-if="hazardous"> (HAZARDOUS) </template>
</v-col>
</v-row>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion openc3/python/openc3/packets/telemetry.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def identify(self, packet_data, target_names=None):
target = self.system.targets[target_name]
if target and target.tlm_unique_id_mode:
# Iterate through the packets and see if any represent the buffer
for _, packet in target_packets:
for _, packet in target_packets.items():
if packet.identify(packet_data):
return packet
else:
Expand Down

0 comments on commit 802f550

Please sign in to comment.