amdgpu_fan 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a08959420f4ba3893a32acfba3c6414d9a8f1fd308c84fabc74ec750f12bb5f4
-  data.tar.gz: e320113f973928928df1a93e14424f28d00e11ee98b5aadf4a48c87e55756181
+  metadata.gz: 50dee1caaf6f26947eabb70a37b584ae8fc8c98b4a3cef1d26b19ef59aab2b1d
+  data.tar.gz: 6e87eaffcffc5dce3a0a6c413f5848e9ada6490558e49d1d0e664e0672746688
 SHA512:
-  metadata.gz: 12c9fb8a8cce3ba44b442d4df2b9c06a5d7cd66715d8fb7201a398a7c984e9e750cb89a85a5836338eec375e0f79ab4c5faf96a55f272a21bf6b714b495bf0ec
-  data.tar.gz: cf4eed1de9269adcb303cc583e14d958a14379846f42790fd4b487e6194e91a8d49348bf105433e4feef6f19bf83c43451347ce433d8f3f2b5663c6712043263
+  metadata.gz: b20353e1b75b6ec79fad9a960a41795a4dff56aa8a22c484c502096cda365a698dade6bdb270c595e50a83bb6c61d3e3dd489017ac5e38c4cdaaca0cee4ccfe4
+  data.tar.gz: 16b78ea4ecbc84afdfefce9d9b34c42ceef66b2e96ea3e6899e4c01fc5b159778dfc639655cdd776350dd6c164e41ac70dbf27aa4e32075d957b7363a319682d

data/bin/amdgpu_fan

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 require_relative '../lib/amdgpu_fan_cli'

data/lib/amdgpu_fan_cli.rb

@@ -8,18 +8,19 @@ class AmdgpuFanCli < Thor
   FAN_MAX_POWER_FILE = Dir.glob("/sys/class/drm/card0/device/**/pwm1_max").first
   FAN_INPUT_FILE = Dir.glob("/sys/class/drm/card0/device/**/fan1_input").first
   FAN_MODE_FILE = Dir.glob("/sys/class/drm/card0/device/**/pwm1_enable").first
+  FAN_MODES = { auto: '2', manual: '1' }.freeze
 
-  desc 'auto', 'set mode to automatic'
+  desc 'auto', 'set mode to automatic (requires sudo)'
   def auto
-    puts "Setting fan mode to automatic..."
-    `sudo su -c "echo 2 > #{FAN_MODE_FILE}"`
+    set_mode(:auto)
   end
 
-  desc 'set PERCENTAGE', 'set fan speed to PERCENTAGE'
+  desc 'set PERCENTAGE', 'set fan speed to PERCENTAGE (requires sudo)'
   def set(percentage)
-    return unless (0..100).cover?(percentage.to_i)
+    return puts "Invalid percentage" unless (0..100).cover?(percentage.to_i)
+    set_mode(:manual) unless in_manual_mode?
     puts "Setting fan to #{setting_from_percent percentage}/#{max}..."
-    `sudo su -c "echo #{setting_from_percent percentage} > #{FAN_POWER_FILE}"`
+    set_manual_speed setting_from_percent(percentage)
   end
 
   desc 'status', 'report the current status'
@@ -57,10 +58,27 @@ class AmdgpuFanCli < Thor
     @max ||= File.read(FAN_MAX_POWER_FILE).to_i
   end
 
+  def in_auto_mode?
+    File.read(FAN_MODE_FILE).strip == '2'
+  end
+
+  def in_manual_mode?
+    File.read(FAN_MODE_FILE).strip == '1'
+  end
+
   def rpm
     File.read(FAN_INPUT_FILE).strip
   end
 
+  def set_mode(mode)
+    puts "Setting mode to #{mode}"
+    `echo "#{FAN_MODES[mode]}" | sudo tee #{FAN_MODE_FILE}`
+  end
+
+  def set_manual_speed(speed)
+    `echo "#{speed}" | sudo tee #{FAN_POWER_FILE}`
+  end
+
   def setting_from_percent(percent)
     (percent.to_f / 100 * max.to_i).round
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amdgpu_fan
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kevin McCormack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies: []
 description: A CLI for amdgpu fans
 email: harlemsquirrel@gmail.com
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A CLI to view and set fan speeds for AMD graphics cards running on the open