From fd490208e506af6dd002a46c5313c14f918861a1 Mon Sep 17 00:00:00 2001 From: Andrej Date: Mon, 25 Apr 2022 21:25:58 +0200 Subject: [PATCH 1/5] Added scripts for general commands --- camera_descriptions/beta/beta.yml | 116 +++++++++++++++++++----------- 1 file changed, 76 insertions(+), 40 deletions(-) diff --git a/camera_descriptions/beta/beta.yml b/camera_descriptions/beta/beta.yml index 2be4487..9fd1ae4 100644 --- a/camera_descriptions/beta/beta.yml +++ b/camera_descriptions/beta/beta.yml @@ -4,46 +4,46 @@ camera_model: "beta" devices: - cmv12000: - channel: - mode: "cmv-spi-bridge" - base: 0x60000000 - len: 0x00020000 - raw: "cmv12000_raw.yml" - cooked: "cmv12000_cooked.yml" - computed: "cmv12000_computed.yml" - capture_control_address_generator: - channel: - mode: "memory-map" - base: 0x60100000 - len: 0x00020000 - cooked: "capture_control_address_generator_cooked.yml" - lvds_input_delay: - channel: - mode: "memory-map" - base: 0x60200000 - len: 0x00020000 - cooked: "lvds_input_delay_cooked.yml" - # rcn_noise_lut: - # channel: - # mode: "memory-map" - # base: 0x60300000 - # len: 0x00020000 - # cooked: "rcn_noise_lut_cooked.yml" -# linearization_lut: -# channel: -# mode: "memory-map" -# base: 0x60500000 -# len: 0x00020000 -# # raw: "linearization_lut_raw.yml" expose as one big register -# cooked: "linearization_lut_cooked.yml" - display_scan_generator: - channel: - mode: "memory-map" - base: 0x80000000 - len: 0x00020000 -# raw: "display_scan_generator_raw.yml" - cooked: "display_scan_generator_cooked.yml" + cmv12000: + channel: + mode: "cmv-spi-bridge" + base: 0x60000000 + len: 0x00020000 + raw: "cmv12000_raw.yml" + cooked: "cmv12000_cooked.yml" + computed: "cmv12000_computed.yml" + capture_control_address_generator: + channel: + mode: "memory-map" + base: 0x60100000 + len: 0x00020000 + cooked: "capture_control_address_generator_cooked.yml" + lvds_input_delay: + channel: + mode: "memory-map" + base: 0x60200000 + len: 0x00020000 + cooked: "lvds_input_delay_cooked.yml" + # rcn_noise_lut: + # channel: + # mode: "memory-map" + # base: 0x60300000 + # len: 0x00020000 + # cooked: "rcn_noise_lut_cooked.yml" + # linearization_lut: + # channel: + # mode: "memory-map" + # base: 0x60500000 + # len: 0x00020000 + # # raw: "linearization_lut_raw.yml" expose as one big register + # cooked: "linearization_lut_cooked.yml" + display_scan_generator: + channel: + mode: "memory-map" + base: 0x80000000 + len: 0x00020000 + # raw: "display_scan_generator_raw.yml" + cooked: "display_scan_generator_cooked.yml" # display_control_address_generator: # channel: # mode: "memory-map" @@ -83,3 +83,39 @@ devices: globals: lvds_clk: 250e6 # MHz pixel_bits: 12 # number of bits per pixel + +scripts: + check_axiom_service_status: + description: + script: | + result = "false" + local f=io.open("/tmp/axiom.started","r") + if f~=nil then + io.close(f) + result = "true" + end + return result + reboot: + description: + script: | + os.execute("reboot now") + power_off: + description: + script: | + os.execute("shutdown --poweroff") + start_hdmi: + description: + script: | + os.execute("axiom_sequencer_start.sh") + stop_hdmi: + description: + script: | + os.execute("axiom_sequencer_stop.sh") + start_axiom: + description: + script: | + os.execute("axiom_start.sh") + stop_axiom: + description: + script: | + os.execute("axiom_stop.sh") From a37a5975603f0106ae04ba965e23146bc7b5d558 Mon Sep 17 00:00:00 2001 From: Andrej Date: Tue, 26 Apr 2022 00:14:50 +0200 Subject: [PATCH 2/5] Fixed formatting --- camera_descriptions/beta/beta.yml | 146 ++++++++++++++---------------- 1 file changed, 70 insertions(+), 76 deletions(-) diff --git a/camera_descriptions/beta/beta.yml b/camera_descriptions/beta/beta.yml index 9fd1ae4..1cd6b37 100644 --- a/camera_descriptions/beta/beta.yml +++ b/camera_descriptions/beta/beta.yml @@ -4,46 +4,46 @@ camera_model: "beta" devices: - cmv12000: - channel: - mode: "cmv-spi-bridge" - base: 0x60000000 - len: 0x00020000 - raw: "cmv12000_raw.yml" - cooked: "cmv12000_cooked.yml" - computed: "cmv12000_computed.yml" - capture_control_address_generator: - channel: - mode: "memory-map" - base: 0x60100000 - len: 0x00020000 - cooked: "capture_control_address_generator_cooked.yml" - lvds_input_delay: - channel: - mode: "memory-map" - base: 0x60200000 - len: 0x00020000 - cooked: "lvds_input_delay_cooked.yml" - # rcn_noise_lut: - # channel: - # mode: "memory-map" - # base: 0x60300000 - # len: 0x00020000 - # cooked: "rcn_noise_lut_cooked.yml" - # linearization_lut: - # channel: - # mode: "memory-map" - # base: 0x60500000 - # len: 0x00020000 - # # raw: "linearization_lut_raw.yml" expose as one big register - # cooked: "linearization_lut_cooked.yml" - display_scan_generator: - channel: - mode: "memory-map" - base: 0x80000000 - len: 0x00020000 - # raw: "display_scan_generator_raw.yml" - cooked: "display_scan_generator_cooked.yml" + cmv12000: + channel: + mode: "cmv-spi-bridge" + base: 0x60000000 + len: 0x00020000 + raw: "cmv12000_raw.yml" + cooked: "cmv12000_cooked.yml" + computed: "cmv12000_computed.yml" + capture_control_address_generator: + channel: + mode: "memory-map" + base: 0x60100000 + len: 0x00020000 + cooked: "capture_control_address_generator_cooked.yml" + lvds_input_delay: + channel: + mode: "memory-map" + base: 0x60200000 + len: 0x00020000 + cooked: "lvds_input_delay_cooked.yml" + # rcn_noise_lut: + # channel: + # mode: "memory-map" + # base: 0x60300000 + # len: 0x00020000 + # cooked: "rcn_noise_lut_cooked.yml" + # linearization_lut: + # channel: + # mode: "memory-map" + # base: 0x60500000 + # len: 0x00020000 + # # raw: "linearization_lut_raw.yml" expose as one big register + # cooked: "linearization_lut_cooked.yml" + display_scan_generator: + channel: + mode: "memory-map" + base: 0x80000000 + len: 0x00020000 + # raw: "display_scan_generator_raw.yml" + cooked: "display_scan_generator_cooked.yml" # display_control_address_generator: # channel: # mode: "memory-map" @@ -81,41 +81,35 @@ devices: # cooked: "illumination_control_cooked.yml" globals: - lvds_clk: 250e6 # MHz - pixel_bits: 12 # number of bits per pixel + lvds_clk: 250e6 # MHz + pixel_bits: 12 # number of bits per pixel scripts: - check_axiom_service_status: - description: - script: | - result = "false" - local f=io.open("/tmp/axiom.started","r") - if f~=nil then - io.close(f) - result = "true" - end - return result - reboot: - description: - script: | - os.execute("reboot now") - power_off: - description: - script: | - os.execute("shutdown --poweroff") - start_hdmi: - description: - script: | - os.execute("axiom_sequencer_start.sh") - stop_hdmi: - description: - script: | - os.execute("axiom_sequencer_stop.sh") - start_axiom: - description: - script: | - os.execute("axiom_start.sh") - stop_axiom: - description: - script: | - os.execute("axiom_stop.sh") + check_axiom_service_status: + description: + script: | + result = "false" + local f=io.open("/tmp/axiom.started","r") + if f~=nil then + io.close(f) + result = "true" + end + return result + reboot: + description: + script: os.execute("reboot now") + power_off: + description: + script: os.execute("shutdown --poweroff") + start_hdmi: + description: + script: os.execute("axiom_sequencer_start.sh") + stop_hdmi: + description: + script: os.execute("axiom_sequencer_stop.sh") + start_axiom: + description: + script: os.execute("axiom_start.sh") + stop_axiom: + description: + script: os.execute("axiom_stop.sh") From 670689879a5644b84e4c018e48efe6d4407966aa Mon Sep 17 00:00:00 2001 From: Andrej Date: Tue, 26 Apr 2022 00:16:24 +0200 Subject: [PATCH 3/5] Adjusted formatting --- camera_descriptions/beta/beta.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/camera_descriptions/beta/beta.yml b/camera_descriptions/beta/beta.yml index 1cd6b37..d493f36 100644 --- a/camera_descriptions/beta/beta.yml +++ b/camera_descriptions/beta/beta.yml @@ -30,19 +30,19 @@ devices: # base: 0x60300000 # len: 0x00020000 # cooked: "rcn_noise_lut_cooked.yml" - # linearization_lut: - # channel: - # mode: "memory-map" - # base: 0x60500000 - # len: 0x00020000 - # # raw: "linearization_lut_raw.yml" expose as one big register - # cooked: "linearization_lut_cooked.yml" +# linearization_lut: +# channel: +# mode: "memory-map" +# base: 0x60500000 +# len: 0x00020000 +# # raw: "linearization_lut_raw.yml" expose as one big register +# cooked: "linearization_lut_cooked.yml" display_scan_generator: channel: mode: "memory-map" base: 0x80000000 len: 0x00020000 - # raw: "display_scan_generator_raw.yml" +# raw: "display_scan_generator_raw.yml" cooked: "display_scan_generator_cooked.yml" # display_control_address_generator: # channel: @@ -81,8 +81,8 @@ devices: # cooked: "illumination_control_cooked.yml" globals: - lvds_clk: 250e6 # MHz - pixel_bits: 12 # number of bits per pixel + lvds_clk: 250e6 # MHz + pixel_bits: 12 # number of bits per pixel scripts: check_axiom_service_status: From 2f88b1135b575d23ee0f951c1aedac4743505f3a Mon Sep 17 00:00:00 2001 From: Andrej Date: Tue, 31 May 2022 16:58:51 +0200 Subject: [PATCH 4/5] Removed faulty script calls --- camera_descriptions/beta/beta.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/camera_descriptions/beta/beta.yml b/camera_descriptions/beta/beta.yml index d493f36..6bc6d25 100644 --- a/camera_descriptions/beta/beta.yml +++ b/camera_descriptions/beta/beta.yml @@ -101,15 +101,3 @@ scripts: power_off: description: script: os.execute("shutdown --poweroff") - start_hdmi: - description: - script: os.execute("axiom_sequencer_start.sh") - stop_hdmi: - description: - script: os.execute("axiom_sequencer_stop.sh") - start_axiom: - description: - script: os.execute("axiom_start.sh") - stop_axiom: - description: - script: os.execute("axiom_stop.sh") From c037fde672aed195fcb9f21a5f69573bb9c4c4ef Mon Sep 17 00:00:00 2001 From: Andrej Date: Tue, 31 May 2022 17:12:24 +0200 Subject: [PATCH 5/5] Removed reboot and shutdown scripts, they will be called from the frontend --- camera_descriptions/beta/beta.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/camera_descriptions/beta/beta.yml b/camera_descriptions/beta/beta.yml index 6bc6d25..4311d04 100644 --- a/camera_descriptions/beta/beta.yml +++ b/camera_descriptions/beta/beta.yml @@ -95,9 +95,3 @@ scripts: result = "true" end return result - reboot: - description: - script: os.execute("reboot now") - power_off: - description: - script: os.execute("shutdown --poweroff")