From e7c206102d520fd1a4b752b9692b353c3627dd5a Mon Sep 17 00:00:00 2001
From: Edward Emelianov <eddy@sao.ru>
Date: Fri, 8 Dec 2023 11:35:56 +0300
Subject: [PATCH] fixed bugs and update readme

---
 F1:F103/shutter/Readme.md   |  41 ++++++++++++++++++++++++++++--------
 F1:F103/shutter/flash.c     |   2 +-
 F1:F103/shutter/main.c      |   2 +-
 F1:F103/shutter/shutter.bin | Bin 12008 -> 12004 bytes
 F1:F103/shutter/shutter.c   |   4 ++--
 F1:F103/shutter/version.inc |   4 ++--
 6 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/F1:F103/shutter/Readme.md b/F1:F103/shutter/Readme.md
index 999afd0..3519dc4 100644
--- a/F1:F103/shutter/Readme.md
+++ b/F1:F103/shutter/Readme.md
@@ -4,6 +4,21 @@ Shutter control
 Works with bi-stable shutter. 
 You can find the device in `/dev/shutterX` (symlink to `/dev/ttyUSBX`).
 
+After powered on, the device will try to close shutter (during one second). 
+
+The CCD (or manual) controlled input allows to open/close shutter by changing its level (depending on `ccdactive` parameter). 
+If current configuration can't open or close the shutter immediately, it will be opened/closed as soon as possible, while the input holds its level.
+
+When the shutter is closed, the device will send over USB a message like
+```
+exptime=10000
+shutter=closed
+```
+with calculated value of opened time and current shutter state. 
+If the error occured and shutter can't be closed, user will read `exp=cantclose`, shutter will come into error state. You should close the shutter by external command in that case.
+
+After the shutter completely opened, user can read a message `shutter=opened`.
+
 ## Pinout
 
 **PB0** (pullup in) - hall (or reed switch) sensor input (active low) - opened shutter detector
@@ -58,20 +73,20 @@ You can find the device in `/dev/shutterX` (symlink to `/dev/ttyUSBX`).
 * 'v' - get Vdd (/100V)
 * 'V' - get shutter voltage (/100V)
 
-
-If you will enter wrong long message, will receive its echo back. Any wrong short command will show help list.
+Any wrong long message will echo back. Any wrong short command will show help list.
 
 ## Shutter control
-Commands '0', '1' and '2' should be used only for debugging purposes.
+Commands '0' ...  '3' should be used only for debugging purposes.
 To open/close shutter use only 'O', 'C' and 'E' commands.
 
 When opening or closing shutter you will first receive an answer: `OK` if command could be done or `ERR` if there's insufficient voltage on capacitor or shutter is absent.
 After opened the message `shutter=opened` will appear. After closing you will receive messages `exptime=xxx` (when `xxx` is approx. exp. time in milliseconds) and `shutter=closed`.
 
 Command 'E' could return `OK`, `ERR` or `ERRNUM`/`I32OVERFLOW` in wrong number format (number could be decimal, 0x.. - hexadecimal, b.. - binary or 0.. - octal).
+"Status" command in this case will return `shutter=exposing` and `expfor=xxx` - the given exposition time.
 
 When exposition starts you will receive message `OK` and `shutter=opened`. After its end you'll got `exptime=...`, `shutter=closed`.
-If shutter can't be closed, you will give a lots of "exp=cantclose" and different error messages until problem be solved. To stop this error messages give command 'O'.
+If shutter can't be closed, you will give a lots of `exp=cantclose` and different error messages until problem be solved. To stop this error messages give command 'O'.
 
 ## Different commands
 * 'A' will show raw values for all ADC channels: 0. - capacitor voltage, 1 - MCU temperature, 2 - MCU Vdd. You will give messages like `adcX=val`.
@@ -82,7 +97,7 @@ If shutter can't be closed, you will give a lots of "exp=cantclose" and differen
 
 * 'v' - `vdd=val`, val in V*100
 
-* 'V' - "voltage=val", val in V*100
+* 'V' - `voltage=val`, val in V*100
 
 * 'S' - several answers:
   * `shutter=`: `closed`, `opened`, `error`, `process`, `wait` or `exposing` - shutter state 
@@ -104,9 +119,17 @@ workvoltage=700
 shuttertime=20
 waitingtime=30
 shtrvmul=143
