Updated to atxmega core 1.15 (#13)

Author: artursilva0

Firmware/LedArray/LedArray.cproj

@@ -135,7 +135,7 @@
   <avrgcc.linker.libraries.Libraries>
     <ListValues>
       <Value>libm</Value>
-      <Value>libATxmega64A4U-1.13.a</Value>
+      <Value>libATxmega64A4U-1.15.a</Value>
     </ListValues>
   </avrgcc.linker.libraries.Libraries>
   <avrgcc.linker.libraries.LibrarySearchPaths>

Firmware/LedArray/app.c

@@ -29,7 +29,7 @@ void hwbp_app_initialize(void)
    uint8_t hwH = 1;
    uint8_t hwL;
    uint8_t fwH = 2;
-   uint8_t fwL = 6;
+   uint8_t fwL = 7;
    uint8_t ass = 0;
 
    io_pin2in(&PORTA, 0, PULL_IO_TRISTATE, SENSE_IO_EDGES_BOTH);         // VERSION0

Firmware/LedArray/hwbp_core.h

@@ -18,102 +18,120 @@ typedef struct {
 	uint16_t usecond;
 } timestamp_t;
 
-// Used to define the clock direction default of the device.
+/// Used to define the clock direction default of the device.
 void core_callback_define_clock_default(void);
 
-// It's the first callback used, right after booting the core.
-// The pins, ports and external hardware should be initialized.
+/// It's the first callback used, right after booting the core.
+/// The pins, ports and external hardware should be initialized.
 void core_callback_initialize_hardware(void);
 
-// Used to initialize the registers.
-// All registers should be written to their default state.
+/// Used to initialize the registers.
+/// All registers should be written to their default state.
 void core_callback_reset_registers(void);
 
-// Call right after load the register with default or EEPROM values.
-// The state registers and external hardware should be configured according the value of the registers.
+/// Call right after load the register with default or EEPROM values.
+/// The state registers and external hardware should be configured according the value of the registers.
 void core_callback_registers_were_reinitialized(void);
 
-// Called when the application must turn off all the visual indicators.
+/// Called when the application must turn off all the visual indicators.
 void core_callback_visualen_to_on(void);
-// Called when the application can turn on the visual indicators.
+/// Called when the application can turn on the visual indicators.
 void core_callback_visualen_to_off(void);
 
-// When the device goes to Standby Mode.
+/// When the device goes to Standby Mode.
 void core_callback_device_to_standby(void);
-// When the device goes to Active Mode.
+/// When the device goes to Active Mode.
 void core_callback_device_to_active(void);
-// When the device goes to Speed Mode.
+/// When the device goes to Speed Mode.
 void core_callback_device_to_speed(void);
 
 
-// Called before execute the timer interrupts
+/// Called before execute the timer interrupts
 void core_callback_t_before_exec(void);
-// Called after execute the timer interrupts
+/// Called after execute the timer interrupts
 void core_callback_t_after_exec(void);
 
-// Called every millisecond.
+/// Called every millisecond.
 void core_callback_t_1ms(void);
-// Called 500 microseconds after the "void core_callback_t_1ms(void)".
+/// Called 500 microseconds after the "void core_callback_t_1ms(void)".
 void core_callback_t_500us(void);
-// Called every time a new second starts.
+/// Called every time a new second starts.
 void core_callback_t_new_second(void);
 
 
-// Read from an application register.
+/// Read from an application register.
 bool core_read_app_register(uint8_t add, uint8_t type);
-// Write to an application register.
+/// Write to an application register.
 bool core_write_app_register(uint8_t add, uint8_t type, uint8_t * content, uint16_t n_elements);
-// Read from a common register.
+/// Read from a common register.
 bool hwbp_read_common_reg(uint8_t add, uint8_t type);
-// Write to an common register.
+/// Write to an common register.
 bool hwbp_write_common_reg(uint8_t add, uint8_t type, uint8_t * content, uint16_t n_elements);
 
 
 /************************************************************************/
 /* Register RESET_APP                                                   */
 /************************************************************************/
-// Write to common register RESET_APP.
+/// Write to common register RESET_APP.
 bool hwbp_write_common_reg_RESET_APP(void *a);
 
-// Used to save all registers to non-volatile memory
+/// Used to save all registers to non-volatile memory
 bool core_save_all_registers_to_eeprom(void);
 
 
 /************************************************************************/
 /* Register CONFIG                                                      */
 /************************************************************************/
-// Write to common register CONFIG.
+/// Write to common register CONFIG.
 bool hwbp_write_common_reg_CONFIG(void *a);
-// Read from common register CONFIG.
+/// Read from common register CONFIG.
 void hwbp_read_common_reg_CONFIG(void);
 
-// Called when the application should configure the hardware to repeat the harp timestamp clock input.
+/// Called when the application should configure the hardware to repeat the harp timestamp clock input.
 void core_callback_clock_to_repeater(void);
-// Called when the application should configure the hardware to generate the harp timestamp clock.
+/// Called when the application should configure the hardware to generate the harp timestamp clock.
 void core_callback_clock_to_generator(void);
-// Called when the timestamp lock is changed to unlocked.
+/// Called when the timestamp lock is changed to unlocked.
 void core_callback_clock_to_unlock(void);
-// Called when the timestamp lock is changed to locked.
+/// Called when the timestamp lock is changed to locked.
 void core_callback_clock_to_lock(void);
 
-// Used to know if the device is repeating the harp timestamp clock
+/// Used to know if the device is repeating the harp timestamp clock
 bool core_bool_device_is_repeater(void);
-// Used to know if the device is generating the harp timestamp clock
+/// Used to know if the device is generating the harp timestamp clock
 bool core_bool_device_is_generator(void);
-// Used to check if the timestamp register is locked
+/// Used to check if the timestamp register is locked
 bool core_bool_clock_is_locked(void);
 
-// Used to set the device as a repeater
+/// Used to set the device as a repeater
 bool core_device_to_clock_repeater(void);
-// Used to set the device as a generator
+/// Used to set the device as a generator
 bool core_device_to_clock_generator(void);
-// Used to lock the timestamp register
+/// Used to lock the timestamp register
 bool core_clock_to_lock(void);
-// Used to unlock the timestamp register
+/// Used to unlock the timestamp register
 bool core_clock_to_unlock(void);
 
 
-// It is mandatory that this function is the first of the application code.
+/// It is mandatory that this function is the first of the application code.
+void core_func_start_core_V2 (
+	const uint16_t who_am_i,
+    const uint8_t hwH,
+    const uint8_t hwL,
+	const uint8_t hwP,
+    const uint8_t fwH,
+    const uint8_t fwL,
+    const uint8_t fwP,
+    uint8_t *pointer_to_app_regs,
+    const uint16_t app_mem_size_to_save,
+    const uint8_t num_of_app_registers,
+    const uint8_t *device_name,
+    const bool	device_is_able_to_repeat_clock,
+    const bool	device_is_able_to_generate_clock,
+	const uint8_t default_timestamp_offset
+	);
+
+/// Old initialization function. Use "core_func_start_core_V2()" instead.
 void core_func_start_core (
     const uint16_t who_am_i,
     const uint8_t hwH,
@@ -130,41 +148,45 @@ void core_func_start_core (
 	const uint8_t default_timestamp_offset
 	);
 
-// Call this function in case of error
-// A power up or reset must be performed to remove the device from this state
+/// Call this function in case of error
+/// A power up or reset must be performed to remove the device from this state
 void core_func_catastrophic_error_detected(void);
-// When a catastrophic error is detected (last callback before go into error state)
-// User should shutdown all the peripherals
+/// When a catastrophic error is detected (last callback before go into error state)
+/// User should shutdown all the peripherals
 void core_callback_catastrophic_error_detected(void);
 
-// Used to leave the speed mode.
+/// Used to leave the speed mode.
 void core_func_leave_speed_mode_and_go_to_standby_mode(void);
 
 
-// Used to create a specific timestamp that can be used when sending Events
+/// Used to create a specific timestamp that can be used when sending Events
 void core_func_update_user_timestamp(uint32_t seconds, uint16_t useconds);
 
-// Used to read the current user timestamps
+/// Used to read the current user timestamps
 void core_func_read_user_timestamp(uint32_t *seconds, uint16_t *useconds);
 
-// Used to save the current timestamp
+/// Used to save the current timestamp
 void core_func_mark_user_timestamp(void);
 
-// Used to send an Event
+/// Used to send an Event
 void core_func_send_event(uint8_t add, bool use_core_timestamp);
 
-// Used to get the content of register R_TIMESTAMP_SECOND.
+/// Used to get the content of register R_TIMESTAMP_SECOND.
 uint32_t core_func_read_R_TIMESTAMP_SECOND(void);
-// Used to get the content of register R_TIMESTAMP_MICRO.
+/// Used to get the content of register R_TIMESTAMP_MICRO.
 uint16_t core_func_read_R_TIMESTAMP_MICRO(void);
 
 
 
 
-// Return "true" if the LEDs can be ON.
+/// Return "true" if the LEDs can be ON.
 bool core_bool_is_visual_enabled(void);
-// Return "true" if the device is in Speed Mode.
+/// Return "true" if the device is in Speed Mode.
 bool core_bool_speed_mode_is_in_use(void);
+/// Return "true" if the device is in Active Mode.
+bool core_bool_device_is_active(void);
+/// Return "true" if the device is synchronized.
+bool core_bool_device_is_synchronized(void);
 
 
 

Firmware/LedArray/hwbp_core_com.h

@@ -21,6 +21,7 @@
 #define HWBP_UART_CTS_INT_LEVEL	INT_LEVEL_HIGH
 
 #define HWBP_UART_RXBUFSIZ			MAX_PACKET_SIZE
+#define HWBP_UART_TEMP_RXBUFSIZ		32
 
 #if defined(__AVR_ATxmega16A4U__)
     #define HWBP_UART_UART			USARTE0
@@ -119,7 +120,7 @@
 	#define hwbp_uart_leave_interrupt return/*reti();*/
 
 	/* Use as much as possible */
-	#define HWBP_UART_TXBUFSIZ		6144
+	#define HWBP_UART_TXBUFSIZ		5120
 #endif
 
 #if defined(__AVR_ATxmega128A1U__)
@@ -144,7 +145,7 @@
 	#define hwbp_uart_leave_interrupt return/*reti();*/
 
 	/* Use as much as possible */
-	#define HWBP_UART_TXBUFSIZ		6144
+	#define HWBP_UART_TXBUFSIZ		5120
 #endif
 
 
@@ -165,17 +166,17 @@ void hwbp_uart_xmit(const uint8_t *dataIn0, uint8_t siz);
 bool hwbp_uart_rcv_now(uint8_t * byte);								// Not used
 
 
-// Called before execute the uart rRX interrupt
+/// Called before execute the uart rRX interrupt
 void core_callback_uart_rx_before_exec(void);
-// Called after execute the uart RX interrupt
+/// Called after execute the uart RX interrupt
 void core_callback_uart_rx_after_exec(void);
-// Called before execute the uart Tx interrupt
+/// Called before execute the uart Tx interrupt
 void core_callback_uart_tx_before_exec(void);
-// Called after execute the uart TX interrupt
+/// Called after execute the uart TX interrupt
 void core_callback_uart_tx_after_exec(void);
-// Called before execute the uart CTS interrupt
+/// Called before execute the uart CTS interrupt
 void core_callback_uart_cts_before_exec(void);
-// Called after execute the uart CTS interrupt
+/// Called after execute the uart CTS interrupt
 void core_callback_uart_cts_after_exec(void);
 
 

Firmware/LedArray/hwbp_core_regs.h

@@ -1,6 +1,32 @@
 #ifndef _HWBP_CORE_REGS_H_
 #define _HWBP_CORE_REGS_H_
 
+/************************************************************************/
+/* Common Bank Structure                                                */
+/************************************************************************/
+struct CommonBank
+{
+	uint16_t	R_WHO_AM_I;
+	uint8_t	R_HW_VERSION_H;
+	uint8_t	R_HW_VERSION_L;
+	uint8_t	R_ASSEMBLY_VERSION;
+	uint8_t	R_CORE_VERSION_H;
+	uint8_t	R_CORE_VERSION_L;
+	uint8_t	R_FW_VERSION_H;
+	uint8_t	R_FW_VERSION_L;
+	uint32_t	R_TIMESTAMP_SECOND;
+	uint16_t	R_TIMESTAMP_MICRO;
+	uint8_t	R_OPERATION_CTRL;
+	uint8_t	R_RESET_DEV;
+	uint8_t R_DEVICE_NAME[25];
+	uint16_t R_SERIAL_NUMBER;
+	uint8_t R_CLOCK_CONFIG;
+	uint8_t R_TIMESTAMP_OFFSET;
+	uint8_t R_UID[16];
+	uint8_t R_TAG[8];
+	uint16_t R_HEARTBEAT;
+	uint8_t R_VERSION[32];
+};
 
 /************************************************************************/
 /* Common Bank Registers                                                */
@@ -22,9 +48,13 @@
 #define ADD_R_SERIAL_NUMBER     0x0D    // U16
 #define ADD_R_CONFIG            0x0E    // U8
 #define ADD_R_TIMESTAMP_OFFSET  0x0F    // U8
+#define ADD_R_UID               0x10    // U8[16]
+#define ADD_R_TAG               0x11    // U8[8]
+#define ADD_R_HEARTBEAT         0x12    // U16
+#define ADD_R_VERSION           0x13    // U8[32]
 
 /* Memory limits */
-#define COMMON_BANK_ADD_MAX             0x0F
+#define COMMON_BANK_ADD_MAX             0x13
 #define COMMON_BANK_ABSOLUTE_ADD_MAX    0x1C
 
 /* R_OPERATION_CTRL */
@@ -34,6 +64,7 @@
 #define GM_OP_MODE_ACTIVE   (1<<0)
 #define GM_OP_MODE_SPEED    (3<<0)
 
+#define B_HEARTBEAT_EN      (1<<2)
 #define B_DUMP              (1<<3)
 #define B_MUTE_RPL          (1<<4)
 #define B_VISUALEN          (1<<5)
@@ -48,6 +79,7 @@
 
 #define B_NAME_TO_DEFAULT   (1<<3)
 
+#define B_BOOT              (1<<5)
 #define B_BOOT_DEF          (1<<6)
 #define B_BOOT_EE           (1<<7)
 
@@ -60,5 +92,9 @@
 #define B_CLK_UNLOCK        (1<<6)
 #define B_CLK_LOCK          (1<<7)
 
+/* ADD_R_HEARTBEAT */
+#define B_IS_SYNCHRONIZED   (1<<0)
+#define B_IS_ACTIVE         (1<<1)
+
 
 #endif /* _HWBP_CORE_REGS_H_ */

Firmware/LedArray/hwbp_sync.h

@@ -37,7 +37,7 @@ void trigger_sync_timer (void);
 #if defined(__AVR_ATxmega16A4U__)
     #define INCREASE_LOST_SYNC_COUNTER
 #else
-    #define INCREASE_LOST_SYNC_COUNTER device_lost_sync_counter++
+    #define INCREASE_LOST_SYNC_COUNTER if(++device_lost_sync_counter == 255) device_lost_sync_counter = 254; if(device_lost_sync_counter >= 5 ) commonbank.R_HEARTBEAT &= ~B_IS_SYNCHRONIZED
 #endif
 
 

Firmware/LedArray/libATxmega64A4U-1.13.a

@@ -3,7 +3,7 @@
 # yaml-language-server: $schema=https://harp-tech.org/draft-02/schema/device.json
 device: LedArray
 whoAmI: 1088
-firmwareVersion: "2.4"
+firmwareVersion: "2.7"
 hardwareTargets: "1.1" # also 1.2 & 1.3
 registers:
   EnablePower: &ledstatereg