Carter
f9a1329efd
Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment
2025-11-13 16:04:47 -06:00
Carter
f1ec343fd2
Merge branch 'contract_page_load' into dev_environment
2025-11-13 16:04:31 -06:00
Carter
90cac4f49f
fixed bug with co missing in the gas readings column
2025-11-13 16:04:17 -06:00
csawatzky
19aefc8774
Merge branch 'reverse_nodes' into dev_environment, also increased the one wire scan feature to 2.1.9
2025-11-13 11:34:52 -06:00
csawatzky
54d995ae2d
added toggle for node reversal to the component form, limited it to firmware version 2.1.8 or higher
2025-11-13 11:25:44 -06:00
Carter
4ffcc06dd6
Merge branch 'contract_page_load' into dev_environment
2025-11-13 10:56:13 -06:00
Carter
d41853e0f2
fixed timestamp issue with displaying sen/temp/gas columns
2025-11-13 10:55:46 -06:00
csawatzky
d831677769
hotfix for the moisture not being visible for custom grain types
2025-11-12 16:30:49 -06:00
Carter
4c5c9ba8be
merged contracts page fix
2025-11-10 13:07:40 -06:00
Carter
181f1194e2
set loading to false in the finally stage
2025-11-10 13:06:40 -06:00
Carter
6143e0aba1
got rid of render order error
2025-11-10 12:49:22 -06:00
Carter
7c6f592997
Merge branch 'staging_environment'
2025-11-07 14:08:32 -06:00
csawatzky
25bce682ad
Merge branch 'onewire_detect' into dev_environment
2025-11-04 14:31:48 -06:00
csawatzky
14126fd7c5
adding button for clearing all of the scans, including ones that were replaced by new scans
2025-11-04 14:16:40 -06:00
csawatzky
efb3c9eb59
use scanType instead of type
2025-11-04 12:29:08 -06:00
csawatzky
8dcc040558
fixing the url for the api call
2025-11-04 12:28:21 -06:00
csawatzky
10308942ac
now passing the type to the remove function for scans
2025-11-04 12:27:10 -06:00
csawatzky
2a8aeed510
hotfix for the gate svg for having two degree symbols
2025-11-04 10:48:27 -06:00
csawatzky
487c8617e4
first iteration of basic layout
2025-11-03 16:41:26 -06:00
csawatzky
ff5d90a635
Merge branch 'onewire_detect' into dev_environment
2025-11-03 13:37:02 -06:00
csawatzky
65cb7acbab
finished the functionality for adding components from the scan
2025-11-03 13:23:02 -06:00
csawatzky
6b0dd9ff41
Merge branch 'master' into onewire_detect
2025-11-03 10:51:29 -06:00
csawatzky
beee7b6f2a
hotfix for putting the interactions on the component cards
...
the interactions are loading and being added correctly but when determining which card to display the interaction on it was not considering the expansion and mux lines in the check for the same component id
2025-11-03 09:52:27 -06:00
csawatzky
8f601b360e
put in all the data that will be displayed
2025-11-03 09:22:47 -06:00
csawatzky
8fd63e249d
Merge branch 'i2c_detect' into staging_environment
2025-10-30 16:50:11 -06:00
csawatzky
c5a3487db0
added button to send down the onewire scan request
2025-10-30 16:49:00 -06:00
Carter
af279cb2f3
switched back to master proto
2025-10-29 12:12:30 -06:00
Carter
3d02759857
Merge branch 'chat_timestamp' into staging_environment
2025-10-29 11:03:48 -06:00
Carter
b63724fbfd
Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment
2025-10-29 11:03:33 -06:00
Carter
b458dea3b1
Merge branch 'chat_timestamp' into dev_environment
2025-10-29 11:03:18 -06:00
Carter
1c00976ac2
got rid of log
2025-10-29 11:03:03 -06:00
Carter
49e8160ccf
timestamping chat viewed timestamp when closing the header team chat
2025-10-29 10:50:41 -06:00
csawatzky
3825d56aff
fix for the mV decimals on drager sensors, there shouldn't be any
2025-10-28 09:34:40 -06:00
csawatzky
5c5d8debc4
fix for the mV decimals on drager sensors, there shouldn't be any
2025-10-28 09:33:55 -06:00
csawatzky
d63022ca88
fix for the drager voltage showing incorrectly on the chart for o2 subtypes
2025-10-28 09:27:42 -06:00
csawatzky
de526ddeb4
fix for drager voltage when it is an o2 subtype showing incorrectly on the chart
2025-10-28 09:26:46 -06:00
csawatzky
d6f33a873c
adding ne alarm subtype to the boolean output
2025-10-27 15:11:27 -06:00
csawatzky
33eb4e6eca
Merge branch 'master' into i2c_detect
2025-10-23 14:04:09 -06:00
csawatzky
98a1538167
fix for the I2C Drager stuff so it uses the expansion line and not cable id so the address type stays as 2, onewire drager will still use cable id
2025-10-23 13:01:54 -06:00
Carter
92d4892c65
merged timestamped status stuff
2025-10-22 11:24:50 -06:00
Carter
61ea77846c
got rid of accidental setting has plenums as true
2025-10-22 11:24:07 -06:00
Carter
5b6faca16d
switched to master proto
2025-10-22 10:46:17 -06:00
Carter
dd50fdc723
Merge branch 'staging_environment'
2025-10-22 10:36:43 -06:00
Carter
d5ef3c956f
Merge branch 'access_object'
2025-10-21 13:41:42 -06:00
Carter
d8e4052b87
merged access_object change
2025-10-21 13:41:20 -06:00
csawatzky
4659ba3751
hotfix for the offset check when grain cables are using a mode
2025-10-21 13:24:50 -06:00
Carter
d0f74cbc4e
Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment
2025-10-21 12:30:43 -06:00
Carter
deb3fabd45
Merge branch 'access_object' into dev_environment
2025-10-21 12:30:35 -06:00
Carter
ecd7f08510
got rid of extra divider when access object isn't there
2025-10-21 12:30:17 -06:00
Carter
9cab2b88c7
added access-object to allowable actions
2025-10-21 12:19:39 -06:00