-shtrdiv=25
+shtrvdiv=25
 ```
 
-* ``
-* `ccdactive` - is level of 'CCD' input to open shutter (1 to open on high and 0 to open on low signal)
-* `hallactive`
\ No newline at end of file
+* `userconf_sz` - "magick" number to determine first non-empty record in flash storage. The aligned size of one record in bytes.
+* `ccdactive` - is level of 'CCD' input to open shutter (1 to open on high and 0 to open on low signal), change this value with command `c`.
+* `hallactive` - the same for Hall sensor or reed switch mounted on shutter to indicate opened state, change with `h`.
+* `minvoltage` - voltage level on discharged capacitor (V*100 Volts), when shutter is in opened/closed state, the power will be off from coils reaching this level. Can be from 1V to 10V. Change with `<`.
+* `workvoltage` - minimal level (V*100 Volts) of charged capacitor to start process of opening/closing, you can open/close shutter only with higher voltage. Can be from 5V to 100V. Change with `>`.
+* `shuttertime` - maximal time (milliseconds) of holding active voltage on shutter's coils. Can be from 5ms to 1s. Change with `#`.
+* `waitingtime` - waiting time for the shutter to finish its job. The expose time can't be less than this value. Can be from 5ms to 1s. Change with `$`.
+* `shtrvmul` - multiplier to calculate capacitor voltage from voltage on ADC input of MCU. Vcap = V*shtrvmul/shtrvdiv. Can be from 1 to 65535. Change with `*`.
+* `shtrvdiv` - divider of capacitor voltage calculation. Can be from 1 to 65535. Change with `/`.
+
+All changes of configuration processed in RAM and acts immediately after changed. If you want to store changes, use command `s`.
\ No newline at end of file
diff --git a/F1:F103/shutter/flash.c b/F1:F103/shutter/flash.c
index f400eb2..d67241c 100644
--- a/F1:F103/shutter/flash.c
+++ b/F1:F103/shutter/flash.c
@@ -187,6 +187,6 @@ void dump_userconf(){
     USB_sendstr("\nshuttertime="); USB_sendstr(u2str(the_conf.shutterrime));
     USB_sendstr("\nwaitingtime="); USB_sendstr(u2str(the_conf.waitingtime));
     USB_sendstr("\nshtrvmul="); USB_sendstr(u2str(the_conf.shtrVmul));
-    USB_sendstr("\nshtrdiv="); USB_sendstr(u2str(the_conf.shtrVdiv));
+    USB_sendstr("\nshtrvdiv="); USB_sendstr(u2str(the_conf.shtrVdiv));
     newline();
 }
diff --git a/F1:F103/shutter/main.c b/F1:F103/shutter/main.c
index 4da817c..523a1fa 100644
--- a/F1:F103/shutter/main.c
+++ b/F1:F103/shutter/main.c
@@ -41,7 +41,7 @@ int main(void){
     hw_setup();
     USB_setup();
     // close shutter and only after that turn on USB pullup
-    while(!close_shutter() && Tms < the_conf.waitingtime) IWDG->KR = IWDG_REFRESH;
+    while(!close_shutter() && Tms < 1000) IWDG->KR = IWDG_REFRESH;
     USBPU_ON();
 
     uint32_t Terr = Tms + 2*ERRPERIOD;
diff --git a/F1:F103/shutter/shutter.bin b/F1:F103/shutter/shutter.bin
index 31e0f256d0ac17bc271ae049c7de516627a660b9..82e409526fbffb0cae9e225845c8386478b2ff5d 100755
GIT binary patch
delta 2491
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

delta 2550
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

diff --git a/F1:F103/shutter/shutter.c b/F1:F103/shutter/shutter.c
index 6419177..afe2b8b 100644
--- a/F1:F103/shutter/shutter.c
+++ b/F1:F103/shutter/shutter.c
@@ -39,7 +39,7 @@ static const char *regstates[4] = {
 
 static const char *opcl[2] = {"closed", "opened"};
 
-shutter_state shutterstate = SHUTTER_ERROR;
+shutter_state shutterstate = SHUTTER_RELAX;
 static shutter_state nextstate = SHUTTER_RELAX;
 
 static uint32_t Tstart = 0, Texp = 0, Topened = 0;
@@ -117,7 +117,7 @@ void process_shutter(){
             }
         break;
         case SHUTTER_WAIT: // wait for mechanical work done
-            if(Tms - Tstart > the_conf.waitingtime){
+            if(Tms - Tstart >= the_conf.waitingtime){
                 SHTRHIZ();
                 shutterstate = nextstate;
                 int h = CHKHALL();
diff --git a/F1:F103/shutter/version.inc b/F1:F103/shutter/version.inc
index 9e69f18..bf5098f 100644
--- a/F1:F103/shutter/version.inc
+++ b/F1:F103/shutter/version.inc
@@ -1,2 +1,2 @@
-#define BUILD_NUMBER "103"
-#define BUILD_DATE "2023-12-07"
+#define BUILD_NUMBER "107"
+#define BUILD_DATE "2023-12-08"