diff --git a/.gitignore b/.gitignore index 496ee2c..62da403 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ -.DS_Store \ No newline at end of file +.DS_Store +/sensors/ +/bin/ +/curses/ +/info/ diff --git a/screen_record.low.gif b/demo/screen_record.low.gif similarity index 100% rename from screen_record.low.gif rename to demo/screen_record.low.gif diff --git a/screen_record.low.mp4 b/demo/screen_record.low.mp4 similarity index 100% rename from screen_record.low.mp4 rename to demo/screen_record.low.mp4 diff --git a/screen_record.mp4 b/demo/screen_record.mp4 similarity index 100% rename from screen_record.mp4 rename to demo/screen_record.mp4 diff --git a/demo/screen_shot.png b/demo/screen_shot.png new file mode 100644 index 0000000..21df7a5 Binary files /dev/null and b/demo/screen_shot.png differ diff --git a/monitor.py b/monitor.py new file mode 100755 index 0000000..d0d264c --- /dev/null +++ b/monitor.py @@ -0,0 +1,106 @@ +#!/usr/bin/env python3 +from curses import wrapper +import sys +import time + +import platform +# import os, platform, subprocess +def get_processor_name(): + return "Apple M1" + if platform.system() == "Darwin": + # os.environ['PATH'] = os.environ['PATH'] + os.pathsep + '/usr/sbin' + command ="/usr/sbin/sysctl -n machdep.cpu.brand_string" + return subprocess.check_output(command).strip() + return "" + +def get_OS_ver(): + ver = platform.mac_ver(); + return f'macOS {ver[0]} ({ver[2]})' + +log_flag = False; +if log_flag: + log_file = open("message.log","w") + +def get_sorted_names(): + # get `name1, name2, name3,` as names_str + names_str = sys.stdin.readline().strip() + names = names_str.split(',')[:-1] # ignore last '' item + names = [name.strip() for name in names] + name_i = [(name, i) for i, name in enumerate(names)] + + # alphabetical order + sorted_name_i = sorted(name_i, key=lambda x: x[0].lower()) + sorted_names = [name for name, i in sorted_name_i] + ordered_list = [i for name, i in sorted_name_i] + # i-th place holds nums[ordered_list[i]] + + if log_flag: + print(names_str, '\n', sep='\n', file=log_file, flush=True) # sorted_name_i + return sorted_names, ordered_list + +def get_sorted_nums(ordered_list): + nums_str = sys.stdin.readline().strip() + nums = nums_str.split(',')[:-1] + nums = [num.strip() for num in nums] + assert len(nums) == len(ordered_list) + + sorted_nums = [float(nums[ordered_list[i]]) for i in range(len(nums))] + if log_flag: + print(nums_str, '\n', sep='\n', file=log_file, flush=True) # sorted_nums + return sorted_nums + +def main(stdscr): + # 57 items, max name len = 25 + # sorted_names = ['ANE MTR Temp Sensor1', 'GPU MTR Temp Sensor1', 'GPU MTR Temp Sensor4', 'ISP MTR Temp Sensor5', 'NAND CH0 temp', 'PMGR SOC Die Temp Sensor0', 'PMGR SOC Die Temp Sensor1', 'PMGR SOC Die Temp Sensor2', 'PMU TP3w', 'PMU tcal', 'PMU tdev1', 'PMU tdev2', 'PMU tdev3', 'PMU tdev4', 'PMU tdev5', 'PMU tdev6', 'PMU tdev7', 'PMU tdev8', 'PMU tdie1', 'PMU tdie2', 'PMU tdie4', 'PMU tdie5', 'PMU tdie6', 'PMU tdie7', 'PMU tdie8', 'PMU2 TR0Z', 'PMU2 TR1d', 'PMU2 TR1l', 'PMU2 TR2d', 'PMU2 TR2l', 'PMU2 TR3b', 'PMU2 TR3d', 'PMU2 TR4b', 'PMU2 TR4d', 'PMU2 TR5b', 'PMU2 TR5d', 'PMU2 TR6b', 'PMU2 TR7b', 'PMU2 TR8b', 'SOC MTR Temp Sensor0', 'SOC MTR Temp Sensor1', 'SOC MTR Temp Sensor2', 'eACC MTR Temp Sensor0', 'eACC MTR Temp Sensor3', 'gas gauge battery', 'gas gauge battery', 'gas gauge battery', 'gas gauge battery', 'gas gauge battery', 'gas gauge battery', 'pACC MTR Temp Sensor2', 'pACC MTR Temp Sensor3', 'pACC MTR Temp Sensor4', 'pACC MTR Temp Sensor5', 'pACC MTR Temp Sensor7', 'pACC MTR Temp Sensor8', 'pACC MTR Temp Sensor9']; + + sorted_names, ordered_list = get_sorted_names() + n = len(sorted_names) + max_name_length = max(map(len, sorted_names)); + + ncol = 2 + nrow0 = 3 + nrow1 = n//2 + 1 + + sys_info = f'{get_processor_name()}, {get_OS_ver()}' # Processor: , OS: + + while True: + # Clear screen + stdscr.clear() + ny,nx = stdscr.getmaxyx() + # Coordinates are always passed in the order y,x + # the top-left corner of a window is coordinate (0,0). + # assert nx>=80 and ny>=32 + if not (nx>=80 and ny>=32): + stdscr.addnstr(0,0, 'enlarge the size of this terminal...', 50) + stdscr.addnstr(1,0, f'requires min 32x80, now {ny}x{nx} (row x col)', 50) + stdscr.refresh() + time.sleep(0.2) + continue + + stdscr.addnstr(0,0, f'{sys_info}, {n} sensors (max_name_length={max_name_length})', 80) + + + xmid = nx//2 # //ncol + # __|__ + # xmid + # xmid+3 + + sorted_nums = get_sorted_nums(ordered_list) + for y in range(0, nrow1): + stdscr.addnstr(nrow0+y,xmid, '|', 1) + + i = 0; + for y in range(0, nrow1): + if i diff --git a/screen_shot.png b/screen_shot.png deleted file mode 100644 index 9bfb735..0000000 Binary files a/screen_shot.png and /dev/null differ diff --git a/temp_sensor.m b/temp_sensor.m index a02492a..af0339c 100644 --- a/temp_sensor.m +++ b/temp_sensor.m @@ -53,6 +53,7 @@ IOHIDEventRef IOHIDServiceClientCopyEvent(IOHIDServiceClientRef, int64_t , int32 CFStringRef IOHIDServiceClientCopyProperty(IOHIDServiceClientRef service, CFStringRef property); IOHIDFloat IOHIDEventGetFloatValue(IOHIDEventRef event, int32_t field); +// create a dict ref, like for temperature sensor {"PrimaryUsagePage":0xff00, "PrimaryUsage":0x5} CFDictionaryRef matching(int page, int usage) { CFNumberRef nums[2]; @@ -218,7 +219,8 @@ int main () { CFDictionaryRef currentSensors = matching(0xff08, 2); CFDictionaryRef voltageSensors = matching(0xff08, 3); CFDictionaryRef thermalSensors = matching(0xff00, 5); // 65280_10 = FF00_16 - // I change it to 0xff00, due to ioreg -dlx + // thermalSensors's PrimaryUsagePage should be 0xff00 for M1 chip, instead of 0xff05 + // can be checked by ioreg -lfx CFArrayRef currentNames = getProductNames(currentSensors); CFArrayRef voltageNames = getProductNames(voltageSensors);