Skip to content

Commit

Permalink
调整喂食量,保存低清图片,修改打印形式,增加照片,重新炼丹
Browse files Browse the repository at this point in the history
  • Loading branch information
wfg666 committed Oct 30, 2024
1 parent b3dcb72 commit 8416b3f
Show file tree
Hide file tree
Showing 602 changed files with 81 additions and 7 deletions.
16 changes: 10 additions & 6 deletions app/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ def main():
mqtt = mqtt_uploader()

cats = [
Cat("小怪兽", "Monster", 80, 7, 20, 40),
Cat("216", "216", 50, 7, 15, 25)]
Cat("小怪兽", "Monster", 130, 5, 66, 99),
Cat("216", "216", 55, 3, 6, 1)]
#Cat("216", "216", 55, 2, 2, 4)]

output_dir = 'output/app'
os.makedirs(output_dir, exist_ok=True)
Expand All @@ -35,7 +36,7 @@ def main():
cat_seen_count = 0

time_last_save_photo = 0
save_photo_interval = 0.5
save_photo_interval = 5.0

predict_count = 0
print_interval = 30 # 打印状态间隔(秒)
Expand Down Expand Up @@ -63,7 +64,8 @@ def main():
if detected_cat and time.time() - time_last_save_photo >= save_photo_interval:
pic_dir = os.path.join(output_dir, "pics", str(detected_cat))
os.makedirs(pic_dir, exist_ok=True)
cv2.imwrite(os.path.join(pic_dir, str(time.time()) + ".png"), frame)
img = cv2.resize(frame, (int(predicter.args.input_size1), int(predicter.args.input_size2)))
cv2.imwrite(os.path.join(pic_dir, str(time.time()) + ".png"), img)
time_last_save_photo = time.time() # 记录打印时间


Expand Down Expand Up @@ -91,10 +93,12 @@ def main():
# 打log
predict_count += 1 # 记录 get() 调用次数
if time.time() - time_last_print >= print_interval: # 检查是否到达打印间隔
print("猫猫:%d 检测:%.1f fps." % (believed_cat, predict_count / (time.time() - time_last_print)))
print("猫猫:%d 检测:%.1f fps." % (believed_cat, predict_count / (time.time() - time_last_print)), end = ' ')
predict_count = 0
for cat in cats:
print(f"{cat.name}: {cat.feed_count_hour()}, {cat.feed_count_8h()}, {cat.feed_count_day()}")
print(f"{cat.name}: {cat.feed_count_hour()}/{cat.max_feed_hour}, {cat.feed_count_8h()}/{cat.max_feed_8h}, "
f"{cat.feed_count_day()}/{cat.max_feed_day}", end = " ")
print('')
time_last_print = time.time() # 记录打印时间

try:
Expand Down
41 changes: 41 additions & 0 deletions app/cam.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-

import cv2
import sys
import os
import time

sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../elixir')))

def main():
id=0
cam = cv2.VideoCapture(id)

time.sleep(1)
while True:
# 读一张图片
try:
ret, frame = cam.read()
if not ret:
print('failed to grab frame. release camera and reopen in 5s.')
cam.release()
time.sleep(5)
cam = cv2.VideoCapture(id)
continue
except Exception as e:
log.error("failed to re initialize camera. " + e)
continue


try:
cv2.imshow('cam', frame)
cv2.waitKey(1)
except Exception as e:
print('display fail.')

time.sleep(0.02)


