Commit Graph

1271 Commits

Author SHA1 Message Date
Markus Hitter 7be5212f06 ARM: introduce sei() and cli().
No test, because it's tricky to test, but it compiles and the
firmware still works as before.
2015-08-12 14:26:36 +02:00
Markus Hitter 608506719b gcode_parse.h: order variables reasonably in groups of 4 bytes.
This uses 4 bytes less RAM, without any loss, due to fewer holes
in variable arrangements.

The general strategy is simple:

 - Ideally, all variables are aligned in groups of 4 bytes
   (32 bits). This allows fastest access on 32-bit CPUs and doesn't
   change anything on 8 or 16 bit ones.

 - 1x 32-bits variable = 4 bytes = 4-byte group.

 - 2x 16-bits variable together = 4-byte group.

 - 4x 8-bits variable together = 4-byte group.

 - Have as few incomplete groups as possible.

Another strategy is to simply order variables by size.

There's a compiler flag to pack such variable arrangements, but
this costs Flash size and processing time.
2015-08-12 14:26:36 +02:00
Markus Hitter e5729d6743 ARM: get gcode_parse.c in.
Just did it, no code changes neccessary. Except ajusting the
boundaries to not yet ported code.

Successful tests: controller answers with "ok", just like an AVR.

Binary size raised, of course:

    SIZES          ARM...     lpc1114
    FLASH  :  3064 bytes          10%
    RAM    :   194 bytes           5%
    EEPROM :     0 bytes           0%
2015-08-12 14:26:36 +02:00
Markus Hitter ab910ee1c4 ARM: add Gen7-ARM to the series of regression tests.
Now ARM based boards are covered as well :-)
2015-08-12 14:26:36 +02:00
Markus Hitter 5a8dcf8e97 ARM: add a board configuration for Gen7-ARM.
Wohoo, this is the first ARM board in Configtool. Let's see how
Configtool deals with it :-)
2015-08-12 14:26:36 +02:00
Markus Hitter 2dd35e6529 ARM: prettify cmsis-system_lpc11xx.c/.h.
Again, remove trailing whitespace and such stuff.
2015-08-12 14:26:36 +02:00
Markus Hitter b1490658cf ARM: rename mbed-system_LPC11xx.c/.h to cmsis-system_lpc11xx.c/.h.
Last part of the effort to rename all CMSIS-provided files to
"cmsis-".
2015-08-12 14:26:36 +02:00
Markus Hitter ccbe3fbfbb ARM: prettify cmsis-core_cm0.h.
This is just wording for the Teacup changes notes consistent with
the other cmsis- files.
2015-08-12 14:26:36 +02:00
Markus Hitter 052706975d ARM: rename mbed-core_cm0.h to cmsis-core_cm0.h.
Part of the effort to rename all CMSIS-provided files to "cmsis-".
2015-08-12 14:26:36 +02:00
Markus Hitter d1c624f0c5 ARM: prettify cmsis-lpc11xx.h.
This is, remove trailing whitespace and such stuff. Log of all
changes near the top of the file.
2015-08-12 14:26:36 +02:00
Markus Hitter a7240523e1 ARM: rename mbed-LPC11xx.h to cmsis-lpc11xx.h.
Part of the effort to rename all CMSIS-provided files to "cmsis-".
2015-08-12 14:26:36 +02:00
Markus Hitter 4ff26e1776 ARM: prettify current cmsis- files.
This is, reformat the "Changes for Teacup" section, change tabs
for spaces, remove trailing whitespace and keep the file as close
to the original as possible.
2015-08-12 14:26:35 +02:00
Markus Hitter 5fa7bfbf81 ARM: rename arm-startup_lpc11xx.s to cmsis-startup_lpc11xx.s. 2015-08-12 14:26:35 +02:00
Markus Hitter f2005f0018 ARM: rename arm-lpc-1114.ld to cmsis-lpc1114.ld.
This is the start of renaming all CMSIS related files to
"cmsis-...".
2015-08-12 14:26:35 +02:00
Markus Hitter e8299deb86 serial-arm.c: don't calculate serial line parameters at runtime.
This is a pretty complex and, as system clock and baudrate are
known at compile time and never changed at runtime, unneccessary.
Replacing this calculation with fixed values makes the binary
a whopping 564 bytes smaller.

