SJ84
/
INT_PT002
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
132 Commits
1 Branch
0 Tags
12 MiB
Commit Graph

132 Commits (870be5eba7049e7886413cb756058eced7a4eebc)
 

Author SHA1 Message Date
Seonjae 870be5eba7 Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main 2025-02-14 09:09:45 +09:00
Seonjae a11ea877ee 수정 2025-02-14 09:09:42 +09:00
DESKTOP-999R8N3\CJY 1321ba1562 Merge branch 'main' of http://intechrnd.iptime.org:3000/SJ84/INT_PT002 2025-02-10 17:10:11 +09:00
Seonjae d34913d01b Serial Dll 추가 2025-02-10 17:09:28 +09:00
Seonjae 4dcf8f13d4 미국 전시회 최종 2025-01-08 15:01:16 +09:00
Seonjae a70eedcf63 1열 추가 2024-08-08 16:42:46 +09:00
DESKTOP-999R8N3\CJY ea61fd4b2f - 버그수정 2024-04-19 17:33:51 +09:00
DESKTOP-999R8N3\CJY 6e0567cc2b Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 2024-04-19 11:29:56 +09:00
DESKTOP-999R8N3\CJY c2213b4193 버그 수정 중 2024-04-19 11:29:47 +09:00
Seonjae 4fc663c33b 시스템 시간 표시 수정 2024-04-19 11:27:26 +09:00
Seonjae ae9ab217db Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main 2024-04-19 10:32:47 +09:00
Seonjae 8f068bf1e0 수정 2024-04-19 10:32:39 +09:00
DESKTOP-999R8N3\CJY 5eaf16a954 이미지 변경(크기조정) 2024-04-17 15:39:45 +09:00
DESKTOP-999R8N3\CJY d81d2d1615 Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 2024-04-17 15:26:00 +09:00
Seonjae 80208944e2 수정 2024-04-17 14:54:48 +09:00
Seonjae 0576820f46 Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main 2024-04-17 10:30:37 +09:00
Seonjae 1216cc6429 SystemStatus 테스트화면 수정 2024-04-17 10:30:33 +09:00
DESKTOP-999R8N3\CJY e0fe0b955e Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 
# Conflicts:
#	INT_PT002/Forms/FormMainDisplay3.cs
 2024-04-17 10:10:14 +09:00
DESKTOP-999R8N3\CJY e42f200827 메인화면 이미지 2024-04-17 10:09:18 +09:00
Seonjae 47a45a1f36 수정중 2024-04-16 17:03:40 +09:00
Seonjae ef4f95e96d 수정중 2024-04-16 14:04:38 +09:00
Seonjae 0da4591a1a no message 2024-04-09 17:19:05 +09:00
Seonjae fc24c045a8 수정 2024-04-09 17:08:32 +09:00
Seonjae 168f0f71d6 Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main 2024-04-09 17:02:33 +09:00
Seonjae 8e6dfbce7b 모터셋팅 수정 2024-04-09 17:02:30 +09:00
DESKTOP-999R8N3\CJY 471f0e81cc 추가수정 2024-04-09 14:50:04 +09:00
DESKTOP-999R8N3\CJY ee2012b82e - 충돌 병합 2024-04-09 13:27:30 +09:00
Seonjae 1b43c25b62 Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main 2024-04-09 09:05:57 +09:00
Seonjae 507788470e 수정중 2024-04-09 09:05:52 +09:00
DESKTOP-999R8N3\CJY 975e2bd713 병합 2024-04-05 10:10:48 +09:00
Seonjae 46d909ad5f Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main 
# Conflicts:
#	INT_PT002/Forms/FormMainDisplay3.Designer.cs
#	INT_PT002/Forms/FormMainDisplay4.cs
 2024-04-05 09:57:05 +09:00
Seonjae 27279ea8d9 수정 2024-04-05 09:19:24 +09:00
DESKTOP-999R8N3\CJY 02ea9e2c99 Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 
# Conflicts:
#	INT_PT002/Forms/FormMain.cs
#	INT_PT002/Forms/FormMainDisplay3.Designer.cs
#	INT_PT002/Forms/FormMainDisplay3.resx
 2024-04-04 16:29:54 +09:00
DESKTOP-999R8N3\CJY 9802511676 - Part11 기능 추가 
- Ethernet 화면 추가
 2024-04-04 16:02:14 +09:00
Seonjae 3334a21f6d 수정중 2024-04-02 17:15:01 +09:00
Seonjae 6c7dbee190 no message 2024-04-01 10:17:00 +09:00
DESKTOP-999R8N3\CJY ea6ae58aa7 Merge branch 'main' into HEAD 
# Conflicts:
#	INT_PT002/Forms/FormMain.cs
 2024-04-01 10:14:09 +09:00
DESKTOP-999R8N3\CJY 0ad52fb084 충돌 해결 2024-04-01 10:12:40 +09:00
DESKTOP-999R8N3\CJY 539aefa5e3 시간 변경 2024-04-01 10:09:05 +09:00
DESKTOP-999R8N3\CJY 32aa554dec - MainDisplay4 추가 2024-04-01 10:08:47 +09:00
Seonjae 420f04fbb2 수정중.. 2024-04-01 10:05:17 +09:00
DESKTOP-999R8N3\CJY f63614c69e 시간 변경 2024-03-27 10:55:53 +09:00
Seonjae f521eb3b1d MainDisplay3 추가 2024-03-27 10:53:00 +09:00
Seonjae e37288262c 메인화면 수정 2023-04-17 10:59:29 +09:00
DESKTOP-999R8N3\CJY d9b19e2021 - 메뉴 상단 Alarm 라벨 안보이는 버그 2023-04-14 14:48:07 +09:00
DESKTOP-999R8N3\CJY 342918bd89 - Log 줄 수 버그 수정 
- Measurement 오타수정
- Equipment 화면에서 Start 시 우측/하단 버튼 Disable
 2023-04-14 11:03:30 +09:00
DESKTOP-999R8N3\CJY 12d9ad9e59 버그 등 수정 2023-04-14 09:40:45 +09:00
DESKTOP-999R8N3\CJY c7091e80fa 버그 수정 2023-04-11 18:01:18 +09:00
DESKTOP-999R8N3\CJY e4ec44441f Main 업데이트부분 완료 2023-04-10 15:48:48 +09:00
DESKTOP-999R8N3\CJY e0db61600d Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 
# Conflicts:
#	INT_PT002/DialogForms/DialogFormYesNo.cs
 2023-04-07 18:00:55 +09:00