GitLab

Also module enable code for am335x.

broken)

Small fixes to trace code and trace server.

Add some build flags to make more stuff switchable.
Fix delay setting for rs485 in block_vesp_tty. (prevent hanging serial port).

Use it for block parameters.
Use it for ethercat frames. (non pdo)
Use it for vesp commands.

Add and4 variant.
Fix memory allocator alignment, it was to enthousiastic.

Remove now unneeded nsec base time.
Command handling in the sample now uses trigger time.
Trace handling still has to be done, then all nsec timers can be removed
from the sample.

Sample counter removed from time interface. Only ec.c used it and it did not
add anything useful.
While sample is running trigger is now responsible for timestamps and
translation to wall clock. (allows external clock/trigger sources).
Log functions now log sub-second timestamps.

compatibility code from controller_block.
Not having a create struct will now lead to failure to load the ctrl file.

Trace server capacity is now based on actuall number of outputs,
not on some magic number.
Add name and unit option to command_bool and command_float.
Modify tests to test this.

With this, we can create e.g. an oscillator module that only has an output,
but no inputs.

	modified:   controller/controller_load_parser.y

	modified:   controller/controller_load_parser.y

The 'filename' parameter wasn't initialized here, so when extra->filename is
used to generate e.g. log messages, garbage entered the log.

	modified:   controller/controller_load.c

allows us to e.g. comment out all parameter lines in a parameter block.
(Commenting out all parameters would fail before.)

	modified:   controller/controller_load_parser.y

	modified:   controller/controller/controller_block.c
	modified:   controller/controller/controller_block.h

Use one version everywhere, and make sure that one version is complete.
This version also uses a switch with the actuall enum types, which is safer.

We do this by checking the final state of all links after loading the top-most
controller file. The new code will allow an included file to create links to
blocks that will only exist later on during the load process, and it will
successfully error out when links are defined for non-existing block.

Furthermore, controller_block_link() will now bail out immediately when it
hits an unrecoverable linker error. With this change, the error mesaage of the
linker step that failed will remain at the end of the output instead of being
flushed off the screen by e.g. 100+ 'Linked x to y (chained)' lines.

	modified:   controller/controller/controller_block.c
	modified:   controller/controller/controller_load.c

This caused all my .ctrl files with typos or non-existing block names in their
'links { }' section to 'just run' instead of failing with an error.
We will now halt with an error like :

 DEBUG: Input block 'digg_out2' does not (yet) exist, will try to link later
 ERROR: Failed to link controller!
 ERROR: Could not load controller file

	modified:   controller/controller_load.c

Untill now, connecting e.g. a 'bool' output to a 'float' input would give:

 ERROR: Input terminal x.y not found

.. although both the input and the output existed.
With this commit, the error will read :

 ERROR: Type mismatch. Can't connect output terminal a.b (of type 'bool') to
 input terminal x.y (of type 'float')

	modified:   controller/controller_block.c
	modified:   controller/controller_block.h

	modified:   controller/controller_block.c

(No functional changes.)
There's an error in the error reporting of this routine, but we'll fix that in
a separate commit.

	modified:   controller/controller_block.c

'slash' would be used uninitialized in this case. While we're here, change
code to use strrchr() instead of rolling our own and only stat() a filename if
we've found a '/', since we know 'extern->filename' will not contain a
directory name otherwise.

	modified:   controller/controller_load.c

(You'll see why in the next commit..)

	modified:   controller/controller_load.c

When the .ctrl file contains a line to create an 'ec' block with incorrect
arguments, the following errors would be emitted :

 ERROR: Invalid arguments trying to create block 'ethercat'
 DEBUG: Load module 'ec' with prefix 'ethercat'
 ERROR: ec:1: syntax error, unexpected $end
 DEBUG: End of module 'ec': 1
 ERROR: pand.ctrl:50: Error creating block
 ERROR: Could not load controller file

The code would first try to load the dynamically loadable 'ec' block's module.
This would fail, because of incorrect arguments. controller_load_block_create()
would then try to stat() the file 'ec'. When found, it is opened and loaded as
a module block.
The code didn't check for the file to be a regular file and my build system
contains a directory with the name 'ec'. On FreeBSD, directories can be opened
and read as if they were regular files, but the .ctrl file parser would fail
to load the directory.
Change the code to *not* try to parse directories.

(It would be even better if we just stopped trying to load blocks when
controller_block_create() tells us that the block does exist, but the user has
made an error. At this moment though, controller_block_create() has no way of
telling the caller that.)

The new code bails out with :

 ERROR: Invalid arguments trying to create block 'ethercat'
 ERROR: Could not load or create block 'ec'
 ERROR: pand.ctrl:50: Error creating block
 ERROR: Could not load controller file

	modified:   controller/controller/controller_load.c

The incorrect error was line 3 of the following example:

 ERROR: Too many arguments supplied! This function doesn't accept arguments.
 ERROR: Invalid arguments trying to create block 'heater3'
 ERROR: Could not find create function or struct for block bridge_pwm
 ERROR: pand.ctrl:36: Error creating block

Both the create function and the create struct were found, but the block
wasn't created because the arguments didn't match. This version reports:
 ..
 ERROR: Could not load or create block 'bridge_pwm'

	modified:   controller/controller/controller_load.c

	modified:   controller/controller/controller_block.c

are.

	modified:   controller/controller/controller_load.c

o My two cents: If you can give explicit errors that tell the user exactly
  what is wrong with a minimal amount of code, please do.

	modified:   controller/controller/controller_load.c

is killed out of the blue)
Add return value to controller_block_add() and add a check to the
blocks for its value.

is killed out of the blue)
Add return value to controller_block_add() and add a check to the
blocks for its value.

Move parameter argument check to block_parameter file.
Remove arugment number check. (Full type check makes it redundant)
Rename check function with controller_load prefix.
Don't treat 1 argument option different from multiple options.

Module inputs can now be used multiple times in a module
Added test for this to test_module.ctrl

	modified:   controller/controller_load.c

when creative block names are used.
Bumped into an almost undecipherable error message due to the name I choose
for a block :)

	modified:   controller/controller_block.c

This will produce error messages like:

ERROR: Argument mismatch in argument 1. Expected argument of type 'double'
 instead of 'char*'
ERROR: Invalid arguments trying to create trigger 'prestart'
ERROR: pand.ctrl:7: Error in trigger
ERROR: Could not load controller file

	modified:   controller/controller_load.c
	modified:   controller/controller_sample.c
	modified:   controller/controller_sample.h

Do this by reversing the logic in some ifs and adding a couple of gotos.
(No functional changes.)

	modified:   controller/controller_sample.c

	modified:   controller/controller_block.c
	modified:   controller/controller_load.h