apiotics 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d8cf269fbbddb8a9f9a4dec5d4199087b69f6ca
-  data.tar.gz: dc4872dff5821858c6bd7c8384684bd3b838321a
+  metadata.gz: f2f43e23f801f7fd9a12d4b00943f2d59187fa81
+  data.tar.gz: c45d244b79996a9b58ce7d23b249cea04f68e2d6
 SHA512:
-  metadata.gz: ddfcf1ff47ed6805964e63d02953186208669af7c241f2070af863a5eb2411194c0008e1c83993232f1e6c61f588aeab78b4b169988513d2cfc1883a511443e2
-  data.tar.gz: da13b27025962a7ec1d3a1cb45c1e47e5c776f26de00015ee89969ee69b9f9f7cc79458d1fd500a194277d6c7513ba392b3c95a9df63ecba7e7ebb78061ab303
+  metadata.gz: 8be30ae215a4d55d0034111979eb08678e60fee5053994b1d9475ac3b5e087cfb3284b75278fb02847b5da1ffcd2828b05f33daa4756e8760ed605f34510d099
+  data.tar.gz: f795386b8fa7baa1cb605666d84d4f596295ad29f2d27320d73c6c76f75810d65b70a6995a43c051ecd0e6113b366d137121672048d6e905263e2f51a22315a5

data/lib/apiotics/hardware.rb

@@ -251,6 +251,22 @@ module Apiotics
       File.delete(path)
     end
     
+    def self.cellular(state)
+      current_state = ApioticsSetting.find_by(key: "cellular")
+      if current_state == nil
+        current_state = ApioticsSetting.new
+        current_state.key = "cellular"
+      end
+      if state == "on"
+        state = 1
+      else
+        state = 0
+      end
+      
+      current_state.value = state
+      current_state.save
+    end
+    
     def self.write_uniflash_image(uniflash_path, config)
       puts "Writing uniflash firmware image...\n"
       string = "#{uniflash_path} --mode #{config["openocd_config_file_name"]} image program --file #{config['firmware_file_name'].split(".")[0]}.sli"
@@ -386,7 +402,7 @@ module Apiotics
       config_file_path
     end
     
-    def self.brand_and_burn_sd_image(download_directory, image_path, wifi_settings, config_file_path)
+    def self.brand_and_burn_sd_image(download_directory, image_path, wifi_settings, cellular, config_file_path)
       status = false
       Dir.chdir download_directory
       script_path = nil
@@ -397,8 +413,8 @@ module Apiotics
       end
       if script_path != nil
         #puts "Please wait..."
-        puts "Running sudo -S #{script_path} brand_and_burn #{image_path} no_disk #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{wifi_settings["security_mode"]} #{config_file_path} 0 dhcp"
-        IO.popen("sudo -S #{script_path} brand_and_burn #{image_path} no_disk #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{wifi_settings["security_mode"]} #{config_file_path} 0 dhcp") do |io|
+        puts "Running sudo -S #{script_path} brand_and_burn #{image_path} no_disk #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{wifi_settings["security_mode"]} #{config_file_path} 0 #{cellular.to_s} dhcp"
+        IO.popen("sudo -S #{script_path} brand_and_burn #{image_path} no_disk #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{wifi_settings["security_mode"]} #{config_file_path} 0 #{cellular.to_s} dhcp") do |io|
           while (line = io.gets) do
             puts line
           end
@@ -442,9 +458,15 @@ module Apiotics
         wifi_settings = Apiotics::Hardware.fetch_wifi
         if wifi_settings != nil
           config_file_path = Apiotics::Hardware.sd_config_file(worker_name, name, download_directory)
-          Apiotics::Hardware.brand_and_burn_sd_image(download_directory, image_path, wifi_settings, config_file_path)
+          cellular = ApioticsSettings.find_by(key: "cellular")
+          if cellular == nil
+            cellular = 0
+          else
+            cellular = cellular.value
+          end
+          Apiotics::Hardware.brand_and_burn_sd_image(download_directory, image_path, wifi_settings, cellular, config_file_path)
         else
-          puts "No WiFi settings found.  Please run rake firmware:wifi[ssid,password,security_mode] to set your default wifi settings"
+          puts "No WiFi settings found.  Please run rake firmware:wifi[ssid,password,security_mode] to set your default wifi settings.  If you do not intend to use WiFi, set all arguments to NONE."
         end
       else
         puts "SD card installation scripts not available. Exiting."

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.2.17'
+  VERSION = '0.2.18'
 end

data/lib/generators/apiotics/script/templates/set_cellular.rake

@@ -0,0 +1,11 @@
+namespace :firmware do
+  desc "Turn cellular connectivity on or off for a device. Turning cellular on is rake firmware:cellular[on].  Turning it off is rake firmware:cellular[off]."
+  task :cellular, [:state] => [:environment] do |task, args|
+    states = ["on", "off"]
+    unless states.include?(args[:state])
+      puts "#{args[:state]} is not a supported option.  The supported options are: #{states.to_s}"
+    else
+      Apiotics::Hardware.cellular(args[:state])
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiotics
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - MicroArx Corporation
@@ -235,6 +235,7 @@ files:
 - lib/generators/apiotics/script/templates/script.rb.erb
 - lib/generators/apiotics/script/templates/server.rb
 - lib/generators/apiotics/script/templates/server_control.rb
+- lib/generators/apiotics/script/templates/set_cellular.rake
 - lib/generators/apiotics/script/templates/set_wifi.rake
 - lib/generators/apiotics/script/templates/test_comm_server.rake
 - lib/generators/apiotics/script/templates/test_server.rb