Commit graph

1049 commits

Author SHA1 Message Date
aristocratos f836233b64 Remove robin_hood.h 2023-12-25 02:49:24 +01:00
aristocratos 3a8ceacaf8 Fix call to compact and missing utility include 2023-12-25 02:37:32 +01:00
aristocratos e15e0b7188 Revert "Replace robin_hood map and set with STD alternative and add safeVal() function for map/vector access with fallback"
This reverts commit 6c87ab6196.
2023-12-25 02:27:38 +01:00
aristocratos ced47a960f Replace robin_hood map and set with STD alternative and add safeVal() function for map/vector access with fallback 2023-12-25 02:26:13 +01:00
aristocratos 6c87ab6196 Replace robin_hood map and set with STD alternative and add safeVal() function for map/vector access with fallback 2023-12-25 02:16:15 +01:00
vsey 5792216eb9
Merge branch 'aristocratos:main' into battery-power-2 2023-12-17 21:19:39 +01:00
Jakob P. Liljenberg a2325371d4
Merge pull request #690 from aristocratos/osx-fix 2023-12-17 19:56:31 +01:00
vsey 46743abab8
Merge branch 'main' into battery-power-2 2023-12-17 15:36:27 +01:00
Jakob P. Liljenberg b598f02468
Merge branch 'main' into osx-fix 2023-12-17 12:06:39 +01:00
Jakob P. Liljenberg aab2e8cc55
Fixed test-snap-can-build.yml 2023-12-17 12:03:47 +01:00
Jakob P. Liljenberg b1fe3779e1
Merge branch 'main' into osx-fix 2023-12-17 11:56:14 +01:00
Jakob P. Liljenberg 2d15c41555
Merge pull request #684 from kz6fittycent/main 2023-12-17 11:54:49 +01:00
kz6fittycent 2d3e453ed5
Merge branch 'main' into main 2023-12-15 12:02:11 -06:00
kz6fittycent 0a388647cc
Update test-snap-can-build.yml
whoops
2023-12-15 12:01:45 -06:00
kz6fittycent 49f425f356
Update test-snap-can-build.yml
https://github.com/aristocratos/btop/pull/684#issuecomment-1852801811
2023-12-15 12:00:48 -06:00
Jos Dehaes 780524267f conditional compile on Big Sur and up 2023-12-15 15:42:12 +01:00
jkre 0c706cd20a make os compatible 2023-12-15 01:28:57 +01:00
jkre a81b514d6d add freebsd support for battery power 2023-12-15 01:14:47 +01:00
jkre cd6c1b7294 make discribtion in menu and settings clearer 2023-12-14 23:27:19 +01:00
jkre 2934138a66 Only redraw battery indicator on power change if power change option is set to true 2023-12-14 22:56:31 +01:00
jkre 578b01e06b add show_battery_power option to menu 2023-12-14 22:19:22 +01:00
jkre 7a188bfaaf round wattage to second decimal 2023-12-14 01:39:00 +01:00
jkre 1ad1418771 remove redundant space 2023-12-14 00:58:17 +01:00
jkre ddd4bec1c3 Show wattage next to battery remaining time when wattage could be calculated 2023-12-14 00:54:29 +01:00
jkre 6e575116fe add power to get_battery function output 2023-12-14 00:53:01 +01:00
jkre 419a7d4ca3 add power draw calculation for battery 2023-12-14 00:32:06 +01:00
jkre b09f352c09 clean up if statement for battery percent calculation 2023-12-14 00:16:15 +01:00
jkre f6d8c4a044 use capacity as default for battery percentage, less complicated and matches desktop percent exactly 2023-12-13 23:58:40 +01:00
jkre ab294bfc10 add battery percentage calculation in charge case 2023-12-13 23:51:18 +01:00
jkre ee61700a44 add case of calculating the remaining battery time for current/charge 2023-12-13 23:39:45 +01:00
jkre b99008f626 Introduce charge in addition to energy for laptops that use charge instead of energy, this is done so that the units make more sense in this case 2023-12-13 23:17:07 +01:00
jkre 4c74a7c51d Add current_now and voltage_now to battery struct and fix naming of
current_now
2023-12-13 22:51:40 +01:00
aristocratos fe699b4333 Version bump to 1.3.0 in preparation for upcoming release 2023-12-12 23:20:09 +01:00
aristocratos 2d2df23198 Merge branch 'main' of github.com:aristocratos/btop 2023-12-12 23:19:31 +01:00
aristocratos d7b581eda4 Updated changes 2023-12-12 23:17:36 +01:00
Jakob P. Liljenberg b71538eabe
Merge pull request #666 from muneebmahmed/macos-clang 2023-12-12 23:07:39 +01:00
Jakob P. Liljenberg 730af5d4e1
Merge branch 'main' into macos-clang 2023-12-12 23:05:52 +01:00
aristocratos a017056ea0 Added swap to ignore for statvfs() since it will always fail 2023-12-12 23:05:07 +01:00
aristocratos e770cccaf8 Added try->catch for get_zfs_stat_file() to avoid fs error 2023-12-12 22:55:48 +01:00
Muneeb Ahmed 0246b1b971 Enable macos clang
Apple clang uses different versioning from LLVM, so 15.0.0 is compatible
2023-12-12 13:45:31 -08:00
Jakob P. Liljenberg 6282f36f8f
Merge pull request #675 from imwints/cmake 2023-12-12 22:06:02 +01:00
Jakob P. Liljenberg be731600f1
Merge branch 'main' into cmake 2023-12-12 22:01:21 +01:00
Jakob P. Liljenberg 450b59b657
Merge branch 'main' into main 2023-12-12 21:55:27 +01:00
Jakob P. Liljenberg cfd20a374b
Merge pull request #677 from imwints/cpu-model 2023-12-12 21:48:55 +01:00
Jakob P. Liljenberg b6a86962e2
Merge branch 'main' into cpu-model 2023-12-12 21:47:01 +01:00
Jakob P. Liljenberg 14e664e756
Merge pull request #679 from masiboss/main 2023-12-12 21:41:55 +01:00
kz6fittycent 875f08ba5e
Update snapcraft.yaml - opengl
- Testing opengl plug
2023-12-12 14:27:16 -06:00
kz6fittycent 3ee4b18e57
Update bug_report.md
- added snap info for bug reports to delineate
2023-12-12 14:14:59 -06:00
kz6fittycent 2973a76f2b
Merge branch 'aristocratos:main' into main 2023-12-12 14:06:44 -06:00
kz6fittycent fb782a2ab3
Create test-snap-can-build.yml 2023-12-12 14:02:27 -06:00