add more pictures

README.md

@@ -3,7 +3,7 @@ ionpak
 
 A modern, low-cost universal controller for hot-cathode ionization vacuum gauges.
 
-![Prototype picture](https://raw.githubusercontent.com/m-labs/ionpak/master/proto_rev1_small.jpg)
+![Test setup](https://raw.githubusercontent.com/m-labs/ionpak/master/pictures/setup1_small.jpg)
 
 Why?
 ----
@@ -71,3 +71,5 @@ License
 Copyright 2017 M-Labs Limited.
 
 License TBD, probably will be CERN OHL and GPL.
+
+Pictures in the ``pictures`` folder, except ``proto_rev1.jpg``, are copyright Michelle Poon and not free.

firmware/src/electrometer.rs

@@ -36,7 +36,7 @@ impl Electrometer {
                     board::ElectrometerRange::Med => Some(board::ElectrometerRange::High),
                     board::ElectrometerRange::High => None
                 }
-            } else if ic_sample < 200 {
+            } else if ic_sample < 100 {
                 match self.range {
                     board::ElectrometerRange::Low => None,
                     board::ElectrometerRange::Med => Some(board::ElectrometerRange::Low),

firmware/src/loop_cathode.rs

@@ -4,21 +4,21 @@ use board;
 use pid;
 
 const FBI_PID_PARAMETERS: pid::Parameters = pid::Parameters {
-    kp: 310.0,
+    kp: 350.0,
-    ki: 50.0,
+    ki: 70.0,
     kd: 10.0,
     output_min: 0.5,
-    output_max: 3.0,
+    output_max: 3.1,
     integral_min: -0.05,
     integral_max: 0.05
 };
 
 const FV_PID_PARAMETERS: pid::Parameters = pid::Parameters {
-    kp: 1.80,
+    kp: 1.90,
-    ki: 0.3,
+    ki: 0.35,
     kd: 0.0,
     output_min: 0.0,
-    output_max: 30.0,
+    output_max: 20.0,
     integral_min: -50.0,
     integral_max: 50.0
 };

firmware/src/main.rs

@@ -92,8 +92,11 @@ fn main() {
         let emission = 1.0e-3;
         */
         // ZJ-12
-        let anode = 200.0;
+        /*let anode = 200.0;
         let cathode_bias = 50.0;
+        let emission = 4.0e-3;*/
+        let anode = 180.0;
+        let cathode_bias = 30.0;
         let emission = 4.0e-3;
         loop_anode.set_target(anode);
         loop_cathode.set_emission_target(emission);
@@ -185,9 +188,17 @@ extern fn adc0_ss0(_ctxt: ADC0SS0) {
 
         if time.get() % 300 == 0 {
             println!("");
-            loop_anode.get_status().debug_print();
+            /*loop_anode.get_status().debug_print();
             loop_cathode.get_status().debug_print();
-            electrometer.get_status().debug_print();
+            electrometer.get_status().debug_print();*/
+            let cathode_status = loop_cathode.get_status();
+            let electrometer_status = electrometer.get_status();
+            if cathode_status.fbi.is_some() && electrometer_status.ic.is_some() {
+                let fbi = cathode_status.fbi.unwrap();
+                let ic = electrometer_status.ic.unwrap();
+                let pressure = ic/fbi/18.75154;
+                println!("{:.1e} mbar", pressure);
+            }
         }
     });
 }