Commit Graph

397 Commits

Author SHA1 Message Date
Pritimay Sarkar
6937a4c9bd add new device ids in constants 2024-01-11 12:30:23 +05:30
Pritimay Sarkar
c6198386ef Merge branch 'dev' of https://gitlab.com/sminnovations/hpos into dev 2024-01-10 17:50:25 +05:30
Pritimay Sarkar
8248ac009a add new vendor id for pcb test 2024-01-10 17:50:11 +05:30
Kaif
49bddb548c Reduced log file size 2024-01-10 17:16:41 +05:30
Kaif
794ae8684c Merge remote-tracking branch 'origin/dev' into dev 2024-01-09 18:49:09 +05:30
Kaif
d12881f137 Made some internal changes, pritimoi please check and remove unwanted code 2024-01-09 18:48:47 +05:30
Pritimay Sarkar
80911ada0f show environment name 2024-01-08 20:43:56 +05:30
Pritimay Sarkar
67559a292d Merge branch 'preprod-temp' into dev 2024-01-08 12:23:55 +05:30
Pritimay Sarkar
81b1e5899a Merge branch 'preprod-temp' of https://gitlab.com/sminnovations/hpos into preprod-temp 2024-01-08 12:23:38 +05:30
Pritimay Sarkar
8f8fa4e302 fix merge errors 2024-01-06 17:48:22 +05:30
Pritimay Sarkar
15e462d91a fix conflicts 2024-01-06 17:24:57 +05:30
Pritimay Sarkar
fe44b9a465 Merge branch 'preprod-temp' into dev 2024-01-06 16:51:08 +05:30
Pritimay Sarkar
3f47213d95 resolve merge conflict 2024-01-06 16:49:41 +05:30
Pritimay Sarkar
2acf3a08d5 quality screen 2024-01-06 16:44:32 +05:30
Kaif
2c2b4aa9c7 Result API, NATS and work manager 2024-01-06 16:32:00 +05:30
Pritimay Sarkar
cddfc4518f add key not found error in config 2024-01-05 01:16:55 +05:30
Pritimay Sarkar
2368ef5a4f support multiple readings automatically 2024-01-05 00:51:50 +05:30
Pritimay Sarkar
02cdc49c9c coefficient screen added 2024-01-04 12:01:59 +05:30
Pritimay Sarkar
6d4adbc222 add auto dac 2024-01-04 01:11:30 +05:30
Pritimay Sarkar
9e88bf9109 change profile screen text to panel 2024-01-03 23:09:28 +05:30
Pritimay Sarkar
8fb504098f resolve conflict 2024-01-03 18:13:43 +05:30
Pritimay Sarkar
8892eaf189 fix db schemaerror 2024-01-03 17:56:01 +05:30
Mariya
ae42c96256 Toast Message is Added, if the device is connected 2024-01-03 15:31:58 +05:30
Kaif
d362a7fa86 Merge remote-tracking branch 'origin/preprod-temp' into preprod-temp 2024-01-03 12:53:45 +05:30
Kaif
e8b380a4c4 Added pending API calls, like upload log, result upload and device update 2024-01-03 12:52:27 +05:30
Pritimay Sarkar
039e17a3b8 resolve compile errors since merge 2024-01-03 12:38:13 +05:30
Pritimay Sarkar
f54af3c877 Merge branch 'led-gains-data' into preprod 2024-01-03 12:08:29 +05:30
Pritimay Sarkar
0149ec7111 release 2.1.68 2024-01-03 11:54:21 +05:30
Pritimay Sarkar
c02bd1ba2e release 2.1.65 for pq 2024-01-02 11:38:38 +05:30
Pritimay Sarkar
f6b1b83f24 add gains commands and save gains data 2024-01-02 10:56:38 +05:30
Mariya
4b205185d3 error resolved related to previous changing color of text if the result is normal 2023-12-29 11:10:38 +05:30
Kaif
00a3124fbf API call for DeviceProvision and Login is completed and tested 2023-12-26 14:16:19 +05:30
Mariya
0faf4adbd7 ADDED CODE FOR Changing Text color from red to green if the result is normal 2023-12-26 12:59:44 +05:30
Pritimay Sarkar
7a4b68690d add new slope class thresholds 2023-12-23 18:19:13 +05:30
Pritimay Sarkar
323a76c72a fix merge conflict 2023-12-21 16:26:59 +05:30
Pritimay Sarkar
c305635862 Merge branch 'hb3-hb4' into preprod-temp 2023-12-21 16:25:44 +05:30
Pritimay Sarkar
9183c97aef add slope based class 2023-12-21 16:14:29 +05:30
Pritimay Sarkar
dcf340a3a0 Merge branch 'preprod' into 'Feature_New_firmware_changes_for_kit_check_with_4_LED_device'
# Conflicts:
#   app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
#   app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
#   app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
#   app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
#   app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
2023-12-20 17:06:21 +00:00
Mariya
c573390082 ADDED CODE FOR OVF 2023-12-20 17:15:41 +05:30
Pritimay Sarkar
48b2fefd02 Merge branch 'fix-msg-fragmentation' into 'preprod'
Fix msg fragmentation

See merge request sminnovations/hpos!17
2023-12-20 11:13:55 +00:00
Mariya
59aefacec1 string translation for "SCAN QR CODE OF THE KIT" of kannada is Corrected 2023-12-20 11:52:06 +05:30
Pritimay Sarkar
d1b5ca32bf fix msg fragmentation in app and add log dsiplay for admin 2023-12-18 12:48:07 +05:30
Pritimay Sarkar
3e690345c2 handle-msg-fragmentation 2023-12-15 14:37:41 +05:30
Pritimay Sarkar
4f7aa74314 Merge branch 'v2-hardware-config' into preprod 2023-12-15 10:32:56 +05:30
Pritimay Sarkar
590abb5c73 Merge branch 'preprod' 2023-12-15 10:29:48 +05:30
Pritimay Sarkar
7fe8202968 add config error msg and v2 usb config 2023-12-15 10:22:50 +05:30
Kaif
11d4c99e02 Changes for new Arduieno Device 2023-12-14 16:56:39 +05:30
Pritimay Sarkar
2e700601fe release 2.1.52 for qa 2023-12-14 14:53:53 +05:30
Mariya
41798aa37b Digital Card button removed 2023-12-14 13:07:15 +05:30
Mariya
e7600dafec gradle version changed 2023-12-14 12:43:10 +05:30