However, how to get these values? Well, we do kind of an
easter-egg. If parameters arenot known, we calculate them at
runtime anyways, and also report them to the user. So she can
insert them into the code and after doing so, whoops, serial
fast and binary small :-)

With known parameters:

    SIZES          ARM...     lpc1114
    FLASH  :  1092 bytes           4%
    RAM    :   132 bytes           4%
    EEPROM :     0 bytes           0%

Without (1428 bytes more):

    SIZES          ARM...     lpc1114
    FLASH  :  2520 bytes           8%
    RAM    :   132 bytes           4%
    EEPROM :     0 bytes           0%
2015-08-12 14:26:35 +02:00
Markus Hitter fc124c14d4 serial-arm.c: allow sending arbitrarily long messages.
On ARM we use only the 16 byte hardware buffer for sending and
receiving over the serial line, which is often too short for
debugging messages. This implementation works fine and still
neither blocks nor introduces delays for short messages.

Costs 72 bytes binary size, mostly because it's the first usage
of delay_us():
    SIZES          ARM...     lpc1114
    FLASH  :  1656 bytes           6%
    RAM    :   136 bytes           4%
    EEPROM :     0 bytes           0%
2015-08-12 14:26:35 +02:00
Markus Hitter 8f90e63e85 serial-arm.c: don't store a pointer to the serial port.
As this pointer isn't used anywhere else, it's pointless. Saves
4 bytes binary size and 4 bytes RAM.

    SIZES          ARM...     lpc1114
    FLASH  :  1584 bytes           5%
    RAM    :   136 bytes           4%
    EEPROM :     0 bytes           0%
2015-08-12 14:26:35 +02:00
Markus Hitter 8377de8d66 ARM: get delay.c in.
Accuracy is pretty good, see committed comments :-)

Code used for testing, in main():

  uint32_t i;

  SET_OUTPUT(PIO0_1);
  while (1) {
    // 10 seconds for each frequency, so we
    // can measure all three with one upload.
    for (i = 10000; i > 0; i--) {
      WRITE(PIO0_1, 1);
      delay_us(1000);
      WRITE(PIO0_1, 0);
      delay_us(1000);
    }
    for (i = 1000; i > 0; i--) {
      WRITE(PIO0_1, 1);
      delay_us(10000);
      WRITE(PIO0_1, 0);
      delay_us(10000);
    }
    for (i = 200; i > 0; i--) {
      WRITE(PIO0_1, 1);
      delay_us(65000);
      WRITE(PIO0_1, 0);
      delay_us(65000);
    }
  }
2015-08-12 14:26:35 +02:00
Markus Hitter 6c31471ffd ARM: split out architecture specific parts for delay.c
(Hopefully) no functional change.

Also remove these wd_reset()s in delay_us() to match the behaviour
promised in delay.h. Not that this matters much, watchdog is
disabled by default.
2015-08-12 14:26:35 +02:00
Markus Hitter e2df7733ee ARM: move system definitions from .c to .h.
More precisely, from mbed-system_LPC11xx.c to
mbed-system_LPC11xx.h. This way these definitions are available
elsewhere in the code.
2015-08-12 14:26:35 +02:00
Markus Hitter 52e2585f13 ARM: use arduino.h for UART pinout.
This removes another 36 bytes binary size and six(!) MBED files.

