1711409245934.supportsampyo
/
sampyo-dio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 50 Wiki Activity

Commit message

This commit is contained in:
support.sampyo 2024-03-26 10:56:40 +00:00
parent ace959aee5
commit 0cbfb8de48
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.json
View File

@ -7,5 +7,6 @@
"tcp-server": { "tcp-server": {
"address": "25.7.57.1", "address": "25.7.57.1",
"port": 7007 "port": 7007
} },
"volume-water": 542
} }

2
framework.yaml
View File

@ -7,5 +7,5 @@ spec:
virtualEnv: base # 사용할 가상환경 이름입니다. virtualEnv: base # 사용할 가상환경 이름입니다.
package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.) package: requirements.txt # 설치할 Python 패키지 정보 파일입니다.(기본 값은 requirement.txt 입니다.)
stackbase: stackbase:
tagName: v0.0.9 # Stackbase(gitea)에 릴리즈 태그명 입니다. tagName: v0.0.10 # Stackbase(gitea)에 릴리즈 태그명 입니다.
repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다. repoName: sampyo-dio # Stackbase(gitea)에 저장될 저장소 이릅니다.

6
main.py
View File

@ -61,9 +61,9 @@ def Measure_Weight(client):
return val return val
def Calculate_Concentration(weight): def Calculate_Concentration(weight):
global data global data, volume_water
data['data']['weight'] = weight data['data']['weight'] = weight
result = (float(weight) * 1.883239171 * 128.5) - 126.11 # 1000 / 531 = 1.883239171 result = (float(weight) * volume_water * 128.5) - 126.11 # 1000 / 531 = 1.883239171
data['data']['concentration'] = result data['data']['concentration'] = result
# print(f'{weight}, {result}') # print(f'{weight}, {result}')
@ -316,6 +316,8 @@ if __name__ == "__main__":
with open('./config.json', encoding='UTF-8') as f: with open('./config.json', encoding='UTF-8') as f:
jsonData = json.load(f) jsonData = json.load(f)
volume_water = float(jsonData['volume-water']) / 1000.0
modbus_addr = jsonData['modbus-server']['address'] modbus_addr = jsonData['modbus-server']['address']
modbus_port = jsonData['modbus-server']['port'] modbus_port = jsonData['modbus-server']['port']