From c35cd3e5e58c28676ec8b9808fd10c873701750e Mon Sep 17 00:00:00 2001 From: "support.sampyo" Date: Tue, 26 Mar 2024 11:11:38 +0000 Subject: [PATCH] Commit message --- framework.yaml | 2 +- main.py | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/framework.yaml b/framework.yaml index ad0a766..3a34286 100644 --- a/framework.yaml +++ b/framework.yaml @@ -7,5 +7,5 @@ spec: virtualEnv: base # 사용할 가상환경 이름입니다. package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.) stackbase: - tagName: v0.0.11 # Stackbase(gitea)에 릴리즈 태그명 입니다. + tagName: v0.0.12 # Stackbase(gitea)에 릴리즈 태그명 입니다. repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다. diff --git a/main.py b/main.py index 2f9f263..7439999 100644 --- a/main.py +++ b/main.py @@ -63,12 +63,7 @@ def Measure_Weight(client): def Calculate_Concentration(weight): global data, volume_water data['data']['weight'] = weight - # result = (float(weight) * volume_water * 128.5) - 126.11 # 1000 / 531 = 1.883239171 - tmp1 = weight * volume_water - tmp2 = tmp1 * 128.5 - tmp3 = tmp2 - 126.11 - - print(f'volume_water: { + result = (float(weight) * volume_water * 128.5) - 126.11 # 1000 / 531 = 1.883239171 data['data']['concentration'] = result # print(f'{weight}, {result}')