The mess of MBED files is now pretty much resolved, only a few
essential ones left.
2015-08-12 14:26:35 +02:00
Markus Hitter 66dcde54dc mendel.c: move io_init() to pinio.c.
Also rename it to pinio_init(). Other than that a simple
copy/paste operation, with replacing tabs by spaces. No functional
change.
2015-08-12 14:26:35 +02:00
Markus Hitter d337fd18ad mendel.c: move CPU initialisation to cpu.c (cpu-avr.c).
No functional change, but more code separated by architecture.
2015-08-12 14:26:35 +02:00
Markus Hitter 083f8f9b22 Make use of PULLUP_ON() and PULLUP_OFF().
This should not change behaviour, but later enable proper
operation on ARM.
2015-08-12 14:26:35 +02:00
Markus Hitter facd1ee606 pinio.h: implement PULLUP_ON() and PULLUP_OFF().
On ARM enabling the pullup on an input pin isn't done by writing
a 1 to the pin, but by setting the corresponding register.
Accordingly we need a distinct function for this.
2015-08-12 14:26:35 +02:00
Markus Hitter 45bcef395e ARM: implement SET_INPUT() and READ().
Tested and found to work. Excellent.

Test code before main():

static void delay(uint32_t delay) {
  while (delay) {
    __ASM volatile ("nop");
    delay--;
  }
}

Test code in main():

  SET_INPUT(PIO0_1);
  SET_INPUT(PIO0_2);
  SET_INPUT(PIO0_3);
  SET_INPUT(PIO0_4);

  delay(5000000);
  while (1) {
    sersendf_P(PSTR("\nPIO0_1  PIO"));
    delay(100000);
    sersendf_P(PSTR("0_2  PIO0_3"));
    delay(100000);
    sersendf_P(PSTR("  PIO0_4\n"));
    delay(100000);
    sersendf_P(PSTR("  %sx"), READ(PIO0_1));
    delay(100000);
    sersendf_P(PSTR("    %sx"), READ(PIO0_2));
    delay(100000);
    sersendf_P(PSTR("    %sx"), READ(PIO0_3));
    delay(100000);
    // PIO0_4 works, but the chip doesn't allow to set a pullup.
    sersendf_P(PSTR("    %sx\n"), READ(PIO0_4));
    delay(5000000);
  }
2015-08-12 14:26:35 +02:00
Markus Hitter 072e3f8ae5 ARM: also set GPIO function and mode.
This also implements more of the FastIO infrastructure.
Unfortunately, definitions aren't exactly straightforward, so we
need lots of tabular data. For example, for the pin function I
I had to step through the user manual, pin by pin.

We also learned a lesson here: Cortex-M0 has a 4 word ( = 16 bytes)
prefetch engine. Loops not starting at such a boundary take
additional 4 clock cycles, making them slower. The tight loop used
for testing previously happened to be 16-byte aligne by accident.
Adding just one line of code in the SET_OUTPUT() macro misaligned
it, so loop repetition rate dropped from 5.3 MHz to 3.7 MHz.

There are many measures to align code to 16-byte boundaries:

 - -falign-functions=16 as gcc flag.

 - -falign-loops=16 as gcc flag, found to not work.

 - -falign-labels=16 as gcc flag, worked for aligning the loop,
   but also bloated the binary by 10%.

 - __attribute__ ((aligned(16))) attached to functions (not
   tested)

 - Adding this just before the loop worked fine and increased the
   binary by just 16 bytes:

     __ASM (".balign 16");

Take care of this when relying on exact execution times, e.g. when
implementing delay_us()!
2015-08-12 14:26:35 +02:00
Markus Hitter c66bf0a8de pinio.h: remove TOGGLE(), GET_INPUT(), GET_OUTPUT() macros.
Nowhere used, which unlikely changes in the forseeable future.
2015-08-12 14:26:35 +02:00
Markus Hitter 2b52233a2d pinio.h: apply the formatting used for ARM for AVR as well.
No functinal change.
2015-08-12 14:26:34 +02:00
Markus Hitter 2c90a2dfc7 ARM: get FastIO for writing into place.
Only SET_OUTPUT() and WRITE() for now, reading follows later.

A loop like this:

  SET_OUTPUT(PIO0_1);
  for (;;) {
    WRITE(PIO0_1, 0);
    WRITE(PIO0_1, 1);
  }

toggles a pin at about 5.3 MHz. The low period is 63 ns on the
scope, so 3 clock cycles. With this loop, the binary is 1648
bytes.

