Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Firmware/Olfactometer/Olfactometer.cproj
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<avrgcc.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
<Value>libATxmega128A1U-1.14.a</Value>
<Value>libATxmega128A1U-1.15.a</Value>
</ListValues>
</avrgcc.linker.libraries.Libraries>
<avrgcc.linker.libraries.LibrarySearchPaths>
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Olfactometer/app.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void hwbp_app_initialize(void)
uint8_t hwH = 2;
uint8_t hwL = 1;
uint8_t fwH = 2;
uint8_t fwL = 2;
uint8_t fwL = 3;
uint8_t ass = 0;

/* Start core */
Expand Down
18 changes: 18 additions & 0 deletions Firmware/Olfactometer/hwbp_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,24 @@ bool core_clock_to_unlock(void);


/// 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,
Expand Down
5 changes: 4 additions & 1 deletion Firmware/Olfactometer/hwbp_core_regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ struct CommonBank
uint8_t R_UID[16];
uint8_t R_TAG[8];
uint16_t R_HEARTBEAT;
uint8_t R_VERSION[32];
};

/************************************************************************/
Expand All @@ -50,9 +51,10 @@ struct CommonBank
#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 0x12
#define COMMON_BANK_ADD_MAX 0x13
#define COMMON_BANK_ABSOLUTE_ADD_MAX 0x1C

/* R_OPERATION_CTRL */
Expand All @@ -77,6 +79,7 @@ struct CommonBank

#define B_NAME_TO_DEFAULT (1<<3)

#define B_BOOT (1<<5)
#define B_BOOT_DEF (1<<6)
#define B_BOOT_EE (1<<7)

Expand Down
Binary file removed Firmware/Olfactometer/libATxmega128A1U-1.14.a
Binary file not shown.
Binary file added Firmware/Olfactometer/libATxmega128A1U-1.15.a
Binary file not shown.
2 changes: 1 addition & 1 deletion device.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# yaml-language-server: $schema=https://harp-tech.org/draft-02/schema/device.json
device: Olfactometer
whoAmI: 1140
firmwareVersion: "2.2"
firmwareVersion: "2.3"
hardwareTargets: "1.0"
registers:
EnableFlow:
Expand Down