if __name__ == '__main__':
main()
Binary file added data/test/0/1692424227.680053.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/0/1692499959.6929333.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/0/1692602887.6162453.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/1/1692311456.313951.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/1/1692342220.814877.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/1/1692342406.0193496.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/1/1692351329.902436.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/1/1692356842.006059.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/1/1692378542.1182284.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/1/1692440888.4183483.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/1/1692541368.9016726.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/1/1692604491.6062474.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/2/1692357259.6670806.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/2/1692397379.6604638.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/2/1692432359.6248703.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/2/1692438989.6038675.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/2/1692449697.6160178.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/2/1692465093.6578555.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/2/1692479257.6334333.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/2/1692513689.7702546.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/test/2/1692534863.6661656.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/train/0/1683642357.6426013.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/train/0/1683642428.9500613.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/train/0/1683642689.8657343.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/train/0/1683642690.534322.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/train/0/1683642712.836734.png
Binary file added data/train/0/1683642713.8170404.png
Binary file added data/train/0/1683642714.7327006.png
Binary file added data/train/0/1683642715.3400042.png
Binary file added data/train/0/1683642715.953096.png
Binary file added data/train/0/1683642723.5270898.png
Binary file added data/train/0/1683642729.3037395.png
Binary file added data/train/0/1683642737.1422591.png
Binary file added data/train/0/1683642743.544146.png
Binary file added data/train/0/1683642761.043137.png
Binary file added data/train/0/1683642761.648492.png
Binary file added data/train/0/1683642762.256344.png
Binary file added data/train/0/1683642762.8614612.png
Binary file added data/train/0/1683642763.467357.png
Binary file added data/train/0/1683642764.0738447.png
Binary file added data/train/0/1683642764.6832106.png
Binary file added data/train/0/1683642769.8984678.png
Binary file added data/train/0/1683642771.002939.png
Binary file added data/train/0/1683642788.5016515.png
Binary file added data/train/0/1683642789.1086576.png
Binary file added data/train/0/1683642806.0119848.png
Binary file added data/train/0/1683642806.7421398.png
Binary file added data/train/0/1683642807.5333607.png
Binary file added data/train/0/1683642808.1389327.png
Binary file added data/train/0/1683642808.7452054.png
Binary file added data/train/0/1683642809.3594544.png
Binary file added data/train/0/1683642809.966919.png
Binary file added data/train/0/1683642952.3049638.png
Binary file added data/train/0/1683643003.3623743.png
Binary file added data/train/0/1683643083.6127772.png
Binary file added data/train/0/1683644725.9204707.png
Binary file added data/train/0/1683644728.280842.png
Binary file added data/train/0/1683644762.9098387.png
Binary file added data/train/0/1683645783.1263275.png
Binary file added data/train/0/1683645854.1817026.png
Binary file added data/train/0/1683645880.792939.png
Binary file added data/train/0/1683645910.1997485.png
Binary file added data/train/0/1683645916.6851597.png
Binary file added data/train/0/1683645953.183243.png
Binary file added data/train/0/1683646141.3670268.png
Binary file added data/train/0/1683646141.9736726.png
Binary file added data/train/0/1683646143.1405792.png
Binary file added data/train/0/1683646143.69551.png
Binary file added data/train/0/1683646158.326352.png
Binary file added data/train/0/1683646158.9352272.png
Binary file added data/train/0/1683646159.487904.png
Binary file added data/train/0/1683646160.0962431.png
Binary file added data/train/0/1683646162.7054994.png
Binary file added data/train/0/1683646163.3142953.png
Binary file added data/train/0/1683647406.0192266.png
Binary file added data/train/0/1683647406.7570975.png
Binary file added data/train/0/1683647407.364535.png
Binary file added data/train/0/1683647408.716875.png
Binary file added data/train/0/1683647409.4492826.png
Binary file added data/train/0/1683647411.5494494.png
Binary file added data/train/0/1683647415.5891323.png
Binary file added data/train/0/1683647460.4777243.png
Binary file added data/train/0/1683647461.084094.png
Binary file added data/train/0/1683647682.4966557.png
Binary file added data/train/0/1683647832.806299.png
Binary file added data/train/0/1683647877.6411083.png
Binary file added data/train/0/1683647885.288637.png
Binary file added data/train/0/1683648503.9428756.png
Binary file added data/train/0/1683648504.5491621.png
Binary file added data/train/0/1683648537.3707566.png
Binary file added data/train/0/1683651283.5549927.png
Binary file added data/train/0/1683651284.1101868.png
Binary file added data/train/0/1683651284.7203977.png
Binary file added data/train/0/1683651286.5584736.png
Binary file added data/train/0/1683651290.771122.png
Binary file added data/train/0/1683651312.3489425.png
Binary file added data/train/0/1683651320.4221823.png
Binary file added data/train/0/1683651324.7165253.png
Binary file added data/train/0/1683651327.1632402.png
Binary file added data/train/0/1683651327.7121153.png
Binary file added data/train/0/1683651328.320654.png
Binary file added data/train/0/1683651329.5405748.png
Binary file added data/train/0/1683651330.088984.png
Binary file added data/train/0/1683651331.310934.png
Binary file added data/train/0/1683651332.5314174.png
Binary file added data/train/0/1683651333.142169.png
Binary file added data/train/0/1683651407.0859137.png
Binary file added data/train/0/1683651408.9193027.png
Binary file added data/train/0/1683651572.7853565.png
Binary file added data/train/0/1683652034.3543818.png
Binary file added data/train/0/1683652089.7829149.png
Binary file added data/train/0/1683652844.0378587.png
Binary file added data/train/0/1683653385.2872574.png
Binary file added data/train/0/1683655046.9021194.png
Binary file added data/train/0/1683662524.9700866.png
Binary file added data/train/0/1683662868.534211.png
Binary file added data/train/0/1683662988.0020328.png
Binary file added data/train/0/1683663085.0270529.png
Binary file added data/train/0/1683663112.9656103.png
Binary file added data/train/0/1683677513.54979.png
Binary file added data/train/0/1683677557.2970574.png
Binary file added data/train/0/1683677634.5085292.png
Binary file added data/train/0/1683677638.8419182.png
Binary file added data/train/0/1683677788.5466263.png
Binary file added data/train/0/1683677838.7306693.png
Binary file added data/train/0/1683687028.2065375.png
Binary file added data/train/0/1683687106.6383069.png
Binary file added data/train/0/1683702476.1048365.png
Binary file added data/train/0/1683706338.5214968.png
Binary file added data/train/0/1683710903.6086593.png
Binary file added data/train/0/1683714193.268131.png
Binary file added data/train/0/1683714283.9730375.png
Binary file added data/train/0/1683720717.040926.png
Binary file added data/train/0/1683721057.4328382.png
Binary file added data/train/0/1683724310.1979818.png
Binary file added data/train/0/1683730965.2487986.png
Binary file added data/train/0/1683730974.080677.png
Binary file added data/train/0/1683732404.4380562.png
Binary file added data/train/0/1683732904.875103.png
Binary file added data/train/0/1683733871.3426125.png
Binary file added data/train/0/1683734237.1868007.png
Binary file added data/train/0/1683734612.8871295.png
Binary file added data/train/0/1683734673.6161425.png
Binary file added data/train/0/1683736158.9221203.png
Binary file added data/train/0/1683739084.3929532.png
Binary file added data/train/0/1683743414.8804765.png
Binary file added data/train/0/1683743896.3647935.png
Binary file added data/train/0/1683744312.2647176.png
Binary file added data/train/0/1683744361.5726168.png
Binary file added data/train/0/1683746816.6202824.png
Binary file added data/train/0/1683749156.707955.png
Binary file added data/train/0/1683749977.9771702.png
Binary file added data/train/0/1687797144.1001012.png
Binary file added data/train/0/1687797149.3679423.png
Binary file added data/train/0/1687797154.437792.png
Binary file added data/train/0/1687797159.5026882.png
Binary file added data/train/0/1687797179.7429914.png
Binary file added data/train/0/1687797184.7790937.png
Binary file added data/train/0/1687797189.819401.png
Binary file added data/train/0/1687797194.8531249.png
Binary file added data/train/0/1687797204.9430907.png
Binary file added data/train/0/1687797215.0405316.png
Binary file added data/train/0/1687797230.1897316.png
Binary file added data/train/0/1687797245.3784156.png
Binary file added data/train/0/1687797250.4450767.png
Binary file added data/train/0/1687797255.4786642.png
Binary file added data/train/0/1687797265.6003308.png
Binary file added data/train/0/1687797275.719469.png
Binary file added data/train/0/1687797311.079756.png
Binary file added data/train/0/1687797321.311033.png
Binary file added data/train/0/1687797331.4185078.png
Binary file added data/train/0/1687797341.5361855.png
Binary file added data/train/0/1687797350.1854494.png
Binary file added data/train/0/1687797358.883251.png
Binary file added data/train/0/1687797371.742687.png
Binary file added data/train/0/1687797379.133836.png
Binary file added data/train/0/1687797389.8832834.png
Binary file added data/train/0/1687797395.3602533.png
Binary file added data/train/0/1687797448.1353056.png
Binary file added data/train/0/1687797463.7993057.png
Binary file added data/train/0/1692319066.632704.png
Binary file added data/train/0/1692357607.686433.png
Binary file added data/train/0/1692360699.6950626.png
Binary file added data/train/0/1692365647.6268296.png
Binary file added data/train/0/1692389873.6189618.png
Binary file added data/train/0/1692394793.6103895.png
Binary file added data/train/0/1692401479.6354325.png
Binary file added data/train/0/1692427209.649298.png
Binary file added data/train/0/1692431293.6477196.png
Binary file added data/train/0/1692454343.6505206.png
Binary file added data/train/0/1692460553.6359148.png
Binary file added data/train/0/1692465769.689065.png
Binary file added data/train/0/1692491189.6712573.png
Binary file added data/train/0/1692496267.6028793.png
Binary file added data/train/0/1692525837.6169863.png
Binary file added data/train/0/1692531563.605368.png
Binary file added data/train/0/1692537903.6087763.png
Binary file added data/train/0/1692563387.6828258.png
Binary file added data/train/0/1692568807.6770046.png
Binary file added data/train/0/1692574409.6406996.png
Binary file added data/train/0/1692597829.6836216.png
Binary file added data/train/0/1692605847.6423998.png
Binary file added data/train/1/1683642716.6860569.png
Binary file added data/train/1/1683642722.9200096.png
Binary file added data/train/1/1683642756.7956579.png
Binary file added data/train/1/1683642814.1119514.png
Binary file added data/train/1/1683642835.5443418.png
Binary file added data/train/1/1683642871.1225903.png
Binary file added data/train/1/1683642935.7414882.png
Binary file added data/train/1/1683645780.8620145.png
Binary file added data/train/1/1683645781.470216.png
Binary file added data/train/1/1683645792.221854.png
Binary file added data/train/1/1683645792.7727113.png
Binary file added data/train/1/1683645821.536032.png
Binary file added data/train/1/1683645823.9148574.png
Binary file added data/train/1/1683645824.5249774.png
Binary file added data/train/1/1683645853.5732696.png
Binary file added data/train/1/1683645882.6130178.png
Binary file added data/train/1/1683645886.2227805.png
Binary file added data/train/1/1683645919.810379.png
Binary file added data/train/1/1683645925.2464573.png
Binary file added data/train/1/1683645944.6578996.png
Binary file added data/train/1/1683647434.406077.png
Binary file added data/train/1/1683647448.9524775.png
Binary file added data/train/1/1683647449.50744.png
Binary file added data/train/1/1683648491.9000247.png
Binary file added data/train/1/1683648492.506824.png
Binary file added data/train/1/1683648547.1720514.png
Binary file added data/train/1/1683651248.2964559.png
Binary file added data/train/1/1683651248.901934.png
Binary file added data/train/1/1683651249.4535558.png
Binary file added data/train/1/1683651280.5874994.png
Binary file added data/train/1/1683651334.9619634.png
Binary file added data/train/1/1683651339.7664924.png
Binary file added data/train/1/1683651365.302469.png
Binary file added data/train/1/1683651399.25499.png
Binary file added data/train/1/1683651433.3050368.png
Binary file added data/train/1/1683651434.524122.png
Binary file added data/train/1/1683651451.4663196.png
Binary file added data/train/1/1683653334.9778192.png
Binary file added data/train/1/1683653335.5809057.png
Binary file added data/train/1/1683653355.7515528.png
Binary file added data/train/1/1683653361.7965605.png
Binary file added data/train/1/1683653369.6270728.png
Binary file added data/train/1/1683653387.721502.png
Binary file added data/train/1/1683653393.145026.png
Binary file added data/train/1/1683653417.9864357.png
Binary file added data/train/1/1683653437.2859225.png
Binary file added data/train/1/1683653471.1534467.png
Binary file added data/train/1/1683655074.7259712.png
Binary file added data/train/1/1683655075.329129.png
Binary file added data/train/1/1683655099.9723659.png
Binary file added data/train/1/1683655133.5536985.png
Binary file added data/train/1/1683658684.607656.png
Binary file added data/train/1/1683658687.5857725.png
Binary file added data/train/1/1683658688.192422.png
Binary file added data/train/1/1683658692.4436743.png
Binary file added data/train/1/1683658693.658782.png
Binary file added data/train/1/1683658694.2103937.png
Binary file added data/train/1/1683658695.4289.png
Binary file added data/train/1/1683658697.2033875.png
Binary file added data/train/1/1683658701.3909576.png
Binary file added data/train/1/1683658711.7228754.png
Binary file added data/train/1/1683658732.8527153.png
Binary file added data/train/1/1683658758.8848407.png
Binary file added data/train/1/1683658783.5844555.png
Binary file added data/train/1/1683662869.885364.png
Binary file added data/train/1/1683662887.7431064.png
Binary file added data/train/1/1683662921.7027602.png
Binary file added data/train/1/1683662946.4958186.png
Binary file added data/train/1/1683662972.2974272.png
Binary file added data/train/1/1683662988.6080408.png
Binary file added data/train/1/1683663021.3221796.png
Binary file added data/train/1/1683663046.0172818.png
Binary file added data/train/1/1683663071.2432384.png
Binary file added data/train/1/1683663103.3195012.png
Binary file added data/train/1/1683677517.8760278.png
Binary file added data/train/1/1683677563.331376.png
Binary file added data/train/1/1683677583.2833416.png
Binary file added data/train/1/1683677663.9945614.png
Binary file added data/train/1/1683677697.6391153.png
Binary file added data/train/1/1683677722.5407896.png
Binary file added data/train/1/1683677757.14172.png
Binary file added data/train/1/1683677781.9041133.png
Binary file added data/train/1/1683714210.557093.png
Binary file added data/train/1/1683714223.2925246.png
Binary file added data/train/1/1683714249.1027155.png
Binary file added data/train/1/1683714273.766845.png
Binary file added data/train/1/1683721068.7639785.png
Binary file added data/train/1/1683721076.7840202.png
Binary file added data/train/1/1683721083.9139056.png
Binary file added data/train/1/1683721118.2226503.png
Binary file added data/train/1/1683721128.2582924.png
Binary file added data/train/1/1683721153.5320354.png
Binary file added data/train/1/1683721178.215393.png
Binary file added data/train/1/1683721211.926275.png
Binary file added data/train/1/1683731029.1399047.png
Binary file added data/train/1/1683731030.9548013.png
Loading

0 comments on commit 8416b3f

Please sign in to comment.