Assembly shows four instructions inside the loop, which is about
as good as it can get:

  movs  r2, #0
  str   r2, [r3, #8]
  adds  r2, #2
  str   r2, [r3, #8]

For comparison, using the MBED provided gpio routines give a
toggle frequency of about 300 kHz, with a low period of 72 clock
cycles. Microoptimisation isn't just the last few percent ...

Tested with this code before main():

static void delay(uint32_t delay) {
  while (delay) {
    __ASM volatile ("nop");
    delay--;
  }
}

... and in main():

  SET_OUTPUT(PIO0_1);
  SET_OUTPUT(PIO0_2);
  SET_OUTPUT(PIO0_3);
  SET_OUTPUT(PIO0_4);
  __ASM (".balign 16");
  while (1) {
    // 1 pulse on pin 1, two pulses on pin 2, ...
    WRITE(PIO0_1, 0);
    WRITE(PIO0_1, 1);
    WRITE(PIO0_2, 0);
    WRITE(PIO0_2, 1);
    WRITE(PIO0_2, 0);
    WRITE(PIO0_2, 1);
    WRITE(PIO0_3, 0);
    WRITE(PIO0_3, 1);
    WRITE(PIO0_3, 0);
    WRITE(PIO0_3, 1);
    WRITE(PIO0_3, 0);
    WRITE(PIO0_3, 1);
    // PIO0_4 needs a pullup 10k to 3.3V
    // to show a visible signal.
    WRITE(PIO0_4, 0);
    delay(10);
    WRITE(PIO0_4, 1);
    delay(10);
    WRITE(PIO0_4, 0);
    delay(10);
    WRITE(PIO0_4, 1);
    delay(10);
    WRITE(PIO0_4, 0);
    delay(10);
    WRITE(PIO0_4, 1);
    delay(10);
    WRITE(PIO0_4, 0);
    delay(10);
    WRITE(PIO0_4, 1);
    delay(1000);
  }

With a 10k pullup, PIO0_4 has a rise time of about 1 microsecond.
2015-08-12 14:26:34 +02:00
Markus Hitter 370bb9f93c Move pin I/O macros from arduino.h to pinio.h.
arduino.h is now free of function definitions.
2015-08-12 14:26:34 +02:00
Markus Hitter 32480bdfb6 ARM: silence warning in mbed-system_LPC11xx.c.
No functional change, just moved declarations to a more
appropriate place.
2015-08-12 14:26:34 +02:00
Markus Hitter a336ae57e3 ARM: get rid of mbed-core_cmFunc.h and mbed-core_cmInstr.h.
Since MBED's serial_api is no longer in use, they're no longer
needed either. Except for a simple assembler instruction, which
was inserted directly.
2015-08-12 14:26:34 +02:00
Markus Hitter 5b8068d228 sersendf.c/.h: remove sersendf() (not sersendf_P()).
Was commented out already and probably never used.
2015-08-12 14:26:34 +02:00
Markus Hitter 485427017d sersendf.c: explicitely cast to the requested size.
This adds 48 bytes binary size but should help to avoid confusion
when using sersendf_P() for debugging.
2015-08-12 14:26:34 +02:00
Markus Hitter 43b2ac6e0b ARM: get sersendf.c/.h in.
Needed a bit a tweak to adjust va_arg() to 32 bit. Tests ran fine,
at the end it turned out mendel.c had an obsolete #include.
2015-08-12 14:26:34 +02:00
Markus Hitter 5dec638919 ARM: get sermsg.c/.h in.
Compiled flawlessly, ran all test flawlessly, and at the end it
turned out mendel.c had an obsolete #include. Very nice.
2015-08-12 14:26:34 +02:00
Markus Hitter 829e4d475b Makefiles: add a hint on how to list these predefined macros.
No functional change.
2015-08-12 14:26:34 +02:00
Markus Hitter ce40b678f6 Solve the pgmspace.h problem centrally.
We previously put replacements for the von Neuman architecture
into arduino.h already, now let's complete this by having only
one #include <avr/pgmspace.h> in arduino.h. Almost all sources
include arduino.h anyways, so this is mostly a code reduction.
2015-08-12 14:26:34 +02:00
Markus Hitter 52f5a56d71 ARM: move serial handling code directly into serial-arm.c.
This makes another seven mbed files obsolete and reduces binary
size by another 100 bytes Flash and 16 bytes RAM:

    SIZES          ARM...     lpc1114
    FLASH  :  1624 bytes           5%
    RAM    :   140 bytes           4%
    EEPROM :     0 bytes           0%
2015-08-12 14:26:34 +02:00
Markus Hitter 776f90ff2c ARM: simplify serial and get rid of mbed-pinmap_common.c.
We have only one UART, we use only one UART, so it's pointless to
do pin mapping calculations at runtime.

Binary size down by 268 bytes:
    SIZES          ARM...     lpc1114
    FLASH  :  1724 bytes           6%
    RAM    :   156 bytes           4%
    EEPROM :     0 bytes           0%
2015-08-12 14:26:34 +02:00
Markus Hitter a5cb1bd31a ARM: get rid of mbed-mbed_error.h and mbed-error.c.
Same functionality, drastically smaller binary:

    SIZES          ARM...     lpc1114
    FLASH  :  1992 bytes           7%
    RAM    :   156 bytes           4%
    EEPROM :     0 bytes           0%

That's a reduction by 3948 bytes Flash and 20 bytes RAM.
2015-08-12 14:26:34 +02:00
Markus Hitter 848369608b ARM: get rid of mbed-mbed_assert.h.
No functional change, binary size 16 bytes smaller.
2015-08-12 14:26:34 +02:00
Markus Hitter 4cfeca08e1 ARM: get serial working based on MBED code.
Pretty complex, this MBED system, it requires no less than
24 additional files. This will be fleshd out before too long.

    SIZES          ARM...     lpc1114
    FLASH  :  5956 bytes          19%
    RAM    :   176 bytes           5%
    EEPROM :     0 bytes           0%
2015-08-12 14:26:34 +02:00
Markus Hitter 9e9e946c6d Makefile-ARM: get uploading to work. 2015-08-12 14:26:34 +02:00
Markus Hitter 3cc81cdba8 Makefile-ARM: adjust sizes reporting to our only target. 2015-08-12 14:26:33 +02:00
Markus Hitter 575174940f ARM: get a minimum amount of Teacup compiled for ARM.
Makefile can't even upload, yet.

    SIZES          ARM...     lpc1114
    FLASH  :   944 bytes           3%
    RAM    :   132 bytes           4%
    EEPROM :     0 bytes           0%
2015-08-12 14:26:33 +02:00
Markus Hitter 24b2cd1d02 ARM: start generic port by splitting out AVR specific serial code.
This shows the new strategy to deal with architecture-specific
code:

 - Keep common code as before.

 - Keep the header file unchanged as well, no architecture
   specific headers.

 - Move architecture specific code to an architecture specific
   file and wrap the whole contents into an architecture test.

 - Also wrap the whole contents with #ifdef TEACUP_C_INCLUDE.
   Without this wrapping, Arduino IDE as well as Configtool would
   compile the stuff twice, because they compile everything
   unconditionally.

 - Last not least, #define TEACUP_C_INCLUDE and #include all
   architecture specific files unconditionally.

Build tests were successful with the Makefile, with Configtool
and with Arduino 1.5.8, so this strategy is expected to work.

Regarding the copy operation of this commit: code unchanged,
other than rewriting of all the comments for the current idea of
'proper' formatting, getting rid of tabs and some other whitespace
editing.
2015-08-12 14:26:33 +02:00
Markus Hitter 43626b2ba2 boardpanel.py: fix getCPUInfo(), don't report tuples.
This was forgotten with the recent move to storing configuration
items as tuples (value, enabled). It should fix the refusal to
build reported in issue #86.
2015-08-12 14:18:40 +02:00
Markus Hitter cf3b94b980 heater.c/.h: get rid of heaters_all_off().
Nowhere used and exactly duplicated heaters_all_zero().
2015-08-07 16:16:05 +02:00