message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
windows: Fix an oops in a test causing AppVeyor to fail. | @@ -357,7 +357,7 @@ class TestBadImport < TestCase
# Don't check preloaded packages for slashed paths.
var message = """\
- SyntaxError: Cannot import 'abc/def':\n \
+ SyntaxError: Cannot import 'abc\/def':\n \
from [test]:1:\n\
"""
|
p9dsu: change esel command from AMI to IBM 0x3a. | @@ -38,13 +38,18 @@ static bool p9dsu_probe(void)
return true;
}
+static const struct bmc_platform astbmc_smc = {
+ .name = "SMC",
+ .ipmi_oem_partial_add_esel = IPMI_CODE(0x3a, 0xf0),
+};
+
DECLARE_PLATFORM(p9dsu) = {
.name = "p9dsu",
.probe = p9dsu_probe,
.init = astbmc_init,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .bmc = NULL, /* FIXME: Add openBMC */
+ .bmc = &astbmc_smc, /* FIXME: Add openBMC */
.pci_get_slot_info = slot_table_get_slot_info,
.pci_probe_complete = check_all_slot_table,
.cec_power_down = astbmc_ipmi_power_down,
|
test(UART): fix uart tx with ringbuffer test fail issue | @@ -292,7 +292,8 @@ TEST_CASE("uart tx with ringbuffer test", "[uart]")
.data_bits = UART_DATA_8_BITS,
.parity = UART_PARITY_DISABLE,
.stop_bits = UART_STOP_BITS_1,
- .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
+ .flow_ctrl = UART_HW_FLOWCTRL_CTS_RTS,
+ .rx_flow_ctrl_thresh = 120,
.source_clk = UART_SCLK_APB,
};
TEST_ESP_OK(uart_param_config(uart_num, &uart_config));
|
native-aliases: don't replace simde_mm_loadu_epi*
GCC doesn't currently implement those functions. | @@ -19,7 +19,7 @@ if [ ! -e iig.xml ]; then
curl "https://software.intel.com/sites/landingpage/IntrinsicsGuide/files/data-${VERSION}.xml" > iig.xml
fi
-PATTERN="$(xmllint --xpath '//intrinsic/@name' iig.xml | grep -Po '(?<=")[^"]+' | xargs printf '%s|' | rev | cut -c 2- | rev)"
+PATTERN="$(xmllint --xpath '//intrinsic/@name' iig.xml | grep -Po '(?<=")[^"]+' | grep -Pv '^_mm512_loadu_epi' | xargs printf '%s|' | rev | cut -c 2- | rev)"
echo "s/([^_])simde(${PATTERN})/\1\2/g" > pattern
ls x86/*.c | xargs -n1 -P$(nproc) sed -i -E -f pattern
|
Fix accidental free caused by a merge earlier | @@ -304,9 +304,6 @@ coap_notify_observers(oc_resource_t *resource,
if (m) {
os_mbuf_free_chain(m);
}
- if (m) {
- os_mbuf_free_chain(m);
- }
return num_observers;
}
/*---------------------------------------------------------------------------*/
|
vcl: fix vlsh conversion error
vlsh may not belong to the current vcl worker.
Type: fix | @@ -967,9 +967,7 @@ assign_cert_key_pair (vls_handle_t vlsh)
return -1;
ckp_len = sizeof (ldp->ckpair_index);
- return vppcom_session_attr (vlsh_to_session_index (vlsh),
- VPPCOM_ATTR_SET_CKPAIR, &ldp->ckpair_index,
- &ckp_len);
+ return vls_attr (vlsh, VPPCOM_ATTR_SET_CKPAIR, &ldp->ckpair_index, &ckp_len);
}
int
|
flash_fp_mcu: Remove coachz driver gpio override hack
BRANCH=none
TEST=# Tested many times using flash_fp_mcu --hello | @@ -289,14 +289,6 @@ flash_fp_mcu_stm32() {
warn_gpio "${gpio_nrst}" 0 \
"WARNING: One of the drivers changed NRST pin state on bind attempt."
- # TODO(b/179530529): Remove this hack when the drivers on strongbad stop
- # setting the gpio states.
- if [[ "${PLATFORM_NAME}" == "strongbad" ]]; then
- echo "# Fixing GPIOs"
- gpio 1 "${gpio_boot0}"
- gpio 0 "${gpio_nrst}"
- fi
-
local attempt=0
local cmd_exit_status=1
local cmd="stm32mon ${stm32mon_flags}"
|
Fix some comments in fmgr.c
Oversight in
Author: Hou Zhijie
Discussion: | @@ -288,14 +288,11 @@ fmgr_symbol(Oid functionId, char **mod, char **fn)
Datum prosrcattr;
Datum probinattr;
- /* Otherwise we need the pg_proc entry */
procedureTuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(functionId));
if (!HeapTupleIsValid(procedureTuple))
elog(ERROR, "cache lookup failed for function %u", functionId);
procedureStruct = (Form_pg_proc) GETSTRUCT(procedureTuple);
- /*
- */
if (procedureStruct->prosecdef ||
!heap_attisnull(procedureTuple, Anum_pg_proc_proconfig, NULL) ||
FmgrHookIsNeeded(functionId))
|
Implement green color for console data received over the com port | @@ -42,7 +42,7 @@ static uint8_t initialized = 0;
DWORD thread_id;
HANDLE thread_handle;
static void uart_thread(void* param);
-HANDLE com_port; /*!< COM port handle */
+volatile HANDLE com_port; /*!< COM port handle */
uint8_t data_buffer[0x1000]; /*!< Received data array */
/**
@@ -144,9 +144,13 @@ uart_thread(void* param) {
do {
ReadFile(com_port, data_buffer, sizeof(data_buffer), &bytes_read, NULL);
if (bytes_read > 0) {
+ HANDLE hConsole;
+ hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+ SetConsoleTextAttribute(hConsole, FOREGROUND_GREEN);
for (DWORD i = 0; i < bytes_read; i++) {
printf("%c", data_buffer[i]);
}
+ SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
/* Send received data to input processing module */
#if ESP_CFG_INPUT_USE_PROCESS
|
DOC: TLS compression is disabled by default | @@ -460,7 +460,7 @@ B<SessionTicket>: session ticket support, enabled by default. Inverse of
B<SSL_OP_NO_TICKET>: that is B<-SessionTicket> is the same as setting
B<SSL_OP_NO_TICKET>.
-B<Compression>: SSL/TLS compression support, enabled by default. Inverse
+B<Compression>: SSL/TLS compression support, disabled by default. Inverse
of B<SSL_OP_NO_COMPRESSION>.
B<EmptyFragments>: use empty fragments as a countermeasure against a
|
web-ui: require yajl plugin via cmake | find_program (NPM_EXECUTABLE "npm")
+list (FIND REMOVED_PLUGINS "yajl" yajl_index)
+if (NOT yajl_index EQUAL -1)
+ remove_tool (${tool} "yajl plugin not available")
+else ()
+
if (NOT NPM_EXECUTABLE)
remove_tool (${tool} "dependency manager 'npm' not found")
else ()
@@ -45,3 +50,6 @@ else ()
generate_manpage (kdb-run-${tool} FILENAME ${CMAKE_CURRENT_BINARY_DIR}/README.md)
endif ()
+
+endif ()
+
|
fix cache plan when using auxiliary table | @@ -162,6 +162,11 @@ List *relation_remote_by_constraints(PlannerInfo *root, RelOptInfo *rel)
MemoryContextSwitchTo(old_mctx);
result = list_copy(result);
MemoryContextDelete(main_mctx);
+
+ /* when used auxiliary relation, don't cache plan */
+ if (context.hint)
+ root->glob->transientPlan = true;
+
return result;
}
|
platforms/romulus: Also support talos
The two are similar enough and I'd like to have a slot table for our
Talos.
Cc: Timothy Pearson | @@ -54,7 +54,8 @@ static const struct slot_table_entry romulus_phb_table[] = {
static bool romulus_probe(void)
{
- if (!dt_node_is_compatible(dt_root, "ibm,romulus"))
+ if (!dt_node_is_compatible(dt_root, "ibm,romulus") &&
+ !dt_node_is_compatible(dt_root, "rcs,talos"))
return false;
/* Lot of common early inits here */
|
dill: add scry endpoints for current line & cursor
This will let connecting clients get the rendering-relevant parts of the
current state of the session on demand. | ++ scry
|= {fur/(unit (set monk)) ren/@tas why/shop syd/desk lot/coin tyl/path}
^- (unit (unit cage))
- ?. ?=(%& -.why) ~
- =* his p.why
+ ::TODO don't special-case whey scry
+ ::
?: &(=(ren %$) =(tyl /whey))
=/ maz=(list mass)
:~ hey+&+hey.all
dug+&+dug.all
==
``mass+!>(maz)
- [~ ~]
+ :: only respond for the local identity, %$ desk, current timestamp
+ ::
+ ?. ?& =(&+our why)
+ =([%$ %da now] lot)
+ =(%$ syd)
+ ==
+ ~
+ :: /dx/sessions//line blit current line (prompt) of default session
+ :: /dx/sessions//cursor @ud current cursor position of default session
+ ::TODO support asking for specific sessions once session ids are real
+ ::
+ ?. ?=(%x ren) ~
+ ?+ tyl ~
+ [%sessions %$ *]
+ ?~ hey.all [~ ~]
+ ?~ session=(~(get by dug.all) u.hey.all) [~ ~]
+ ?+ t.t.tyl ~
+ [%line ~] ``blit+!>(`blit`see.u.session)
+ [%cursor ~] ``atom+!>(pos.u.session)
+ ==
+ ==
::
++ stay all
::
|
storage: on exit validate Chunk I/O context | @@ -284,8 +284,12 @@ void flb_storage_destroy(struct flb_config *ctx)
/* Destroy Chunk I/O context */
cio = (struct cio_ctx *) ctx->cio;
- cio_destroy(cio);
+ if (!cio) {
+ return;
+ }
+
+ cio_destroy(cio);
if (ctx->storage_bl_mem_limit) {
flb_free(ctx->storage_bl_mem_limit);
}
|
adding the ability to add streams to the pre-defined redis-benchmark tests
Added standard way to support xadd as one of the commands that can be run via redis-benchmarking tool | @@ -2030,6 +2030,12 @@ int main(int argc, char **argv) {
sdsfree(key_placeholder);
}
+ if (test_is_selected("xadd")) {
+ len = redisFormatCommand(&cmd,"XADD mystream%s * myfield %s", tag, data);
+ benchmark("XADD",cmd,len);
+ free(cmd);
+ }
+
if (!config.csv) printf("\n");
} while(config.loop);
|
fix error compile as pure C code by VS | @@ -64,11 +64,11 @@ static int luv_is_callable(lua_State* L, int index) {
}
static void luv_check_callable(lua_State* L, int index) {
+ const char *msg;
+ const char *typearg; /* name for the type of the actual argument */
if (luv_is_callable(L, index))
return;
- const char *msg;
- const char *typearg; /* name for the type of the actual argument */
if (luaL_getmetafield(L, index, "__name") == LUA_TSTRING)
typearg = lua_tostring(L, -1); /* use the given type name */
else if (lua_type(L, index) == LUA_TLIGHTUSERDATA)
|
[docsbuild plugin] attempt to support config for yfm builder | @@ -23,6 +23,9 @@ def macro_calls_to_dict(unit, calls):
unit.message(['error', 'Invalid variables specification "{}": value expected to be in form %name%=%value% (with no spaces)'.format(arg)])
return None
+ if kv[1] == 'true':
+ kv[1] = 'yes'
+
return kv
return dict(filter(None, map(split_args, calls)))
@@ -50,14 +53,19 @@ def generate_dart(unit, as_lib=False):
if build_tool not in ['mkdocs', 'yfm']:
unit.message(['error', 'Unsupported build tool {}'.format(build_tool)])
- docs_config = os.path.normpath(unit.get('DOCSCONFIG') or 'mkdocs.yml')
+ docs_config = unit.get('DOCSCONFIG')
+ if not docs_config:
+ docs_config = 'mkdocs.yml' if build_tool == 'mkdocs' else '.yfm'
+
+ docs_config = os.path.normpath(docs_config)
if os.path.sep not in docs_config:
- docs_config = os.path.join(module_dir, docs_config)
- elif not docs_config.startswith(docs_dir + os.path.sep):
+ docs_config = os.path.join(module_dir if build_tool == 'mkdocs' else docs_dir, docs_config)
+
+ if not docs_config.startswith(docs_dir + os.path.sep) and not docs_config.startswith(module_dir + os.path.sep) :
unit.message(['error', 'DOCS_CONFIG value "{}" is outside the project directory and DOCS_DIR'.format(docs_config)])
return
- if build_tool == 'mkdocs' and not os.path.exists(unit.resolve('$S/' + docs_config)):
+ if not os.path.exists(unit.resolve('$S/' + docs_config)):
unit.message(['error', 'DOCS_CONFIG value "{}" does not exist'.format(docs_config)])
return
|
Increased time for access point setup to 10 seconds | @@ -160,7 +160,7 @@ esp_ap_configure(const char* ssid, const char* pwd, uint8_t ch, esp_ecn_t ecn, u
ESP_MSG_VAR_REF(msg).msg.ap_conf.hid = hid;
ESP_MSG_VAR_REF(msg).msg.ap_conf.def = def;
- return espi_send_msg_to_producer_mbox(&ESP_MSG_VAR_REF(msg), espi_initiate_cmd, blocking, 1000); /* Send message to producer queue */
+ return espi_send_msg_to_producer_mbox(&ESP_MSG_VAR_REF(msg), espi_initiate_cmd, blocking, 10000); /* Send message to producer queue */
}
/**
|
remove redefinition 'mode_t' | @@ -25,8 +25,6 @@ typedef unsigned short u_short;
typedef unsigned int u_int;
typedef unsigned long u_long;
-typedef int mode_t;
-
typedef unsigned long clockid_t;
typedef int pid_t;
|
lpc11u35 - Invert led logic to match hardware
The lpc11u35 hdk, like the other hdks, has active low leds. This patch
updates the gpio driver to treat these leds as active low, so passing
in the value GPIO_LED_ON to gpio_set_*_led turns the led on rather
than off. | @@ -162,27 +162,27 @@ void gpio_init(void)
void gpio_set_hid_led(gpio_led_state_t state)
{
if (state) {
- LPC_GPIO->SET[PIN_DAP_LED_PORT] = PIN_DAP_LED;
- } else {
LPC_GPIO->CLR[PIN_DAP_LED_PORT] = PIN_DAP_LED;
+ } else {
+ LPC_GPIO->SET[PIN_DAP_LED_PORT] = PIN_DAP_LED;
}
}
void gpio_set_cdc_led(gpio_led_state_t state)
{
if (state) {
- LPC_GPIO->SET[PIN_CDC_LED_PORT] = PIN_CDC_LED;
- } else {
LPC_GPIO->CLR[PIN_CDC_LED_PORT] = PIN_CDC_LED;
+ } else {
+ LPC_GPIO->SET[PIN_CDC_LED_PORT] = PIN_CDC_LED;
}
}
void gpio_set_msc_led(gpio_led_state_t state)
{
if (state) {
- LPC_GPIO->SET[PIN_MSD_LED_PORT] = PIN_MSD_LED;
- } else {
LPC_GPIO->CLR[PIN_MSD_LED_PORT] = PIN_MSD_LED;
+ } else {
+ LPC_GPIO->SET[PIN_MSD_LED_PORT] = PIN_MSD_LED;
}
}
|
Examples: show catching specific exception | @@ -37,6 +37,8 @@ def example():
for key in keys:
try:
print(' %s: %s' % (key, codes_get(gid, key)))
+ except KeyValueNotFoundError as err:
+ print(' Key="%s" was not found: %s' % (key, err.msg))
except CodesInternalError as err:
print('Error with key="%s" : %s' % (key, err.msg))
|
Don't add default instrument when removing note | @@ -282,9 +282,8 @@ export const SongTracker = ({
editPatternCell("note")(
value === null ? null : value + octaveOffset * 12
);
- editPatternCell("instrument")(defaultInstrument);
-
if (value !== null) {
+ editPatternCell("instrument")(defaultInstrument);
setActiveField(activeField + ROW_SIZE * editStep);
}
};
|
clean up for mem_tg test | @@ -129,9 +129,6 @@ public:
tg_exe_->write32(tg_offset_+TG_ADDR_MODE_WR, /*TG_ADDR_INCR*/ 0x2);
tg_exe_->write32(tg_offset_+TG_ADDR_MODE_RD, /*TG_ADDR_INCR*/ 0x2);
- uint32_t rd = tg_exe_->read64(tg_offset_+TG_READ_COUNT);
-
- std::cout << "Rd=" << rd << std::endl;
return 0;
}
|
Support tunslip6 and serialdump with a single makefile | -all: tunslip6
+APPS = tunslip6 serialdump
+LIB_SRCS = tools-utils.c
+DEPEND = tools-utils.h
-CFLAGS += -Wall -Werror
+all: $(APPS)
-tunslip6: tools-utils.c tunslip6.c
+CFLAGS += -Wall -Werror -O2
+
+$(APPS) : % : %.c $(LIB_SRCS) $(DEPEND)
+ $(CC) $(CFLAGS) $< $(LIB_SRCS) -o $@
clean:
- rm -f *.o tunslip6
+ rm -f $(APPS)
|
Add assertions to _bt_update_posting().
Copy some assertions from _bt_form_posting() to its sibling function,
_bt_update_posting().
Discussion: | @@ -688,6 +688,9 @@ _bt_update_posting(BTVacuumPosting vacposting)
else
newsize = keysize;
+ Assert(newsize <= INDEX_SIZE_MASK);
+ Assert(newsize == MAXALIGN(newsize));
+
/* Allocate memory using palloc0() (matches index_form_tuple()) */
itup = palloc0(newsize);
memcpy(itup, origtuple, keysize);
@@ -721,6 +724,7 @@ _bt_update_posting(BTVacuumPosting vacposting)
Assert(ui == nhtids);
Assert(d == vacposting->ndeletedtids);
Assert(nhtids == 1 || _bt_posting_valid(itup));
+ Assert(nhtids > 1 || ItemPointerIsValid(&itup->t_tid));
/* vacposting arg's itup will now point to updated version */
vacposting->itup = itup;
|
arch/Kconfig : Add dependency for KREGIONx configs
CONFIG_KREGINOx_XXX configs are meaningful only when kernel heap is. | @@ -801,6 +801,7 @@ config RAM_REGIONx_HEAP_INDEX
config RAM_KREGIONx_START
string "An address or list of start address for kernel RAM region"
default "0x00000000,"
+ depends on MM_KERNEL_HEAP
---help---
The address or address list of the RAM regions.
If you want to use more than equal to two RAMs physically, or
@@ -815,6 +816,7 @@ config RAM_KREGIONx_START
config RAM_KREGIONx_SIZE
string "A size or list of size for kernel RAM region"
default "0,"
+ depends on MM_KERNEL_HEAP
---help---
The size list of RAM region.
Refer RAM_KREGIONx_START content. One different thing is this has
|
jn516x example: compute sample_count on current timeslot timings rather than defaults | @@ -194,7 +194,7 @@ PROCESS_THREAD(node_process, ev, data)
if (host_found) {
/* Make sample count dependent on asn. After a disconnect, waveforms remain
synchronous. Use node_mac to create phase offset between waveforms in different nodes */
- sample_count = ((tsch_current_asn.ls4b/((1000/(TSCH_CONF_DEFAULT_TIMESLOT_LENGTH/1000)))/INTERVAL)+node_mac[7]) % (SIZE_OF_WAVEFORM-1);
+ sample_count = ((tsch_current_asn.ls4b/((1000/(tsch_timing_us[tsch_ts_timeslot_length]/1000)))/INTERVAL)+node_mac[7]) % (SIZE_OF_WAVEFORM-1);
printf("%d sec. waveform=%s. cnt=%d. value=%d\n", total_time, waveform_table[selected_waveform].str, sample_count, waveform_table[selected_waveform].table[sample_count]);
my_sprintf(udp_buf, waveform_table[selected_waveform].table[sample_count]);
uip_udp_packet_send(udp_conn_tx, udp_buf, strlen(udp_buf));
|
Wakeup: Early ROSC to ~48MHz.
Speed up MicroPython Pico W startup to init_priority(101) execution from ~160ms to ~32ms. | @@ -63,21 +63,28 @@ index 70dd3bb..b8c1ed0 100644
// (basically anything in aeabi that uses bootrom)
diff --git a/src/rp2_common/pico_standard_link/crt0.S b/src/rp2_common/pico_standard_link/crt0.S
-index b2992f6..80367da 100644
+index b2992f6..6091e70 100644
--- a/src/rp2_common/pico_standard_link/crt0.S
+++ b/src/rp2_common/pico_standard_link/crt0.S
-@@ -9,6 +9,7 @@
+@@ -9,6 +9,8 @@
#include "hardware/regs/addressmap.h"
#include "hardware/regs/sio.h"
#include "pico/binary_info/defs.h"
+#include "hardware/regs/resets.h"
++#include "hardware/regs/rosc.h"
#ifdef NDEBUG
#ifndef COLLAPSE_IRQS
-@@ -225,6 +226,17 @@ _reset_handler:
+@@ -225,6 +227,23 @@ _reset_handler:
cmp r0, #0
bne hold_non_core0_in_bootrom
++ // Increase ROSC frequency to ~48MHz (range 14.4 - 96)
++ // Startup drops from ~160ms to ~32ms on Pico W MicroPython
++ ldr r0, =(ROSC_BASE + ROSC_DIV_OFFSET)
++ ldr r1, =0xaa2
++ str r1, [r0]
++
+ ldr r1, =runtime_reset_peripherals
+ blx r1
+
@@ -92,7 +99,7 @@ index b2992f6..80367da 100644
// In a NO_FLASH binary, don't perform .data copy, since it's loaded
// in-place by the SRAM load. Still need to clear .bss
#if !PICO_NO_FLASH
-@@ -251,6 +263,10 @@ bss_fill_test:
+@@ -251,6 +270,10 @@ bss_fill_test:
cmp r1, r2
bne bss_fill_loop
@@ -103,7 +110,7 @@ index b2992f6..80367da 100644
platform_entry: // symbol for stack traces
// Use 32-bit jumps, in case these symbols are moved out of branch range
// (e.g. if main is in SRAM and crt0 in flash)
-@@ -314,6 +330,19 @@ data_cpy_table:
+@@ -314,6 +337,19 @@ data_cpy_table:
runtime_init:
bx lr
@@ -123,7 +130,7 @@ index b2992f6..80367da 100644
// ----------------------------------------------------------------------------
// If core 1 somehow gets into crt0 due to a spectacular VTOR mishap, we need to
// catch it and send back to the sleep-and-launch code in the bootrom. Shouldn't
-@@ -345,3 +374,9 @@ __get_current_exception:
+@@ -345,3 +381,9 @@ __get_current_exception:
.align 2
.equ HeapSize, PICO_HEAP_SIZE
.space HeapSize
|
Fix typo in doc.pl command-line help. | @@ -64,7 +64,7 @@ doc.pl [options]
--cache-only Only use the execution cache - don't attempt to generate it
--pre Pre-build containers for execute elements marked pre
--var Override defined variable
- --var-key Override defined variable and use in cache key
+ --key-var Override defined variable and use in cache key
--doc-path Document path to render (manifest.xml should be located here)
--out Output types (html, pdf, markdown)
--require Require only certain sections of the document (to speed testing)
|
RTOS2: typo correction in cmsis_os2.h | /*
- * Copyright (c) 2013-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2013-2020 Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
*
* ----------------------------------------------------------------------
*
- * $Date: 18. June 2018
+ * $Date: 30. April 2020
* $Revision: V2.1.3
*
* Project: CMSIS-RTOS2 API
@@ -86,7 +86,7 @@ typedef enum {
osKernelLocked = 3, ///< Locked.
osKernelSuspended = 4, ///< Suspended.
osKernelError = -1, ///< Error.
- osKernelReserved = 0x7FFFFFFFU ///< Prevents enum down-size compiler optimization.
+ osKernelReserved = 0x7FFFFFFF ///< Prevents enum down-size compiler optimization.
} osKernelState_t;
/// Thread state.
|
Consider the domain of the splines in assert_equal_shape. | @@ -54,7 +54,7 @@ void
assert_equal_shape_eps(CuTest *tc, tsBSpline *s1, tsBSpline *s2, tsReal eps)
{
tsDeBoorNet net = ts_deboornet_init();
- tsReal *s1val = NULL, *s2val = NULL, dist;
+ tsReal min, max, knot, dist, *s1val = NULL, *s2val = NULL;
size_t k, dim;
tsStatus status;
@@ -66,17 +66,21 @@ assert_equal_shape_eps(CuTest *tc, tsBSpline *s1, tsBSpline *s2, tsReal eps)
TS_TRY(try, status.code, &status)
for (k = 0; k < TS_MAX_NUM_KNOTS; k++) {
/* Eval s1. */
+ ts_bspline_domain(s1, &min, &max);
+ knot = (tsReal)k / TS_MAX_NUM_KNOTS;
+ knot = ( (max - min) * knot ) + min;
TS_CALL(try, status.code, ts_bspline_eval(
- s1, (tsReal)k / TS_MAX_NUM_KNOTS, &net,
- &status))
+ s1, knot, &net, &status))
TS_CALL(try, status.code, ts_deboornet_result(
&net, &s1val, &status))
ts_deboornet_free(&net);
/* Eval s2. */
+ ts_bspline_domain(s2, &min, &max);
+ knot = (tsReal)k / TS_MAX_NUM_KNOTS;
+ knot = ( (max - min) * knot ) + min;
TS_CALL(try, status.code, ts_bspline_eval(
- s2, (tsReal)k / TS_MAX_NUM_KNOTS, &net,
- &status))
+ s2, knot, &net, &status))
TS_CALL(try, status.code, ts_deboornet_result(
&net, &s2val, &status))
ts_deboornet_free(&net);
|
refactor (docs, rng): Clarify RNG usage | @@ -13,16 +13,21 @@ extern "C" {
#endif
/**
- * @brief Enable an entropy source for RNG if RF is disabled
+ * @brief Enable an entropy source for RNG if RF subsystem is disabled
+ *
+ * @warning This function is not safe to use if any other subsystem is accessing the RF subsystem or
+ * the ADC at the same time!
*
* The exact internal entropy source mechanism depends on the chip in use but
* all SoCs use the SAR ADC to continuously mix random bits (an internal
* noise reading) into the HWRNG. Consult the SoC Technical Reference
* Manual for more information.
*
- * Can also be used from app code early during operation, if true
- * random numbers are required before RF is initialised. Consult
- * ESP-IDF Programming Guide "Random Number Generation" section for
+ * Can also be called from app code, if true random numbers are required without initialized RF subsystem.
+ * This might be the case in early startup code of the application when the RF subsystem has not
+ * started yet or if the RF subsystem should not be enabled for power saving.
+ *
+ * Consult ESP-IDF Programming Guide "Random Number Generation" section for
* details.
*/
void bootloader_random_enable(void);
@@ -31,7 +36,7 @@ void bootloader_random_enable(void);
* @brief Disable entropy source for RNG
*
* Disables internal entropy source. Must be called after
- * bootloader_random_enable() and before RF features, ADC, or
+ * bootloader_random_enable() and before RF subsystem features, ADC, or
* I2S (ESP32 only) are initialized.
*
* Consult the ESP-IDF Programming Guide "Random Number Generation"
|
RAND: ensure INT32_MAX is defined
This value is used to set DRBG_MAX_LENGTH | # include <openssl/ec.h>
# include <openssl/rand_drbg.h>
+# include "internal/numbers.h"
+
/* How many times to read the TSC as a randomness source. */
# define TSC_READ_COUNT 4
|
mesh: Fix model tree walk procedure
`bt_mesh_model_tree_walk()` was too simplistic and did not track visited
nodes which caused it to fall into infinite loop. Moreover the double
next jump could skip a level causing depth value to be invalid.
this is port of | @@ -804,23 +804,31 @@ void bt_mesh_model_tree_walk(struct bt_mesh_model *root,
{
struct bt_mesh_model *m = root;
uint32_t depth = 0;
+ /* 'skip' is set to true when we ascend from child to parent node.
+ * In that case, we want to skip calling the callback on the parent
+ * node and we don't want to descend onto a child node as those
+ * nodes have already been visited.
+ */
+ bool skip = false;
do {
- if (cb(m, depth, user_data) == BT_MESH_WALK_STOP) {
+ if (!skip && cb(m, depth, user_data) == BT_MESH_WALK_STOP) {
return;
}
#if MYNEWT_VAL(BLE_MESH_MODEL_EXTENSIONS)
- if (m->extends) {
+ if (!skip && m->extends) {
m = m->extends;
depth++;
} else if (m->flags & BT_MESH_MOD_NEXT_IS_PARENT) {
- m = m->next->next;
+ m = m->next;
depth--;
+ skip = true;
} else {
m = m->next;
+ skip = false;
}
#endif
- } while (m && m != root);
+ } while (m);
}
#if MYNEWT_VAL(BLE_MESH_MODEL_EXTENSIONS)
|
Describe 0.11.1 release | # Themis ChangeLog
+## [0.11.1](https://github.com/cossacklabs/themis/releases/tag/0.11.1), April 1st 2019
+
+**TL;DR:** Rust-Themis can now be installed entirely from packages (repositories and crates.io), without building anything from source.
+
+_Code:_
+
+- **Rust**
+
+ - Improvements in lookup of core Themis library ([#444](https://github.com/cossacklabs/themis/pull/444))
+
+ - Minor changes in dependencies ([#443](https://github.com/cossacklabs/themis/pull/443))
+
+_Infrastructure:_
+
+- Minor fixes in packaging process ([#442](https://github.com/cossacklabs/themis/pull/442))
+
## [0.11.0](https://github.com/cossacklabs/themis/releases/tag/0.11.0), March 28th 2019
|
fix(jpg): swap high and low bytes when macro LV_COLOR_16_SWAP is 1 | @@ -766,7 +766,7 @@ static lv_res_t decoder_read_line(lv_img_decoder_t * decoder, lv_img_decoder_dsc
uint16_t col_16bit = (*cache++ & 0xf8) << 8;
col_16bit |= (*cache++ & 0xFC) << 3;
col_16bit |= (*cache++ >> 3);
-#if LV_BIG_ENDIAN_SYSTEM == 1
+#if LV_BIG_ENDIAN_SYSTEM == 1 || LV_COLOR_16_SWAP == 1
buf[offset++] = col_16bit >> 8;
buf[offset++] = col_16bit & 0xff;
#else
@@ -830,7 +830,7 @@ static lv_res_t decoder_read_line(lv_img_decoder_t * decoder, lv_img_decoder_dsc
uint16_t col_8bit = (*cache++ & 0xf8) << 8;
col_8bit |= (*cache++ & 0xFC) << 3;
col_8bit |= (*cache++ >> 3);
-#if LV_BIG_ENDIAN_SYSTEM == 1
+#if LV_BIG_ENDIAN_SYSTEM == 1 || LV_COLOR_16_SWAP == 1
buf[offset++] = col_8bit >> 8;
buf[offset++] = col_8bit & 0xff;
#else
|
config: restore FEATURES on the basic tab
A previous PR incorectly removed the hypervisor FEATURES options on the
basic tab because all options were advanced. One wasn't (IVSHMEM). | @@ -256,7 +256,7 @@ These settings can only be changed at build time.</xs:documentation>
<xs:complexType name="HVConfigType">
<xs:all>
<xs:element name="FEATURES" type="FeatureOptionsType">
- <xs:annotation acrn:title="Hypervisor features" acrn:views="advanced">
+ <xs:annotation acrn:title="Hypervisor features" acrn:views="basic, advanced">
<xs:documentation>Enable hypervisor features.</xs:documentation>
</xs:annotation>
</xs:element>
|
fix spinner audio | @@ -10,8 +10,8 @@ class HitsoundManager:
self.timingpoint = beatmap.timing_point
self.timingpoint_index = 0
self.spincooldown = 0
- self.prevspin = None
- self.prevbonusscore = None
+ self.prevspin = {}
+ self.prevbonusscore = {}
self.breakperiod_i = 0
self.sectionadded = False
@@ -95,13 +95,16 @@ class HitsoundManager:
objectindex = my_info[index].id
my_dict = self.hitobjects[objectindex]
+ prevspin = self.prevspin.get(my_dict["id"], None)
+ prevbonusscore = self.prevbonusscore.get(my_dict["id"], None)
+
if self.spincooldown < my_info[index].time < my_dict["end time"] - 1000 and my_info[index].time > my_dict["time"] + 1000:
- if self.prevspin is None or self.prevspin.progress != my_info[index].more.progress:
+ if prevspin is None or prevspin.progress != my_info[index].more.progress:
spinsound = int(min(1, my_info[index].more.progress) * (len(Hitsound.spinnerspin)-1))
overlay(my_info[index].time, song, Hitsound.spinnerspin[spinsound])
self.spincooldown = my_info[index].time + len(Hitsound.spinnerspin[spinsound].audio)/Hitsound.spinnerspin[spinsound].rate * 1000 + 100
- self.prevspin = my_info[index].more
+ self.prevspin[my_dict["id"]] = my_info[index].more
- if self.prevbonusscore != my_info[index].more.bonusscore and my_info[index].more.bonusscore > 0:
+ if prevbonusscore != my_info[index].more.bonusscore and my_info[index].more.bonusscore > 0:
overlay(my_info[index].time, song, Hitsound.spinnerbonus)
- self.prevbonusscore = my_info[index].more.bonusscore
+ self.prevbonusscore[my_dict["id"]] = my_info[index].more.bonusscore
|
fix: replace BoatIotSdkDeInit(); with BoatFree(); in test_002InitWallet_0007SetNodeUrlFailureErrorNodeUrlFormat
fix the issue aitos-io#1050 | @@ -692,7 +692,7 @@ START_TEST(test_002InitWallet_0007SetNodeUrlFailureErrorNodeUrlFormat)
/* 2-2. verify the global variables that be affected */
ck_assert(wallet_ptr->network_info.node_url_ptr == NULL);
- BoatIotSdkDeInit();
+ BoatFree(wallet_ptr);
}
END_TEST
|
system/i2c/i2c_main.c: fix a backward comparison. Noted by Jakob Haufe. | @@ -365,7 +365,7 @@ int i2c_main(int argc, char *argv[])
g_i2ctool.addr = CONFIG_I2CTOOL_MINADDR;
}
- if (g_i2ctool.regaddr < CONFIG_I2CTOOL_MAXREGADDR)
+ if (g_i2ctool.regaddr > CONFIG_I2CTOOL_MAXREGADDR)
{
g_i2ctool.regaddr = 0;
}
|
py/objdict: Reword TODO about inlining mp_obj_dict_get to a note. | @@ -160,7 +160,7 @@ STATIC mp_obj_t dict_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_
}
}
-// TODO: Make sure this is inlined in dict_subscr() below.
+// Note: Make sure this is inlined in load part of dict_subscr() below.
mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index) {
mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP);
|
webp_js/README.md,cosmetics: reflow some lines
after:
Update wasm instructions. | @@ -49,11 +49,11 @@ and then navigate to http://localhost:8080 in your favorite browser.
CMakeLists.txt is configured to build the WASM version when using the option
WEBP_BUILD_WEBP_JS=ON. The compilation step will assemble the files
-'webp_wasm.js' and 'webp_wasm.wasm' that you then need to copy to the
-webp_js/ directory.
+'webp_wasm.js' and 'webp_wasm.wasm' that you then need to copy to the webp_js/
+directory.
-See webp_js/index_wasm.html for a simple demo page using the WASM version of
-the library.
+See webp_js/index_wasm.html for a simple demo page using the WASM version of the
+library.
You will need a fairly recent version of Emscripten (at least 2.0.18,
latest-upstream is recommended) and of your WASM-enabled browser to run this
|
Fix incorrect last_joy value on game start causing initial movement when no input is pressed since GBDK2020v4 | #include "ScriptRunner.h"
UBYTE joy = 0;
-UBYTE last_joy;
-UBYTE recent_joy;
-UBYTE await_input;
+UBYTE last_joy = 0;
+UBYTE recent_joy = 0;
+UBYTE await_input = 0;
UBYTE input_wait = 0;
BankPtr input_script_ptrs[NUM_INPUTS];
UBYTE input_script_persist = 0;
|
[chainmaker][#436]modify test chain_id and org_id | @@ -70,13 +70,13 @@ static BOAT_RESULT param_init_check(BoatHlchainmakerTx* tx_ptr)
return BOAT_ERROR;
}
- result = strncmp(tx_ptr->client_para.chain_id, TEST_CHAINMAKER_CHAIN_ID, strlen(TEST_CHAINMAKER_CHAIN_ID));
+ result = strncmp(tx_ptr->wallet_ptr->node_info.chain_id_info, TEST_CHAINMAKER_CHAIN_ID, strlen(TEST_CHAINMAKER_CHAIN_ID));
if (result != 0)
{
return BOAT_ERROR;
}
- result = strncmp(tx_ptr->client_para.org_id, TEST_CHAINMAKER_ORG_ID, strlen(TEST_CHAINMAKER_ORG_ID));
+ result = strncmp(tx_ptr->wallet_ptr->node_info.org_id_info, TEST_CHAINMAKER_ORG_ID, strlen(TEST_CHAINMAKER_ORG_ID));
if (result != 0)
{
return BOAT_ERROR;
|
adding libpthread pthread_mutexattr_setpshared | @@ -88,7 +88,7 @@ GO(__pthread_mutexattr_init, iFp)
GO(pthread_mutexattr_init, iFp)
// pthread_mutexattr_setprioceiling
// pthread_mutexattr_setprotocol
-// pthread_mutexattr_setpshared
+GO(pthread_mutexattr_setpshared, iFpi)
// pthread_mutexattr_setrobust_np
GO(__pthread_mutexattr_settype, iFpi)
GO(pthread_mutexattr_settype, iFpi)
|
Minor refectoring of refinement.c | @@ -119,8 +119,7 @@ static int search_equivalent_atom(const int atom_index,
const Symmetry *symmetry,
const double symprec);
static Symmetry *
-recover_symmetry_in_original_cell(const int frame[3],
- const Symmetry *prim_sym,
+recover_symmetry_in_original_cell(const Symmetry *prim_sym,
SPGCONST int t_mat[3][3],
SPGCONST double lattice[3][3],
const int multiplicity,
@@ -792,7 +791,6 @@ get_refined_symmetry_operations(const Cell * cell,
const double symprec)
{
int t_mat_int[3][3];
- int frame[3];
double inv_prim_lat[3][3], t_mat[3][3];
Symmetry *conv_sym, *prim_sym, *symmetry;
@@ -823,10 +821,8 @@ get_refined_symmetry_operations(const Cell * cell,
/* Input cell symmetry from primitive symmetry */
mat_multiply_matrix_d3(t_mat, inv_prim_lat, cell->lattice);
mat_cast_matrix_3d_to_3i(t_mat_int, t_mat);
- get_surrounding_frame(frame, t_mat_int);
- symmetry = recover_symmetry_in_original_cell(frame,
- prim_sym,
+ symmetry = recover_symmetry_in_original_cell(prim_sym,
t_mat_int,
cell->lattice,
cell->size / primitive->size,
@@ -1070,14 +1066,14 @@ static void get_corners(int corners[3][8],
}
static Symmetry *
-recover_symmetry_in_original_cell(const int frame[3],
- const Symmetry *prim_sym,
+recover_symmetry_in_original_cell(const Symmetry *prim_sym,
SPGCONST int t_mat[3][3],
SPGCONST double lattice[3][3],
const int multiplicity,
const double symprec)
{
Symmetry *symmetry, *t_sym;
+ int frame[3];
double inv_tmat[3][3], tmp_mat[3][3];
VecDBL *pure_trans, *lattice_trans;
@@ -1086,6 +1082,7 @@ recover_symmetry_in_original_cell(const int frame[3],
pure_trans = NULL;
lattice_trans = NULL;
+ get_surrounding_frame(frame, t_mat);
mat_cast_matrix_3i_to_3d(tmp_mat, t_mat);
mat_inverse_matrix_d3(inv_tmat, tmp_mat, 0);
|
fixed a small issue with delayed update | @@ -1736,7 +1736,9 @@ static u16 updateFrame(Sprite* sprite, u16 status)
if ((status & (SPR_FLAG_AUTO_TILE_UPLOAD | SPR_FLAG_DISABLE_DELAYED_FRAME_UPDATE)) == SPR_FLAG_AUTO_TILE_UPLOAD)
{
// not enough DMA capacity to transfer sprite tile data ?
- if ((DMA_getQueueTransferSize() + (frame->tileset->numTile * 32)) > DMA_getMaxTransferSize())
+ const u16 dmaCapacity = DMA_getMaxTransferSize();
+
+ if (dmaCapacity && (DMA_getQueueTransferSize() + (frame->tileset->numTile * 32)) > dmaCapacity)
{
#if (LIB_DEBUG != 0)
KLog_U3_("Warning: sprite #", getSpriteIndex(sprite), " update delayed (exceeding DMA capacity: ", DMA_getQueueTransferSize(), " bytes already queued and require ", frame->tileset->numTile * 32, " more bytes)");
|
Handle esp_tls_conn_read disconnection in ssl_read. Fixes
Closes | @@ -130,6 +130,9 @@ static int ssl_read(esp_transport_handle_t t, char *buffer, int len, int timeout
if (ret < 0) {
ESP_LOGE(TAG, "esp_tls_conn_read error, errno=%s", strerror(errno));
}
+ if (ret == 0) {
+ ret = -1;
+ }
return ret;
}
|
luci-app-cpufreq: fix governor setting | @@ -37,7 +37,7 @@ for _, policy_num in ipairs(string.split(policy_nums, " ")) do
governor = s:taboption(policy_num, ListValue, "governor" .. policy_num, translate("CPU Scaling Governor"))
for _, e in ipairs(governor_array) do
- if e ~= "" then governor:value(translate(e,string.upper(e))) end
+ if e ~= "" then governor:value(e, translate(e, string.upper(e))) end
end
minfreq = s:taboption(policy_num, ListValue, "minfreq" .. policy_num, translate("Min Idle CPU Freq"))
|
web: fix micro -> patch version field rename | @@ -31,11 +31,11 @@ getVersions()
error(`are you sure you have libelektra and kdb installed?`);
process.exit(1);
} else {
- const { major, minor, micro } = versions.elektra;
- const versionSupported = major >= 0 && minor >= 9 && micro >= 0;
+ const { major, minor, patch } = versions.elektra;
+ const versionSupported = major >= 0 && minor >= 9 && patch >= 0;
if (!versionSupported) {
error(
- `you are running an old libelektra version, which is not supported`
+ `you are running an old libelektra version ${major}.${minor}.${patch}, which is not supported`
);
error(`please upgrade to libelektra 0.9.0 or higher`);
process.exit(1);
|
modpupdevices: experimental scaling of rgb
fw size +84 | @@ -156,8 +156,16 @@ ColorAndDistSensor
STATIC mp_obj_t pupdevices_ColorAndDistSensor_rgb(mp_obj_t self_in) {
pupdevices_ColorAndDistSensor_obj_t *self = MP_OBJ_TO_PTR(self_in);
pb_assert(pb_iodevice_set_mode(self->port, 6));
- // TODO: Scale each value to 0-100. Values for red should match reflection mode exactly, scale blue and green in similar fashion.
- return pb_iodevice_get_values(self->port);
+ pbio_iodev_t *iodev;
+ uint8_t *data;
+ pb_assert(pbdrv_ioport_get_iodev(self->port, &iodev));
+ pb_assert(pbio_iodev_get_raw_values(iodev, &data));
+ mp_obj_t rgb[3];
+ for (uint8_t col = 0; col < 3; col++) {
+ int16_t intensity = ((*(int16_t *)(data + col * 2))*10)/44;
+ rgb[col] = mp_obj_new_int(intensity < 100 ? intensity : 100);
+ }
+ return mp_obj_new_tuple(3, rgb);
}
MP_DEFINE_CONST_FUN_OBJ_1(pupdevices_ColorAndDistSensor_rgb_obj, pupdevices_ColorAndDistSensor_rgb);
|
process: fix wrong variable | @@ -209,7 +209,7 @@ int elektraProcessGet (Plugin * handle, KeySet * returned, Key * parentKey)
elektraInvoke2Args (contractHandle, "get", pluginContract, pluginParentKey);
elektraInvokeClose (contractHandle, pluginParentKey);
keyDel (pluginParentKey);
- if (ksGetSize (contract) == 0)
+ if (ksGetSize (pluginContract) == 0)
{
ELEKTRA_SET_ERRORF (197, parentKey, "Failed to get the contract for %s", keyString (pluginName));
ksDel (pluginContract);
|
Initializing local buffer ctx_impl field for correct release.
Uninitialized ctx_impl field may cause crash in application process.
To reproduce the issue, need to trigger shared memory buffer send error on
application side. In our case, send error caused by router process crash.
This issue was introduced in | @@ -3207,6 +3207,7 @@ nxt_unit_get_outgoing_buf(nxt_unit_ctx_t *ctx, nxt_unit_process_t *process,
mmap_buf->port_id = *port_id;
mmap_buf->process = process;
mmap_buf->free_ptr = NULL;
+ mmap_buf->ctx_impl = nxt_container_of(ctx, nxt_unit_ctx_impl_t, ctx);
nxt_unit_debug(ctx, "outgoing mmap allocation: (%d,%d,%d)",
(int) hdr->id, (int) c,
|
Fixed Build menu label missing ampersand | @@ -88,7 +88,7 @@ const template = [
}
},
{
- label: "Build & Run", accelerator: "CommandOrControl+6", click: () => {
+ label: "Build && Run", accelerator: "CommandOrControl+6", click: () => {
notifyListeners("section", "build");
}
},
|
upstream: on connection close, invalidate context | @@ -322,6 +322,8 @@ static int prepare_destroy_conn(struct flb_upstream_conn *u_conn)
if (u_conn->fd > 0) {
flb_socket_close(u_conn->fd);
+ u_conn->fd = -1;
+ u_conn->event.fd = -1;
}
/* remove connection from the queue */
|
[io] add the option to set the color of bodies when fixed color is used | @@ -137,8 +137,8 @@ class VViewOptions(object):
do not use vtk depth peeling
--maximum-number-of-peels= value
maximum number of peels when depth peeling is on
- --occlusion-ration= value
- occlusion-ration when depth peeling is on
+ --occlusion-ratio= value
+ occlusion-ratio when depth peeling is on
--normalcone-ratio = value (default : 1.0 )
introduce a ratio between the representation of the contact
forces arrows the normal cone and the contact points. useful
@@ -165,12 +165,12 @@ class VViewOptions(object):
avatars: view only avatar if an avatar is defined (for each
object) contactors: ignore avatars, view only contactors where
avatars are contactors with collision_group=-1
- --with_edges
+ --with-edges
add edges in the rendering (experimental for primitives)
- --with_fixed_color
+ --with-fixed-color
use fixed color defined in the config file
- --depth-2d
- fix depth for 2D objects
+ --depth-2d=<value>
+ specify a depth for 2D objects
--verbose=<int verbose_level>
""")
@@ -1871,15 +1871,17 @@ class VView(object):
actor = vtk.vtkActor()
if self.opts.with_edges:
actor_edge = vtk.vtkActor()
+
if instance.attrs.get('mass', 0) > 0:
# objects that may move
self.dynamic_actors[instid].append((actor, contact_shape_indx,
collision_group))
actor.GetProperty().SetOpacity(
self.config.get('dynamic_opacity', 0.7))
- actor.GetProperty().SetColor(
- self.config.get('dynamic_bodies_color', [0.3,0.3,0.3]))
+ actor.GetProperty().SetColor(
+ instance.attrs.get('color',
+ self.config.get('dynamic_bodies_color', [0.3,0.3,0.3])))
if self.opts.with_edges:
self.dynamic_actors[instid].append((actor_edge, contact_shape_indx,
collision_group))
@@ -1892,10 +1894,10 @@ class VView(object):
self.static_actors[instid].append((actor, contact_shape_indx,
collision_group))
actor.GetProperty().SetOpacity(
-
self.config.get('static_opacity', 1.0))
actor.GetProperty().SetColor(
- self.config.get('static_bodies_color', [0.5,0.5,0.5]))
+ instance.attrs.get('color',
+ self.config.get('static_bodies_color', [0.5,0.5,0.5])))
if self.opts.with_random_color :
actor.GetProperty().SetColor(random_color())
|
modcustomdevices: handle uart zero length read
When no data is requested, perform no i/o and just return an empty byte array.
This way, the following won't fail in case there is no pending data:
>>> uart = UARTDevice(ev3.Port.S2, 115200, 3000)
>>> uart.read(uart.waiting()) | @@ -370,6 +370,12 @@ STATIC mp_obj_t customdevices_UARTDevice_read(size_t n_args, const mp_obj_t *pos
pb_assert(PBIO_ERROR_INVALID_ARG);
}
+ // If we don't need to read anything, return empty bytearray
+ if (len < 1) {
+ uint8_t none = 0;
+ return mp_obj_new_bytes(&none, 0);
+ }
+
// Read data into buffer
uint8_t *buf = m_malloc(len);
if (buf == NULL) {
|
Fix Makefile arguments passed to MicroPython.
* In addition to the CFLAGS passed to control modules mpconfigport.h, the
Makefile needs its own arguments to enable/disable built-in modules.
* Fix the way arguments are passed to MicroPython's Makefile, so that it's
possible to enable/disable compiling code from the top level OpenMV board Makefile. | @@ -68,6 +68,7 @@ OMV_QSTR_DEFS = $(TOP_DIR)/$(OMV_DIR)/py/qstrdefsomv.h
ifeq ($(DEBUG), 1)
CFLAGS += -O0 -ggdb3
else
+DEBUG=0
CFLAGS += -O2 -ggdb3 -DNDEBUG
endif
@@ -117,11 +118,21 @@ MP_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/
MP_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/usbdev/core/inc/
MP_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/usbdev/class/inc/
MP_CFLAGS += -I$(MP_BOARD_CONFIG_DIR)
+
+# In addition to CFLAGS, the following options are needed to set varilables
+# in MicroPython's Makefile, to enable or disable compiling additional modules.
+MICROPY_ARGS = BOARD=$(TARGET) DEBUG=$(DEBUG) QSTR_DEFS="$(OMV_QSTR_DEFS)"
ifeq ($(MICROPY_PY_WINC1500), 1)
MP_CFLAGS += -DMICROPY_PY_WINC1500=1
+MICROPY_ARGS += MICROPY_PY_WINC1500=1
endif
ifeq ($(MICROPY_PY_IMU), 1)
MP_CFLAGS += -DMICROPY_PY_IMU=1
+MICROPY_ARGS += MICROPY_PY_IMU=1
+endif
+ifeq ($(MICROPY_PY_ULAB), 1)
+MP_CFLAGS += -DMICROPY_PY_ULAB=1
+MICROPY_ARGS += MICROPY_PY_ULAB=1
endif
OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/
@@ -588,7 +599,7 @@ $(FW_DIR):
FIRMWARE_OBJS: | $(BUILD) $(FW_DIR)
$(MAKE) -C $(CMSIS_DIR) BUILD=$(BUILD)/$(CMSIS_DIR) CFLAGS="$(CFLAGS) -fno-strict-aliasing -MMD"
$(MAKE) -C $(STHAL_DIR) BUILD=$(BUILD)/$(STHAL_DIR) CFLAGS="$(CFLAGS) -MMD"
- $(MAKE) -C $(MICROPY_DIR)/ports/stm32 BUILD=$(BUILD)/$(MICROPY_DIR) BOARD=$(TARGET) DEBUG=$(DEBUG) QSTR_DEFS="$(OMV_QSTR_DEFS)"
+ $(MAKE) -C $(MICROPY_DIR)/ports/stm32 BUILD=$(BUILD)/$(MICROPY_DIR) $(MICROPY_ARGS)
$(MAKE) -C $(LEPTON_DIR) BUILD=$(BUILD)/$(LEPTON_DIR) CFLAGS="$(CFLAGS) -MMD"
$(MAKE) -C $(MLX_DIR) BUILD=$(BUILD)/$(MLX_DIR) CFLAGS="$(CFLAGS) -MMD"
ifeq ($(MICROPY_PY_IMU), 1)
|
modupdater in releases | @@ -11,6 +11,9 @@ if errorlevel 1 (
SET dll=!filepath:.ual=.dll!
ECHO !dll!
copy "..\..\Ultimate-ASI-Loader\bin\x86\Release\dinput8.dll" !dll!
+ SET "mu=%%~dpF\scripts\modupdater.asi"
+ ECHO !mu!
+ copy "..\..\modupdater\bin\Release\modupdater.asi" !mu!
)
)
|
hv: destroy IOMMU domain after vpci_cleanup()
In partition mode, unassign_iommu_device() is called from vpci_cleanup(),
so when shutdown_vm() is called, unassign_iommu_device() could fail because
of "domain id mismatch" and DMAR is not cleared.
Also move destroy_ept() after the call to destroy_iommu_domain().
Acked-by: Eddie Dong | @@ -449,18 +449,19 @@ int32_t shutdown_vm(struct acrn_vm *vm)
ptdev_release_all_entries(vm);
- /* Free EPT allocated resources assigned to VM */
- destroy_ept(vm);
+ vpci_cleanup(vm);
/* Free iommu */
if (vm->iommu != NULL) {
destroy_iommu_domain(vm->iommu);
}
+ /* Free EPT allocated resources assigned to VM */
+ destroy_ept(vm);
+
/* Free vm id */
free_vm_id(vm);
- vpci_cleanup(vm);
ret = 0;
} else {
ret = -EINVAL;
|
usb: gurad 4way related functions | @@ -214,6 +214,7 @@ void get_quic(uint8_t *data, uint32_t len) {
break;
}
#endif
+#ifdef USE_SERIAL_4WAY_BLHELI_INTERFACE
case QUIC_VAL_BLHEL_SETTINGS: {
send_quic(QUIC_CMD_GET, QUIC_FLAG_STREAMING, encode_buffer, cbor_encoder_len(&enc));
@@ -235,6 +236,7 @@ void get_quic(uint8_t *data, uint32_t len) {
send_quic_header(QUIC_CMD_GET, QUIC_FLAG_STREAMING, 0);
break;
}
+#endif
default:
quic_errorf(QUIC_CMD_GET, "INVALID VALUE %d", value);
break;
@@ -314,6 +316,7 @@ void set_quic(uint8_t *data, uint32_t len) {
break;
}
#endif
+#ifdef USE_SERIAL_4WAY_BLHELI_INTERFACE
case QUIC_VAL_BLHEL_SETTINGS: {
uint8_t count = serial_4way_init();
timer_delay_us(500000);
@@ -335,6 +338,7 @@ void set_quic(uint8_t *data, uint32_t len) {
send_quic(QUIC_CMD_SET, QUIC_FLAG_NONE, encode_buffer, cbor_encoder_len(&enc));
break;
}
+#endif
default:
quic_errorf(QUIC_CMD_SET, "INVALID VALUE %d", value);
break;
@@ -449,7 +453,7 @@ void process_motor_test(uint8_t *data, uint32_t len) {
send_quic(QUIC_CMD_MOTOR, QUIC_FLAG_NONE, encode_buffer, cbor_encoder_len(&enc));
break;
-
+#ifdef USE_SERIAL_4WAY_BLHELI_INTERFACE
case QUIC_MOTOR_ESC4WAY_IF: {
uint8_t count = serial_4way_init();
@@ -461,7 +465,7 @@ void process_motor_test(uint8_t *data, uint32_t len) {
serial_4way_process();
break;
}
-
+#endif
default:
quic_errorf(QUIC_CMD_MOTOR, "INVALID CMD %d", cmd);
break;
|
adds +tap:to treap-order validation arm | ++ to :: queue engine
=| a/(tree) :: (qeu)
|@
+ ++ apt :: check correctness
+ ^- ?
+ ?~ a &
+ |- ^- ?
+ ?~ l.a &
+ ?~ r.a &
+ &((mor n.l.a n.r.a) $(a l.a) $(a r.a))
+ ::
++ bal
|- ^+ a
?~ a ~
|
Update WorkerThread.cpp
spelling and wording | @@ -128,8 +128,8 @@ namespace PAL_NS_BEGIN {
}
}
/* Either waited long enough or the task is still executing. Return:
- - true - if new item in progress is another new item
- - false - if the item in progress is still the item we were waiting on
+ * true - if item in progress is different than item (other task)
+ * false - if item in progress is still the same (didn't wait long enough)
*/
return (m_itemInProgress != item);
}
|
Set new define because of build failure | #define CFG_TUD_CDC_EP_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64)
#endif
+#ifndef CFG_TUD_CDC_CLEAR_AT_CONNECTION
+ #define CFG_TUD_CDC_CLEAR_AT_CONNECTION 0
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
|
Macros: Add Doxygen comments for macro functions | #ifndef KDBMACROS_H
#define KDBMACROS_H
+/** Surround a value with double quotes */
#define ELEKTRA_QUOTE(x) #x
+/** Surround a **macro value** with double quotes */
#define ELEKTRA_STRINGIFY(x) ELEKTRA_QUOTE (x)
#if defined(__APPLE__)
|
detect buffer overflows in RleUncompress | @@ -117,6 +117,11 @@ rleUncompress (int inLength, int maxLength, const signed char in[], char out[])
if (0 > (maxLength -= count + 1))
return 0;
+ // check the input buffer is big enough to contain
+ // byte to be duplicated
+ if (inLength < 0)
+ return 0;
+
memset(out, *(char*)in, count+1);
out += count+1;
|
Make unknown psram package version more obvious | @@ -642,6 +642,9 @@ esp_err_t IRAM_ATTR psram_enable(psram_cache_mode_t mode, psram_vaddr_mode_t vad
ESP_EARLY_LOGI(TAG, "This chip is ESP32-D0WD");
psram_io.psram_clk_io = D0WD_PSRAM_CLK_IO;
psram_io.psram_cs_io = D0WD_PSRAM_CS_IO;
+ } else {
+ ESP_EARLY_LOGE(TAG, "Not a valid or known package id: %d", pkg_ver);
+ abort();
}
const uint32_t spiconfig = ets_efuse_get_spiconfig();
|
bondo: removing debugging posts | @@ -154,7 +154,6 @@ static void bondo_proxy_pointer(t_bondo_proxy *x, t_gpointer *gp)
static void bondo_distribute(t_bondo *x, int startid,
t_symbol *s, int ac, t_atom *av, int doit)
{
- post("distribute");
t_atom *ap = av;
t_bondo_proxy **pp;
int id = startid + ac;
@@ -213,13 +212,11 @@ static void bondo_proxy_list(t_bondo_proxy *x,
static void bondo_proxy_doanything(t_bondo_proxy *x,
t_symbol *s, int ac, t_atom *av, int doit)
{
- post("anything");
if (x->p_master->x_multiatom)
{
/* LATER rethink and CHECKME */
if (s == &s_symbol)
{
- post("if");
if (ac && av->a_type == A_SYMBOL)
bondo_proxy_dosymbol(x, av->a_w.w_symbol, doit);
else
@@ -227,7 +224,6 @@ static void bondo_proxy_doanything(t_bondo_proxy *x,
}
else
{
- post("else");
x->p_selector = s;
bondo_proxy_domultiatom(x, ac, av, doit);
}
|
Updated metadata config definition | +import { Resource } from "..";
import { AppName, Path, Patp } from "../lib";
export type MetadataUpdate =
@@ -65,11 +66,20 @@ export interface Metadata {
'date-created': string;
description: string;
title: string;
- config: { graph: string };
+ config: MetadataConfig;
picture: string;
hidden: boolean;
preview: boolean;
vip: PermVariation;
}
+type MetadataConfig = GroupConfig | GraphConfig;
+
+interface GroupConfig {
+ group: null | {} | Resource;
+}
+interface GraphConfig {
+ graph: string;
+}
+
export type PermVariation = '' | 'reader-comments' | 'member-metadata' | 'host-feed' | 'admin-feed';
|
Set version 2.0.0 | #ifndef __version_H__
#define __version_H__
-#define SPGLIB_MAJOR_VERSION 1
-#define SPGLIB_MINOR_VERSION 16
-#define SPGLIB_MICRO_VERSION 5
+#define SPGLIB_MAJOR_VERSION 2
+#define SPGLIB_MINOR_VERSION 0
+#define SPGLIB_MICRO_VERSION 0
#endif
|
Add input option for process or buffer | @@ -143,8 +143,13 @@ uart_thread(void* param) {
for (DWORD i = 0; i < bytes_read; i++) {
printf("%c", data_buffer[i]);
}
+
/* Send received data to input processing module */
+#if ESP_CFG_INPUT_USE_PROCESS
esp_input_process(data_buffer, (size_t)bytes_read);
+#else
+ esp_input(data_buffer, (size_t)bytes_read);
+#endif
/* Write received data to output debug file */
if (file != NULL) {
|
Docs: Removed Windows11 again (too early to give definitive name for this) | @@ -60,7 +60,6 @@ Windows is automatically detected by OpenCore, so the basic `Windows` flavour wi
**Windows** icon is recommended, all others are optional.
- **Windows** - Microsoft Windows (auto-detected by OC; fallback: **HardDrive**)
- - **Windows11:Windows** - Microsoft Windows 11 (`Windows11.icns`)
- **Windows10:Windows** - Microsoft Windows 10 (`Windows10.icns`)
- **Windows8_1:Windows** - Microsoft Windows 8.1 (`Windows8_1.icns`, etc.)
- **Windows8:Windows** - Microsoft Windows 8
|
Update ygdiff after | },
"ygdiff": {
"formula": {
- "sandbox_id": 505451223,
+ "sandbox_id": 567709191,
"match": "ygdiff"
},
"executable": {
|
Add a test for CT in TLSv1.3
This also tests the SERVERINFO2 file format. | @@ -126,6 +126,8 @@ $ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
[TLSProxy::Message::MT_CERTIFICATE, TLSProxy::Message::EXT_STATUS_REQUEST,
checkhandshake::STATUS_REQUEST_SRV_EXTENSION],
+ [TLSProxy::Message::MT_CERTIFICATE, TLSProxy::Message::EXT_SCT,
+ checkhandshake::SCT_SRV_EXTENSION],
[0,0,0]
);
@@ -257,25 +259,29 @@ checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
| checkhandshake::ALPN_SRV_EXTENSION,
"ALPN handshake test");
+SKIP: {
+ skip "No CT, EC or OCSP support in this OpenSSL build", 1
+ if disabled("ct") || disabled("ec") || disabled("ocsp");
+
#Test 13: SCT handshake (client request only)
-#TODO(TLS1.3): This only checks that the client side extension appears. The
-#SCT extension is unusual in that we have no built-in server side implementation
-#The server side implementation can nomrally be added using the custom
-#extensions framework (e.g. by using the "-serverinfo" s_server option). However
-#currently we only support <= TLS1.2 for custom extensions because the existing
-#framework and API has no knowledge of the TLS1.3 messages
$proxy->clear();
#Note: -ct also sends status_request
$proxy->clientflags("-ct");
$proxy->serverflags("-status_file "
- .srctop_file("test", "recipes", "ocsp-response.der"));
+ .srctop_file("test", "recipes", "ocsp-response.der")
+ ." -serverinfo ".srctop_file("test", "serverinfo2.pem"));
$proxy->start();
checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
checkhandshake::DEFAULT_EXTENSIONS
| checkhandshake::SCT_CLI_EXTENSION
+ | checkhandshake::SCT_SRV_EXTENSION
| checkhandshake::STATUS_REQUEST_CLI_EXTENSION
| checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
"SCT handshake test");
+}
+
+
+
#Test 14: HRR Handshake
$proxy->clear();
|
Fix incorrect default options window setting | @@ -129,7 +129,7 @@ VOID PhAddDefaultSettings(
PhpAddStringSetting(L"NetworkTreeListColumns", L"");
PhpAddStringSetting(L"NetworkTreeListSort", L"0,1"); // 0, AscendingSortOrder
PhpAddIntegerSetting(L"NoPurgeProcessRecords", L"0");
- PhpAddIntegerPairSetting(L"OptionsWindowPosition", L"200,200");
+ PhpAddIntegerPairSetting(L"OptionsWindowPosition", L"0,0");
PhpAddScalableIntegerPairSetting(L"OptionsWindowSize", L"@96|900,590");
PhpAddIntegerPairSetting(L"PluginManagerWindowPosition", L"0,0");
PhpAddScalableIntegerPairSetting(L"PluginManagerWindowSize", L"@96|900,590");
|
comm point write and read structure members. | @@ -87,6 +87,9 @@ typedef int comm_point_callback_type(struct comm_point*, void*, int,
#define NETEVENT_CAPSFAIL -3
/** to pass done transfer to callback function; http file is complete */
#define NETEVENT_DONE -4
+/** to pass write of the write packet is done to callback function
+ * used when tcp_write_and_read is enabled */
+#define NETEVENT_PKT_WRITTEN -5
/** timeout to slow accept calls when not possible, in msec. */
#define NETEVENT_SLOW_ACCEPT_TIME 2000
@@ -254,6 +257,12 @@ struct comm_point {
* tcp_write_and_read is enabled */
size_t tcp_write_byte_count;
+ /** packet to write currently over the write channel. for when
+ * tcp_write_and_read is enabled */
+ uint8_t* tcp_write_pkt;
+ /** length of tcp_write_pkt in bytes */
+ size_t tcp_write_pkt_len;
+
/** if set, read/write completes:
read/write state of tcp is toggled.
buffer reset/bytecount reset.
|
Update arch/sparc/include/spinlock.h | /* The Type of a spinlock.
*
- * This must be a uint32_ becaue it will be set using CASA instruction.
+ * This must be a uint32_ because it will be set using CASA instruction.
* That instruction atomically Compare the 32-bitvalues in the register
* and memory, if its current value is the expected one. swap the values
* of second register with the memory.
|
mfg_util: Fix unnecessary csv files creation for values with REPEAT tags | @@ -264,10 +264,10 @@ def set_repeat_value(total_keys_repeat, keys, csv_file, target_filename):
if key_val_new[0][0] == key_repeated[0]:
val = key_val_pair[0][1]
row[index] = val
- csv_file_writer.writerow(row)
del key_repeated[0]
del key_val_new[0]
del key_val_pair[0]
+ csv_file_writer.writerow(row)
return target_filename
|
[catboost/R] Fix S3 generic/method consistency warning | \alias{print.catboost.Pool}
\title{Print catboost.Pool}
\usage{
-\method{print}{catboost.Pool}(pool, ...)
+\method{print}{catboost.Pool}(x, ...)
}
\arguments{
-\item{pool}{a catboost.Pool object
+\item{x}{a catboost.Pool object
Default value: Required argument}
|
build/configs/rtl8721csm/loadable_apps : Enable prodconfig and Adjust wdog and timer
1) Enable prodconfig
2) Adjust wdog and timer
MAX_WDOGPARAMS : 2 -> 4
PREALLOC_WDOGS : 4 -> 32
WDOG_INTRESERVE : 0 -> 4
PREALLOC_TIMERS = 2 -> 8 | @@ -310,10 +310,10 @@ CONFIG_SYSTEM_TIME64=y
CONFIG_START_YEAR=2011
CONFIG_START_MONTH=12
CONFIG_START_DAY=6
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=2
+CONFIG_MAX_WDOGPARMS=4
+CONFIG_PREALLOC_WDOGS=32
+CONFIG_WDOG_INTRESERVE=4
+CONFIG_PREALLOC_TIMERS=8
#
# Tasks and Scheduling
@@ -434,6 +434,7 @@ CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
# CONFIG_WATCHDOG_FOR_IRQ is not set
# CONFIG_TIMER is not set
CONFIG_MMINFO=y
+CONFIG_PRODCONFIG=y
# CONFIG_ANALOG is not set
CONFIG_DRIVERS_OS_API_TEST=y
# CONFIG_NETDEVICES is not set
@@ -1417,6 +1418,7 @@ CONFIG_ENABLE_ENV_GET=y
CONFIG_ENABLE_ENV_SET=y
CONFIG_ENABLE_ENV_UNSET=y
CONFIG_ENABLE_FREE=y
+CONFIG_ENABLE_PRODCONFIG=y
CONFIG_ENABLE_KILL=y
CONFIG_ENABLE_KILLALL=y
# CONFIG_ENABLE_PS is not set
|
update scope ps | @@ -460,6 +460,10 @@ Negative arguments are not allowed.
### ps
---
+Lists all scoped processes. This means processes whose functions AppScope is interposing (which means that the AppScope library was loaded, and the AppScope reporting thread is running, in those processes, too).
+
+Before AppScope 1.2.0:
+
Lists all processes into which the libscope library is injected.
#### Usage
|
Fix lpc17_40_serial.c:935:20: error: unused function 'lpc17_40_uart3config' | @@ -931,7 +931,7 @@ static inline void lpc17_40_uart2config(void)
};
#endif
-#ifdef CONFIG_LPC17_40_UART3
+#if defined(CONFIG_LPC17_40_UART3) && !defined(CONFIG_UART3_SERIAL_CONSOLE)
static inline void lpc17_40_uart3config(void)
{
uint32_t regval;
|
BugID:20099139: Exit with error if source is not existing | @@ -242,7 +242,7 @@ AOS_CPLUSPLUS_FLAGS += $(CPLUSPLUS_FLAGS)
$(eval PROCESSED_COMPONENTS += $(NAME))
$(eval TMP_SOURCES := $(sort $(subst $($(NAME)_LOCATION),,$(addprefix $($(NAME)_LOCATION),$($(NAME)_SOURCES) $($(NAME)_SOURCES-y)))))
$(eval $(NAME)_SOURCES := $(sort $(subst $($(NAME)_LOCATION),,$(wildcard $(addprefix $($(NAME)_LOCATION),$($(NAME)_SOURCES) $($(NAME)_SOURCES-y)) ))))
-$(foreach srcfile,$(TMP_SOURCES),$(if $(findstring *,$(srcfile)),,$(if $(filter $(srcfile),$($(NAME)_SOURCES)),,$(warning $(NAME): Can not find source: "$($(NAME)_LOCATION)$(srcfile)" ...))))
+$(foreach srcfile,$(TMP_SOURCES),$(if $(findstring *,$(srcfile)),,$(if $(filter $(srcfile),$($(NAME)_SOURCES)),,$(error $(NAME): Can not find source: "$($(NAME)_LOCATION)$(srcfile)" ...))))
$(eval $(NAME)_POPULATE_INCLUDES := $(if $(filter 1,$(STRICT)),$(addprefix $(subst $(SOURCE_ROOT),,$($(NAME)_LOCATION)),$(GLOBAL_INCLUDES) $(GLOBAL_INCLUDES-y))))
ifeq ($(STRICT),1)
|
Check the return value of 'ZSTD_initDStream'
'49116f6d' fix the problem for 'ZSTD_initCStream', should check the value of
'ZSTD_initDStream' as well. | @@ -1342,7 +1342,9 @@ BufFileEndCompression(BufFile *file)
file->zstd_context->dctx = ZSTD_createDStream();
if (!file->zstd_context->dctx)
elog(ERROR, "out of memory");
- ZSTD_initDStream(file->zstd_context->dctx);
+ ret = ZSTD_initDStream(file->zstd_context->dctx);
+ if (ZSTD_isError(ret))
+ elog(ERROR, "failed to initialize zstd dstream: %s", ZSTD_getErrorName(ret));
file->compressed_buffer.src = palloc(BLCKSZ);
file->compressed_buffer.size = 0;
|
path DOC missing doxygen for param | @@ -388,6 +388,7 @@ error:
* @param[in] lref Lref option.
* @param[in] format Format of the path.
* @param[in] prefix_data Format-specific data for resolving any prefixes (see ::ly_resolve_prefix).
+ * @param[in,out] unres Global unres to use.
* @param[out] mod Resolved module.
* @param[out] name Parsed node name.
* @param[out] name_len Length of @p name.
|
README.md: update to indicate port merged back | -[](https://travis-ci.org/micropython/micropython) [](https://coveralls.io/r/micropython/micropython?branch=master)
-
The MicroPython project
=======================
<p align="center">
@@ -13,24 +11,12 @@ You can find the official website at [micropython.org](http://www.micropython.or
A note about this ESP32 repository
----------------------------------
-This repository is a clone of the main, upstream repository found at
-https://github.com/micropython/micropython. This repository adds a new
-branch called `esp32` which contains a port of MicroPython to the ESP32
-microcontroller, under the MIT license. Please see the `README.md` file
-in the `ports/esp32/` subdirectory for details of this port.
-
-This `esp32` branch is the default branch and all pull requests should be
-made to this branch, and any issues should discuss only the code developed
-in the `ports/esp32/` subdirectory.
-
-The `esp32` branch will not be rebased so it is safe to clone/fork it and
-base your work on it. New commits from the upstream repository will
-occasionally be merged in the `esp32` branch. Any additional branches in
-this repository (apart from `master`) may be rebased or deleted at any time.
+**The ESP32 port has now been merged back into the
+[main MicroPython repository](https://github.com/micropython/micropython/)
+and this repository is maintained for historical purposes.**
-If there is enough interest in the port to the ESP32 then this code can
-eventually be merged into the upstream repository. So please do let your
-interest be known!
+**This repository is now getting out of date and new pull requests should
+be made against the master branch of the main repository!**
About MicroPython
-----------------
|
[DeviceDrivers][SPI][spi_msd.c] fixed CSD Version 2.0 sector count calc. | * File : msd.c
* SPI mode SD Card Driver
* This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006 - 2012, RT-Thread Development Team
+ * COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* 2012-02-01 aozima use new RT-Thread SPI drivers.
* 2012-04-11 aozima get max. data transfer rate from CSD[TRAN_SPEED].
* 2012-05-21 aozima update MMC card support.
+ * 2018-03-09 aozima fixed CSD Version 2.0 sector count calc.
*/
#include <string.h>
@@ -1163,8 +1164,9 @@ static rt_err_t rt_msd_init(rt_device_t dev)
/* memory capacity = (C_SIZE+1) * 512K byte */
card_capacity = (C_SIZE + 1) / 2; /* unit : Mbyte */
- msd->geometry.sector_count = card_capacity * 1024; /* 1 Mbyte = 512 byte X 2048 */
+ msd->geometry.sector_count = (C_SIZE + 1) * 1024; /* 512KB = 1024sector */
MSD_DEBUG("[info] card capacity : %d.%d Gbyte\r\n", card_capacity / 1024, (card_capacity % 1024) * 100 / 1024);
+ MSD_DEBUG("[info] sector_count : %d\r\n", msd->geometry.sector_count);
}
else
{
|
Fix timeout macro codegen | @@ -537,7 +537,7 @@ FORCEINLINE PLARGE_INTEGER PhTimeoutFromMilliseconds(
}
#define PhTimeoutFromMillisecondsEx(Milliseconds) \
- &(LARGE_INTEGER) { -(LONGLONG)UInt32x32To64((Milliseconds), PH_TIMEOUT_MS) }
+ &(LARGE_INTEGER) { .QuadPart = -(LONGLONG)UInt32x32To64(((ULONG)Milliseconds), PH_TIMEOUT_MS) }
FORCEINLINE NTSTATUS PhGetLastWin32ErrorAsNtStatus(
VOID
|
Fix usage of id/uniqueId for device event | @@ -809,14 +809,15 @@ void DeRestPluginPrivate::apsdeDataIndicationDevice(const deCONZ::ApsDataIndicat
// Some items like state/buttonevent should fire events on set, not only change
if (parseFunction && parseFunction(r, item, ind, zclFrame) && item->lastSet() == item->lastChanged())
{
- auto *item = r->item(RAttrId);
- if (!item)
+ auto *idItem = r->item(RAttrId);
+ if (!idItem)
{
- item = r->item(RAttrUniqueId);
+ idItem = r->item(RAttrUniqueId);
}
- if (item)
+
+ if (idItem)
{
- enqueueEvent(Event(r->prefix(), item->descriptor().suffix, item->toString(), device->key()));
+ enqueueEvent(Event(r->prefix(), item->descriptor().suffix, idItem->toString(), device->key()));
}
}
}
|
adds asn1 digests to +rs256 (WIP - still failing) | ::
++ rs256
|_ k=key:rsa
- ++ sign |=(m=@ (de:rsa (shax m) k))
+ ++ digest
+ |= m=@
+ ^- @
+ =/ pec=spec:asn1
+ :~ %seq
+ [%seq [%obj sha-256:obj:asn1] [%nul ~] ~]
+ [%oct (shax m)]
+ ==
+ (rep 3 ~(ren asn1 pec))
+ ::
+ ++ sign |=(m=@ (de:rsa (digest m) k))
+ ::
++ verify
|= [s=@ m=@]
- =((shax m) (en:rsa s k))
+ =((digest m) (en:rsa s k))
--
::
++ en-json-sort :: print json
|
Removed some redundant settings from VS project file | </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>src\common\mysql\include;src\common\mysql\lib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CallingConvention>StdCall</CallingConvention>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MinimalRebuild>true</MinimalRebuild>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_TESTEXCEPTION;DEBUG_CRYPT_MSGS;_MTNETWORK;WIN32;_WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;_TESTEXCEPTION;DEBUG_CRYPT_MSGS;_MTNETWORK;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level2</WarningLevel>
@@ -74,10 +73,9 @@ if defined GitRev (
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Local|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>src\common\mysql\include</AdditionalIncludeDirectories>
<CallingConvention>FastCall</CallingConvention>
<MinimalRebuild>true</MinimalRebuild>
- <PreprocessorDefinitions>_PRIVATEBUILD;_MTNETWORK;WIN32;_WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_PRIVATEBUILD;_MTNETWORK;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level2</WarningLevel>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
@@ -102,10 +100,9 @@ if defined GitRev (
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Nightly|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>src\common\mysql\include</AdditionalIncludeDirectories>
<CallingConvention>FastCall</CallingConvention>
<MinimalRebuild>true</MinimalRebuild>
- <PreprocessorDefinitions>_NIGHTLYBUILD;_MTNETWORK;WIN32;_WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_NIGHTLYBUILD;_MTNETWORK;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level2</WarningLevel>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
@@ -130,9 +127,8 @@ if defined GitRev (
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>src\common\mysql\include</AdditionalIncludeDirectories>
<CallingConvention>FastCall</CallingConvention>
- <PreprocessorDefinitions>_MTNETWORK;WIN32;_WIN32;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_MTNETWORK;_WIN32;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<WarningLevel>Level4</WarningLevel>
<ExceptionHandling>Async</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
Remove redefine macro | #define PRINT_STRING_MAX_LEN 4096
-/** Command for the emit function: copy string to output. */
-#define PRINT_CMD_COPY 0x00000000
-
-/** Command for the emit function: fill output with first character. */
-#define PRINT_CMD_FILL 0x00000001
-
/** Use upper case letters for hexadecimal format. */
#define PRINT_FLAG_UPPER 0x00000001
|
Component/bt: fix write char crash after disconnection | @@ -1845,7 +1845,7 @@ BOOLEAN L2CA_CheckIsCongest(UINT16 fixed_cid, UINT16 handle)
tL2C_LCB *p_lcb;
p_lcb = l2cu_find_lcb_by_handle(handle);
- if (p_lcb != NULL) {
+ if (p_lcb != NULL && p_lcb->p_fixed_ccbs[fixed_cid - L2CAP_FIRST_FIXED_CHNL] != NULL) {
return p_lcb->p_fixed_ccbs[fixed_cid - L2CAP_FIRST_FIXED_CHNL]->cong_sent;
}
|
spiffs: Explicitly indicate unused value | @@ -23,7 +23,7 @@ const char* TAG = "SPIFFS";
void spiffs_api_lock(spiffs *fs)
{
- xSemaphoreTake(((esp_spiffs_t *)(fs->user_data))->lock, portMAX_DELAY);
+ (void) xSemaphoreTake(((esp_spiffs_t *)(fs->user_data))->lock, portMAX_DELAY);
}
void spiffs_api_unlock(spiffs *fs)
|
Remove the line in the documentation about Visual Studio's default IDE value. | @@ -3,7 +3,6 @@ Enables the `Scan Sources for Module Dependencies` option for Visual Studio proj
```lua
scanformoduledependencies "value"
```
-If no value is set for a configuration, Visual Studio will default the option to `No`.
### Parameters ###
|
Uses brew install python2
'brew install python' used to pull in python 2
Now is pulls in python 3
This commit explictly uses python 2 | @@ -28,11 +28,7 @@ brew install go # Or get the latest from https://golang.org/dl/
brew install dep
# Installing python libraries
-brew install python
-cat >> ~/.bash_profile << EOF
-export PATH=/usr/local/opt/python/libexec/bin:\$PATH
-EOF
-source ~/.bash_profile
+brew install python2
pip install lockfile psi paramiko pysql psutil setuptools
pip install unittest2 parse pexpect mock pyyaml
pip install git+https://github.com/behave/behave@v1.2.4
|
in_tcp: use pack state byte position for buffer adjustment | @@ -77,7 +77,6 @@ int tcp_conn_event(void *data)
struct mk_event *event;
struct tcp_conn *conn = data;
struct flb_in_tcp_config *ctx = conn->ctx;
- jsmntok_t *t;
event = &conn->event;
if (event->mask & MK_EVENT_READ) {
@@ -127,11 +126,9 @@ int tcp_conn_event(void *data)
conn->buf_len--;
}
-
/* JSON Format handler */
char *pack;
int out_size;
-
ret = flb_pack_json_state(conn->buf_data, conn->buf_len,
&pack, &out_size, &conn->pack_state);
if (ret == FLB_ERR_JSON_PART) {
@@ -153,9 +150,8 @@ int tcp_conn_event(void *data)
*/
process_pack(conn, pack, out_size);
- t = &conn->pack_state.tokens[0];
- consume_bytes(conn->buf_data, t->end, conn->buf_len);
- conn->buf_len -= t->end;
+ consume_bytes(conn->buf_data, conn->pack_state.last_byte, conn->buf_len);
+ conn->buf_len -= conn->pack_state.last_byte;
conn->buf_data[conn->buf_len] = '\0';
flb_pack_state_reset(&conn->pack_state);
@@ -213,6 +209,7 @@ struct tcp_conn *tcp_conn_add(int fd, struct flb_in_tcp_config *ctx)
/* Initialize JSON parser */
flb_pack_state_init(&conn->pack_state);
+ conn->pack_state.multiple = FLB_TRUE;
/* Register instance into the event loop */
ret = mk_event_add(ctx->evl, fd, FLB_ENGINE_EV_CUSTOM, MK_EVENT_READ, conn);
|
Updated instructions for cuda | @@ -107,14 +107,20 @@ Build and install from sources is possible. However, the source build for AOMP
- It is a bootstrapped build. The built and installed LLVM compiler is used to build library components.
- Additional package dependencies are required that are not required when installing the AOMP package.
-To build AOMP from source, run these commands.
+Building aomp from source requires these dependencies that can be resolved on an ubuntu system with apt-get.
```
- sudo apt-get install cmake g++-5 g++ pkg-config libpci-dev libnuma-dev libelf-dev libffi-dev
+ sudo apt-get install cmake g++-5 g++ pkg-config libpci-dev libnuma-dev libelf-dev libffi-dev git
+```
+To build aomp with support for nvptx GPUs, you must first install cuda 10. We recommend cuda 10.0. Cuda 10.1 will not work till aomp moves to the trunk development of LLVM 9. Once you download cuda 10.0 local install file, these commands should complete the install of cuda.
+```
sudo dpkg -i cuda-repo-ubuntu1604-10-0-local-10.0.130-410.48_1.0-1_amd64.deb
sudo apt-key add /var/cuda-repo-10-0-local-10.0.130-410.48/7fa2af80.pub
sudo apt-get update
sudo apt-get install cuda
+```
+To build AOMP from source, run these commands.
+```
cd $HOME ; mkdir -p git/aomp ; cd git/aomp
git clone https://github.com/rocm-developer-tools/aomp
cd $HOME/git/aomp/aomp/bin
|
syspage: fix map's name relocation
JIRA: | @@ -178,6 +178,7 @@ void syspage_init(void)
do {
map->next = hal_syspageRelocate(map->next);
map->prev = hal_syspageRelocate(map->prev);
+ map->name = hal_syspageRelocate(map->name);
if (map->entries != NULL) {
map->entries = hal_syspageRelocate(map->entries);
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.