Skip to content

Commit 4c6f461

Browse files
EricClaeysEricClaeys
authored
Merge pull request #4752 from AllskyTeam/v2024.12.06_05
V2024.12.06 05
2 parents 9c3c180 + 5ac0446 commit 4c6f461

29 files changed

Lines changed: 745 additions & 316 deletions

‎README.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Allsky Camera ![Release](https://img.shields.io/badge/Version-v2024.12.06_04-green.svg) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MEBU2KN75G2NG&source=url)
1+
# Allsky Camera ![Release](https://img.shields.io/badge/Version-v2024.12.06_05-green.svg) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MEBU2KN75G2NG&source=url)
22

33
This is the source code for the Allsky Camera project. <!-- described [on Instructables](http://www.instructables.com/id/Wireless-All-Sky-Camera/). -->
44
&nbsp;
@@ -44,11 +44,6 @@ In order to run the Allsky software you need:
4444
<!-- =============================================================================== -->
4545
## Software Installation
4646

47-
<!-- HIDE FOR NOW - THE VIDEO IS A COUPLE RELEASES OLD
48-
PatriotAstro created a great [video](https://www.youtube.com/watch?v=7TGpGz5SeVI) describing the installation steps below.
49-
__We recommend viewing it before installing the software__.
50-
-->
51-
5247
See the [detailed installation instructions](https://htmlpreview.github.io/?https://raw.githubusercontent.com/AllskyTeam/allsky/master/html/documentation/installations/Allsky.html).
5348

5449
---

‎config_repo/options.json.repo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@
16351635
{
16361636
"name" : "keogramfontcolor",
16371637
"default" : "#ffffff",
1638-
"description" : "Font color.",
1638+
"description" : "Font color. See <a external='true' allsky='true' href='/documentation/settings/allsky.html#keogramfontcolor'>the documentation</a> for a description of this field.",
16391639
"label" : "Font Color",
16401640
"label_prefix" : "Keograms",
16411641
"type" : "color",

‎html/documentation/changeLog.html‎

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ <h4>Enhancements / Changes</h4>
6868
6969
<h4>Bug Fixes</h4>
7070
<ul>
71-
<li>Entering a <span class="WebUISetting">Locale</span> in the WebUI
72-
that is not installed on the Pi displays an error message and lists
73-
the locales that ARE installed and tells the user how to install other locales.
7471
<li>
7572
</ul>
7673
@@ -93,7 +90,7 @@ <h4>New Settings</h4>
9390
<h2>v2024.12.06</h2>
9491
<details open> <summary></summary>
9592

96-
<h3>v2024.12.06_04 - Point Release # 4</h3>
93+
<h3>v2024.12.06_05 - Point Release # 5</h3>
9794
<details open sub> <summary></summary>
9895
<h4 style="color: red">IMPORTANT NOTES:</h4>
9996
<ul>
@@ -102,6 +99,79 @@ <h4 style="color: red">IMPORTANT NOTES:</h4>
10299
overlay method.
103100
</ul>
104101

102+
<h4>Changes that may require action (upgrades only)</h4>
103+
<ul>
104+
<li><blockquote class="warning">
105+
The changes in this section may require settings changes;
106+
after upgrading, check that your settings and images look right.
107+
</blockquote>
108+
</li>
109+
<li>If your Keogram <span class="WebUISetting">Font Color</span>
110+
contained three numbers you'll need to reverse the order
111+
of the numbers.
112+
<br>This setting previously accepted two formats:
113+
<ol>
114+
<li><code>blue_number green_number red_number</code>
115+
(with spaces or commas separating the numbers)
116+
where each number is from <code>0</code> to <code>255</code>.
117+
<li><code>#RRGGBB</code> where each two-digit pair
118+
goes from hex <code>00</code> to <code>ff</code>.
119+
</ol>
120+
<p>
121+
To be consistent with the hex order and with web pages,
122+
the order of the first format is now:
123+
<code>red_number green_number blue_number</code>
124+
(red and blue switched places).
125+
<br>The order of the second format did not change but
126+
it now accepts either 3 or 6 hex digits.
127+
<br>See <a external="true" allsky="true"
128+
href="/documentation/settings/allsky.html#keogramfontcolor">
129+
the documentation</a> for more details on this setting.
130+
</p>
131+
</ul>
132+
133+
<h4>Enhancements / Changes</h4>
134+
<ul>
135+
<li>The <code>allsky-config &nbsp; get_brightness_info</code>
136+
command now displays how many images were used, and not used,
137+
in each startrails image.
138+
This is useful when setting the
139+
<span class="WebUISetting">Brightness Threshold</span>.
140+
</ul>
141+
142+
<h4>Bug Fixes</h4>
143+
<ul>
144+
<li>For RPi cameras, the length of time Allsky waits before
145+
timing out an image was increased.
146+
For some Pi's, the prior 30-second timeout was too short
147+
when the Pi was extremely busy such as during
148+
timelapse creation.
149+
<li>Entering a <span class="WebUISetting">Locale</span> in the WebUI
150+
that is not installed on the Pi displays an error message and lists
151+
the locales that ARE installed and tells the user how
152+
to install other locales.
153+
<li>Mono cameras were calculating the mean image brightness
154+
twice: once prior to the initial save of the image
155+
and a second time when determining if the image was too
156+
dark or too bright.
157+
The second time used a different formula than the first time.
158+
</ul>
159+
160+
<h4>New Settings</h4>
161+
<ul>
162+
<li><span class="WebUISetting">None</span>
163+
</ul>
164+
</details>
165+
166+
<h3>v2024.12.06_04 - Point Release # 4</h3>
167+
<details sub> <summary></summary>
168+
<h4 style="color: red">IMPORTANT NOTES:</h4>
169+
<ul>
170+
<li>This is the LAST major release that supports Buster.
171+
<li>This is the LAST major release that contains the "legacy"
172+
overlay method.
173+
</ul>
174+
105175
<h4>Enhancements / Changes</h4>
106176
<ul>
107177
<li>When upgrading from a recent version from Allsky
@@ -182,7 +252,7 @@ <h4>New Settings</h4>
182252
</details>
183253

184254
<h3>v2024.12.06_03 - Point Release # 3</h3>
185-
<details open sub> <summary></summary>
255+
<details sub> <summary></summary>
186256

187257
<h4>Enhancements / Changes</h4>
188258
<ul>

‎html/documentation/explanations/keograms.html‎

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ <h2>Creating a keogram</h2>
7474
This will use the settings specified in the
7575
<span class="subSettingsHeader">Keograms</span> sub-section of the WebUI.
7676
</p>
77+
78+
<h4>Advanced users: running the <code>keogram</code> program manually</h4>
79+
<details><summary></summary>
7780
<p>
7881
<code>generateForDay.sh</code> calls the <code>keogram</code> program
7982
to actually create the keogram, passing it several arguments
@@ -82,29 +85,30 @@ <h2>Creating a keogram</h2>
8285
<span class="WebUISetting">Keogram Extra Parameters</span> setting.
8386
</p>
8487
<p>
85-
You can execute the <code>keogram</code> program manually,
86-
but will need to specify at least all the required arguments.
88+
Executing the <code>keogram</code> program manually is possible,
89+
but not very useful.
90+
If run manually you need to specify at least the three required arguments.
8791
</p>
8892
<pre>
8993
Usage: keogram -d &lt;imagedir&gt; -e &lt;ext&gt; -o &lt;outputfile&gt; [optional arguments]
9094

9195
Arguments:
92-
<u>-d | --directory &lt;str&gt; : directory from which to load images (required)</u>
93-
<u>-e | --extension &lt;str&gt; : image extension to process (required)</u>
94-
<u>-o | --output-file &lt;str&gt; : name of output file (required)</u>
96+
<u>-d | --directory &lt;str&gt;</u> : directory from which to load images (required)
97+
<u>-e | --extension &lt;str&gt;</u> : image extension to process (required)
98+
<u>-o | --output-file &lt;str&gt;</u> : name of output file (required)
9599
-r | --rotate &lt;float&gt; : number of degrees to rotate image, counterclockwise (0)
96100
-s | --image-size &lt;int&gt;x&lt;int&gt; : only process images of a given size, eg. 1280x960
97101
-h | --help : display this help message
98102
-v | --verbose : Increase logging verbosity
99103
-n | --no-label : Disable hour labels
100-
<u>-C | --font-color &lt;str&gt; : label font color, in HTML format (0000ff)</u>
101-
<u>-L | --font-line &lt;int&gt; : font line thickness (3)</u>
102-
<u>-N | --font-name &lt;str&gt; : font name (simplex)</u>
103-
<u>-S | --font-size &lt;float&gt; : font size (2.0)</u>
104+
<u>-C | --font-color</u> &lt;str&gt; : label font color, in HTML format (#0000ff)
105+
<u>-L | --font-line</u> &lt;int&gt; : font line thickness (3)
106+
<u>-N | --font-name</u> &lt;str&gt; : font name (simplex)
107+
<u>-S | --font-size</u> &lt;float&gt; : font size (2.0)
104108
-T | --font-type &lt;int&gt; : font line type (1)
105109
-Q | --max-threads &lt;int&gt; : limit maximum number of processing threads. (use all cpus)
106110
-q | --nice-level &lt;int&gt; : nice(2) level of processing threads (10)
107-
<u>-x | --image-expand : expand image to get the proportions of source - avoids tall and narrow images</u>
111+
<u>-x | --image-expand</u> : expand image to get the proportions of source - avoids tall and narrow images
108112
-c | --channel-info : show channel infos - mean value of R/G/B
109113
-f | --fixed-channel-number &lt;int&gt; : define number of channels 0=auto, 1=mono, 3=rgb (0=auto)
110114

@@ -120,42 +124,44 @@ <h2>Creating a keogram</h2>
120124
cd ~/allsky/bin
121125
./keogram -d images/20240710 -e jpg -o images/20240710/keogram/keogram.jpg --rotate 42 --font-size 2
122126
</pre>
123-
124-
<!-- THESE SETTINGS NO LONGER EXIST
125-
<blockquote>
126-
If you set the
127-
<span class="WebUISetting">Image Width</span> and
128-
<span class="WebUISetting">Image Height</span>
129-
of your camera in the WebUI to the actual values of your camera,
130-
keogram generation will skip any file that's not that size.
131-
This eliminates any garbage images that happen to be generated.
132-
</blockquote>
133-
-->
127+
</details>
134128

135129
<h2>Troubleshooting</h2>
136-
<p>
137-
If a keogram isn't being created, make sure the
138-
<span class="WebUISetting">Generate</span> setting is enabled.
139-
If that IS enabled, run:
140-
<pre>generateForDay.sh --keogram DATE</pre>
141-
and check for errors.
130+
<details><summary></summary>
131+
<p id="troubleshooting">
142132
<blockquote>
143133
It is extremely rare that a keogram isn't created.
144134
</blockquote>
135+
<blockquote class="warning">
136+
The resolution of all images must be identical;
137+
if not, only images with the same resolution as the FIRST image are used.
138+
<br>
139+
This can happen if the daytime and nighttime
140+
<span class="WebUISetting">Binning</span> settings are not the same,
141+
or any day you change the <span class="WebUISetting">Image Resize</span> and/or
142+
<span class="WebUISetting">Image Crop</span> settings.
143+
</blockquote>
145144
</p>
146145
<p>
147-
If a keogram isn't being uploaded, make sure the
148-
<span class="WebUISetting">Upload</span> setting is enabled.
149-
If that IS enabled, run:
150-
<pre>generateForDay.sh --upload --debug --keogram DATE</pre>
151-
and check for errors.
152-
If needed, run <code>testUpload.sh</code> to see why the upload fails.
153-
</p>
154-
<p>
155-
If your keograms are tall and skinny you can have them created so they
156-
look like regular images by enabling the
157-
<span class="WebUISetting">Expand</span> setting.
146+
<ul>
147+
<li>If a keogram isn't being created, make sure the Keogram
148+
<span class="WebUISetting">Generate</span> setting is enabled.
149+
If that IS enabled, run:
150+
<pre>generateForDay.sh --keogram DATE</pre>
151+
replacing <code>DATE</code> with a valid date like <code>20250710</code>
152+
and check for errors.
153+
<li>If a keogram is created but not <em>uploaded</em>, make sure the
154+
Keogram <span class="WebUISetting">Upload</span> setting is enabled.
155+
If that IS enabled, run:
156+
<pre>generateForDay.sh --upload --debug --keogram DATE</pre>
157+
and check for errors.
158+
If needed, run <code>testUpload.sh</code> to see why the upload fails.
159+
<li>If your keograms are tall and skinny you can have them created so they
160+
look like regular images by enabling the
161+
<span class="WebUISetting">Expand</span> setting.
162+
</ul>
158163
</p>
164+
</details>
159165

160166
</div><!-- Layout-main -->
161167
</div><!-- Layout -->

0 commit comments

Comments
 (0)