Compare commits

...

3 commits

Author SHA1 Message Date
Stephan I. Böttcher
ee6392817d Merge branch 'master' of forge.bexus.org:Stephan/irena-arm 2024-09-04 13:48:08 +02:00
stephan
d29e68274f chaos.c: chaos/adc args parsing changes
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/arm@9097 bc5caf13-1734-44f8-af43-603852e9ee25
2024-09-04 11:44:43 +00:00
stephan
09bbc3061b revision = commit id
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/arm@9096 bc5caf13-1734-44f8-af43-603852e9ee25
2024-09-03 13:10:59 +00:00

12
chaos.c
View file

@ -94,10 +94,10 @@ static int chaos_adc(struct command *cmd, const struct command_par *par)
unsigned char chs = v; unsigned char chs = v;
if (!chs) if (!chs)
chs = 0xff; chs = 0xff;
unsigned char rep = 4; unsigned char rep = (v>>8) & 0xf;
if (v & 0x0f00) if (!parse_expression_square(cmd, &v, 0))
rep = (v>>8) & 0xf; rep = v;
if (what & 0x1000000) { if (what & 0x01000000) {
if (ads8688_results(chs)) if (ads8688_results(chs))
c = error_code(par); c = error_code(par);
} }
@ -135,8 +135,8 @@ const struct keywords chaos_variable_names[] = {
}; };
static const struct keywords commands[] = { static const struct keywords commands[] = {
CMD_KW("adctrigger", chaos_adc, 281, 0), CMD_KW("adctrigger", chaos_adc, 281, 0x000008ff),
CMD_KW("adcread", chaos_adc, 281, 0x1000000), CMD_KW("adcread", chaos_adc, 281, 0x01000000),
CMD_KW("hk", chaos_hk, 282, 0), CMD_KW("hk", chaos_hk, 282, 0),
CMD_KWF("cmd", plugin_spi, 280, 0x08009800), CMD_KWF("cmd", plugin_spi, 280, 0x08009800),
{"", {.par=&parser_unknown_command}}}; {"", {.par=&parser_unknown_command}}};